Modified test cases with new import() behavior

17 files changed, 22 insertions, 14 deletions

diff --git a/testdata/scad/minimal/allmodules.scad b/testdata/scad/minimal/allmodules.scad
index a940947..4395fd7 100644
--- a/testdata/scad/minimal/allmodules.scad
+++ b/testdata/scad/minimal/allmodules.scad
@@ -15,6 +15,7 @@ dxf_linear_extrude();
 linear_extrude();
 dxf_rotate_extrude();
 rotate_extrude();
+import();
 import_stl();
 import_off();
 import_dxf();
diff --git a/testdata/scad/minimal/import.scad b/testdata/scad/minimal/import.scad
new file mode 100644
index 0000000..6f375fe
--- /dev/null
+++ b/testdata/scad/minimal/import.scad
@@ -0,0 +1 @@
+import();
diff --git a/tests/regression/csgtermtest/allmodules-expected.txt b/tests/regression/csgtermtest/allmodules-expected.txt
index fd366e0..c375c01 100644
--- a/tests/regression/csgtermtest/allmodules-expected.txt
+++ b/tests/regression/csgtermtest/allmodules-expected.txt
@@ -1 +1 @@
-(((((((((((((((linear_extrude14 + linear_extrude15) + rotate_extrude16) + rotate_extrude17) + import_stl18) + import_off19) + import_dxf20) + cube22) + sphere23) + cylinder24) + polyhedron25) + square26) + circle27) + polygon28) + projection29) + surface31)
+((((((((((((((((linear_extrude14 + linear_extrude15) + rotate_extrude16) + rotate_extrude17) + import18) + import19) + import20) + import21) + cube23) + sphere24) + cylinder25) + polyhedron26) + square27) + circle28) + polygon29) + projection30) + surface32)
diff --git a/tests/regression/csgtermtest/import-expected.txt b/tests/regression/csgtermtest/import-expected.txt
new file mode 100644
index 0000000..847d6c3
--- /dev/null
+++ b/tests/regression/csgtermtest/import-expected.txt
@@ -0,0 +1 @@
+import2
diff --git a/tests/regression/csgtermtest/import_dxf-expected.txt b/tests/regression/csgtermtest/import_dxf-expected.txt
index edf214d..847d6c3 100644
--- a/tests/regression/csgtermtest/import_dxf-expected.txt
+++ b/tests/regression/csgtermtest/import_dxf-expected.txt
@@ -1 +1 @@
-import_dxf2
+import2
diff --git a/tests/regression/csgtermtest/import_off-expected.txt b/tests/regression/csgtermtest/import_off-expected.txt
index a8c4d8f..847d6c3 100644
--- a/tests/regression/csgtermtest/import_off-expected.txt
+++ b/tests/regression/csgtermtest/import_off-expected.txt
@@ -1 +1 @@
-import_off2
+import2
diff --git a/tests/regression/csgtermtest/import_stl-expected.txt b/tests/regression/csgtermtest/import_stl-expected.txt
index fe69d31..847d6c3 100644
--- a/tests/regression/csgtermtest/import_stl-expected.txt
+++ b/tests/regression/csgtermtest/import_stl-expected.txt
@@ -1 +1 @@
-import_stl2
+import2
diff --git a/tests/regression/csgtexttest/allmodules-expected.txt b/tests/regression/csgtexttest/allmodules-expected.txt
index 2595e02..34fa5ae 100644
--- a/tests/regression/csgtexttest/allmodules-expected.txt
+++ b/tests/regression/csgtexttest/allmodules-expected.txt
@@ -1 +1 @@
-group1(minkowski2+glide3+subdiv4+hull5+group6+group6+group6+intersection_for9+group6+union11+difference12+intersection13+linear_extrude+linear_extrude+rotate_extrude+rotate_extrude+import_stl+import_off+import_dxf+group6+cube+sphere+cylinder+polyhedron+square+circle+polygon+projection+render30+surface+transform32+transform32+transform34+transform32+transform32+color37)
+group1(minkowski2+glide3+subdiv4+hull5+group6+group6+group6+intersection_for9+group6+union11+difference12+intersection13+linear_extrude+linear_extrude+rotate_extrude+rotate_extrude+import+import+import+import+group6+cube+sphere+cylinder+polyhedron+square+circle+polygon+projection+render31+surface+transform33+transform33+transform35+transform33+transform33+color38)
diff --git a/tests/regression/csgtexttest/import-expected.txt b/tests/regression/csgtexttest/import-expected.txt
new file mode 100644
index 0000000..a673ddb
--- /dev/null
+++ b/tests/regression/csgtexttest/import-expected.txt
@@ -0,0 +1 @@
+group1(import)
diff --git a/tests/regression/csgtexttest/import_dxf-expected.txt b/tests/regression/csgtexttest/import_dxf-expected.txt
index ffb96fc..a673ddb 100644
--- a/tests/regression/csgtexttest/import_dxf-expected.txt
+++ b/tests/regression/csgtexttest/import_dxf-expected.txt
@@ -1 +1 @@
-group1(import_dxf)
+group1(import)
diff --git a/tests/regression/csgtexttest/import_off-expected.txt b/tests/regression/csgtexttest/import_off-expected.txt
index 8a3bafa..a673ddb 100644
--- a/tests/regression/csgtexttest/import_off-expected.txt
+++ b/tests/regression/csgtexttest/import_off-expected.txt
@@ -1 +1 @@
-group1(import_off)
+group1(import)
diff --git a/tests/regression/csgtexttest/import_stl-expected.txt b/tests/regression/csgtexttest/import_stl-expected.txt
index 47c4707..a673ddb 100644
--- a/tests/regression/csgtexttest/import_stl-expected.txt
+++ b/tests/regression/csgtexttest/import_stl-expected.txt
@@ -1 +1 @@
-group1(import_stl)
+group1(import)
diff --git a/tests/regression/dumptest/allmodules-expected.txt b/tests/regression/dumptest/allmodules-expected.txt
index 2849d7a..e708c43 100644
--- a/tests/regression/dumptest/allmodules-expected.txt
+++ b/tests/regression/dumptest/allmodules-expected.txt
@@ -15,9 +15,10 @@ group() {
 	linear_extrude(file = "", cache = "0.0", layer = "", height = 100, origin = [ 0 0 ], scale = 1, center = false, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 	rotate_extrude(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 	rotate_extrude(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
-	import_stl(file = "", cache = "0.0", convexity = 1);
-	import_off(file = "", cache = "0.0", convexity = 1);
-	import_dxf(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	import(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	import(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	import(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	import(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 	group();
 	cube(size = [1, 1, 1], center = false);
 	sphere($fn = 0, $fa = 12, $fs = 1, r = 1);
diff --git a/tests/regression/dumptest/import-expected.txt b/tests/regression/dumptest/import-expected.txt
new file mode 100644
index 0000000..b424afe
--- /dev/null
+++ b/tests/regression/dumptest/import-expected.txt
@@ -0,0 +1,3 @@
+group() {
+	import(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+}
diff --git a/tests/regression/dumptest/import_dxf-expected.txt b/tests/regression/dumptest/import_dxf-expected.txt
index 08238d2..b424afe 100644
--- a/tests/regression/dumptest/import_dxf-expected.txt
+++ b/tests/regression/dumptest/import_dxf-expected.txt
@@ -1,3 +1,3 @@
 group() {
-	import_dxf(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	import(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 }
diff --git a/tests/regression/dumptest/import_off-expected.txt b/tests/regression/dumptest/import_off-expected.txt
index 51293c9..b424afe 100644
--- a/tests/regression/dumptest/import_off-expected.txt
+++ b/tests/regression/dumptest/import_off-expected.txt
@@ -1,3 +1,3 @@
 group() {
-	import_off(file = "", cache = "0.0", convexity = 1);
+	import(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 }
diff --git a/tests/regression/dumptest/import_stl-expected.txt b/tests/regression/dumptest/import_stl-expected.txt
index 2da7d35..b424afe 100644
--- a/tests/regression/dumptest/import_stl-expected.txt
+++ b/tests/regression/dumptest/import_stl-expected.txt
@@ -1,3 +1,3 @@
 group() {
-	import_stl(file = "", cache = "0.0", convexity = 1);
+	import(file = "", cache = "0.0", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 }