diff options
Diffstat (limited to 'tests')
63 files changed, 6 insertions, 9 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9e6ae0a..4ef7bf3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -93,7 +93,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/parser_yacc.c PROPERTIES # Internal includes include_directories(../src) -add_definitions(-DOPENSCAD_VERSION=test) +add_definitions(-DOPENSCAD_VERSION=test -DOPENSCAD_YEAR=2011 -DOPENSCAD_MONTH=10) set(COMMON_SOURCES ../src/handle_dep.cc @@ -241,6 +241,7 @@ enable_testing() file(GLOB MINIMAL_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/*.scad) file(GLOB FEATURES_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/features/*.scad) file(GLOB BUGS_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/*.scad) +file(GLOB SCAD_DXF_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/dxf/*.scad) # Add dumptest tests to CTest add_cmdline_test(dumptest txt ${MINIMAL_FILES}) @@ -287,6 +288,7 @@ LIST(APPEND CGALPNGTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/features/include-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/features/child-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/features/ifelse-tests.scad) +LIST(APPEND CGALPNGTEST_FILES ${SCAD_DXF_FILES}) #LIST(APPEND CGALPNGTEST_FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) add_cmdline_test(cgalpngtest png ${CGALPNGTEST_FILES}) @@ -295,6 +297,7 @@ LIST(APPEND OPENCSGTEST_FILES ${CGALPNGTEST_FILES}) LIST(APPEND OPENCSGTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/features/highlight-and-background-modifier.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/features/child-background.scad) +LIST(APPEND OPENCSGTEST_FILES ${SCAD_DXF_FILES}) add_cmdline_test(opencsgtest png ${OPENCSGTEST_FILES}) # Add throwntogether tests to CTest diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc index eec5d4b..7688fc7 100644 --- a/tests/csgtermtest.cc +++ b/tests/csgtermtest.cc @@ -26,7 +26,6 @@ #include "myqhash.h" #include "PolySetEvaluator.h" #include "CSGTermEvaluator.h" -#include "CSGTextCache.h" #include "openscad.h" #include "handle_dep.h" #include "node.h" @@ -144,8 +143,8 @@ int main(int argc, char **argv) // cout << tree.getString(*root_node) << "\n"; - vector<CSGTerm*> highlights; - vector<CSGTerm*> background; + std::vector<CSGTerm*> highlights; + std::vector<CSGTerm*> background; PolySetEvaluator psevaluator(tree); CSGTermEvaluator evaluator(tree, &psevaluator); CSGTerm *root_term = evaluator.evaluateCSGTerm(*root_node, highlights, background); diff --git a/tests/regression/cgalpngtest/arc-expected.png b/tests/regression/cgalpngtest/arc-expected.png Binary files differnew file mode 100644 index 0000000..2f555c4 --- /dev/null +++ b/tests/regression/cgalpngtest/arc-expected.png diff --git a/tests/regression/cgalpngtest/circle-advanced-expected.png b/tests/regression/cgalpngtest/circle-advanced-expected.png Binary files differnew file mode 100644 index 0000000..3b31c78 --- /dev/null +++ b/tests/regression/cgalpngtest/circle-advanced-expected.png diff --git a/tests/regression/cgalpngtest/circle-double-expected.png b/tests/regression/cgalpngtest/circle-double-expected.png Binary files differnew file mode 100644 index 0000000..17e6b39 --- /dev/null +++ b/tests/regression/cgalpngtest/circle-double-expected.png diff --git a/tests/regression/cgalpngtest/circle-expected.png b/tests/regression/cgalpngtest/circle-expected.png Binary files differnew file mode 100644 index 0000000..aacf12d --- /dev/null +++ b/tests/regression/cgalpngtest/circle-expected.png diff --git a/tests/regression/cgalpngtest/circle-small-expected.png b/tests/regression/cgalpngtest/circle-small-expected.png Binary files differnew file mode 100644 index 0000000..bc2a75b --- /dev/null +++ b/tests/regression/cgalpngtest/circle-small-expected.png diff --git a/tests/regression/cgalpngtest/ellipse-arc-expected.png b/tests/regression/cgalpngtest/ellipse-arc-expected.png Binary files differnew file mode 100644 index 0000000..561619b --- /dev/null +++ b/tests/regression/cgalpngtest/ellipse-arc-expected.png diff --git a/tests/regression/cgalpngtest/ellipse-arc-rot-expected.png b/tests/regression/cgalpngtest/ellipse-arc-rot-expected.png Binary files differnew file mode 100644 index 0000000..7a2ef89 --- /dev/null +++ b/tests/regression/cgalpngtest/ellipse-arc-rot-expected.png diff --git a/tests/regression/cgalpngtest/ellipse-expected.png b/tests/regression/cgalpngtest/ellipse-expected.png Binary files differnew file mode 100644 index 0000000..384cb6b --- /dev/null +++ b/tests/regression/cgalpngtest/ellipse-expected.png diff --git a/tests/regression/cgalpngtest/ellipse-reverse-expected.png b/tests/regression/cgalpngtest/ellipse-reverse-expected.png Binary files differnew file mode 100644 index 0000000..e5a7b10 --- /dev/null +++ b/tests/regression/cgalpngtest/ellipse-reverse-expected.png diff --git a/tests/regression/cgalpngtest/ellipse-rot-expected.png b/tests/regression/cgalpngtest/ellipse-rot-expected.png Binary files differnew file mode 100644 index 0000000..2c68ae2 --- /dev/null +++ b/tests/regression/cgalpngtest/ellipse-rot-expected.png diff --git a/tests/regression/cgalpngtest/lwpolyline-closed-expected.png b/tests/regression/cgalpngtest/lwpolyline-closed-expected.png Binary files differnew file mode 100644 index 0000000..d0376c9 --- /dev/null +++ b/tests/regression/cgalpngtest/lwpolyline-closed-expected.png diff --git a/tests/regression/cgalpngtest/lwpolyline-expected.png b/tests/regression/cgalpngtest/lwpolyline-expected.png Binary files differnew file mode 100644 index 0000000..d0376c9 --- /dev/null +++ b/tests/regression/cgalpngtest/lwpolyline-expected.png diff --git a/tests/regression/cgalpngtest/lwpolyline2-expected.png b/tests/regression/cgalpngtest/lwpolyline2-expected.png Binary files differnew file mode 100644 index 0000000..f01f339 --- /dev/null +++ b/tests/regression/cgalpngtest/lwpolyline2-expected.png diff --git a/tests/regression/cgalpngtest/multiple-layers-expected.png b/tests/regression/cgalpngtest/multiple-layers-expected.png Binary files differnew file mode 100644 index 0000000..680729b --- /dev/null +++ b/tests/regression/cgalpngtest/multiple-layers-expected.png diff --git a/tests/regression/cgalpngtest/polygon-concave-expected.png b/tests/regression/cgalpngtest/polygon-concave-expected.png Binary files differnew file mode 100644 index 0000000..e1c68ef --- /dev/null +++ b/tests/regression/cgalpngtest/polygon-concave-expected.png diff --git a/tests/regression/cgalpngtest/polygon-concave-hole-expected.png b/tests/regression/cgalpngtest/polygon-concave-hole-expected.png Binary files differnew file mode 100644 index 0000000..eb11557 --- /dev/null +++ b/tests/regression/cgalpngtest/polygon-concave-hole-expected.png diff --git a/tests/regression/cgalpngtest/polygon-concave-simple-expected.png b/tests/regression/cgalpngtest/polygon-concave-simple-expected.png Binary files differnew file mode 100644 index 0000000..14808ca --- /dev/null +++ b/tests/regression/cgalpngtest/polygon-concave-simple-expected.png diff --git a/tests/regression/cgalpngtest/polygon-holes-touch-expected.png b/tests/regression/cgalpngtest/polygon-holes-touch-expected.png Binary files differnew file mode 100644 index 0000000..ef2507c --- /dev/null +++ b/tests/regression/cgalpngtest/polygon-holes-touch-expected.png diff --git a/tests/regression/cgalpngtest/polygon-intersect-expected.png b/tests/regression/cgalpngtest/polygon-intersect-expected.png Binary files differnew file mode 100644 index 0000000..6f4f437 --- /dev/null +++ b/tests/regression/cgalpngtest/polygon-intersect-expected.png diff --git a/tests/regression/cgalpngtest/polygon-many-holes-expected.png b/tests/regression/cgalpngtest/polygon-many-holes-expected.png Binary files differnew file mode 100644 index 0000000..2527af9 --- /dev/null +++ b/tests/regression/cgalpngtest/polygon-many-holes-expected.png diff --git a/tests/regression/cgalpngtest/polygon-mesh-expected.png b/tests/regression/cgalpngtest/polygon-mesh-expected.png Binary files differnew file mode 100644 index 0000000..6f4f437 --- /dev/null +++ b/tests/regression/cgalpngtest/polygon-mesh-expected.png diff --git a/tests/regression/cgalpngtest/polygon-overlap-expected.png b/tests/regression/cgalpngtest/polygon-overlap-expected.png Binary files differnew file mode 100644 index 0000000..6f4f437 --- /dev/null +++ b/tests/regression/cgalpngtest/polygon-overlap-expected.png diff --git a/tests/regression/cgalpngtest/polygon-riser-expected.png b/tests/regression/cgalpngtest/polygon-riser-expected.png Binary files differnew file mode 100644 index 0000000..ce9ca69 --- /dev/null +++ b/tests/regression/cgalpngtest/polygon-riser-expected.png diff --git a/tests/regression/cgalpngtest/polygon-self-intersect-expected.png b/tests/regression/cgalpngtest/polygon-self-intersect-expected.png Binary files differnew file mode 100644 index 0000000..6f4f437 --- /dev/null +++ b/tests/regression/cgalpngtest/polygon-self-intersect-expected.png diff --git a/tests/regression/cgalpngtest/polygon8-expected.png b/tests/regression/cgalpngtest/polygon8-expected.png Binary files differnew file mode 100644 index 0000000..8b480c0 --- /dev/null +++ b/tests/regression/cgalpngtest/polygon8-expected.png diff --git a/tests/regression/cgalpngtest/polygons-expected.png b/tests/regression/cgalpngtest/polygons-expected.png Binary files differnew file mode 100644 index 0000000..a30fcb6 --- /dev/null +++ b/tests/regression/cgalpngtest/polygons-expected.png diff --git a/tests/regression/cgalpngtest/transform-insert-expected.png b/tests/regression/cgalpngtest/transform-insert-expected.png Binary files differnew file mode 100644 index 0000000..12867cc --- /dev/null +++ b/tests/regression/cgalpngtest/transform-insert-expected.png diff --git a/tests/regression/cgalpngtest/transform-tests-expected.png b/tests/regression/cgalpngtest/transform-tests-expected.png Binary files differindex 08cfce8..77c52e7 100644 --- a/tests/regression/cgalpngtest/transform-tests-expected.png +++ b/tests/regression/cgalpngtest/transform-tests-expected.png diff --git a/tests/regression/cgalpngtest/triangle-with-duplicate-vertex-expected.png b/tests/regression/cgalpngtest/triangle-with-duplicate-vertex-expected.png Binary files differnew file mode 100644 index 0000000..8dd4de0 --- /dev/null +++ b/tests/regression/cgalpngtest/triangle-with-duplicate-vertex-expected.png diff --git a/tests/regression/csgtermtest/transform-insert-expected.txt b/tests/regression/csgtermtest/transform-insert-expected.txt deleted file mode 100644 index 847d6c3..0000000 --- a/tests/regression/csgtermtest/transform-insert-expected.txt +++ /dev/null @@ -1 +0,0 @@ -import2 diff --git a/tests/regression/csgtexttest/transform-insert-expected.txt b/tests/regression/csgtexttest/transform-insert-expected.txt deleted file mode 100644 index a673ddb..0000000 --- a/tests/regression/csgtexttest/transform-insert-expected.txt +++ /dev/null @@ -1 +0,0 @@ -group1(import) diff --git a/tests/regression/dumptest/transform-insert-expected.txt b/tests/regression/dumptest/transform-insert-expected.txt deleted file mode 100644 index 758c9e1..0000000 --- a/tests/regression/dumptest/transform-insert-expected.txt +++ /dev/null @@ -1,3 +0,0 @@ -group() { - import_dxf(file = "/Users/kintel/code/OpenSCAD/openscad-visitor/testdata/scad/minimal/transform-insert.dxf", cache = "4e39fca1.4329", layer = "", origin = [ 0 0 ], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1); -} diff --git a/tests/regression/opencsgtest/arc-expected.png b/tests/regression/opencsgtest/arc-expected.png Binary files differnew file mode 100644 index 0000000..a930c0e --- /dev/null +++ b/tests/regression/opencsgtest/arc-expected.png diff --git a/tests/regression/opencsgtest/circle-advanced-expected.png b/tests/regression/opencsgtest/circle-advanced-expected.png Binary files differnew file mode 100644 index 0000000..9dfbd61 --- /dev/null +++ b/tests/regression/opencsgtest/circle-advanced-expected.png diff --git a/tests/regression/opencsgtest/circle-double-expected.png b/tests/regression/opencsgtest/circle-double-expected.png Binary files differnew file mode 100644 index 0000000..81caba5 --- /dev/null +++ b/tests/regression/opencsgtest/circle-double-expected.png diff --git a/tests/regression/opencsgtest/circle-expected.png b/tests/regression/opencsgtest/circle-expected.png Binary files differnew file mode 100644 index 0000000..7bc63b1 --- /dev/null +++ b/tests/regression/opencsgtest/circle-expected.png diff --git a/tests/regression/opencsgtest/circle-small-expected.png b/tests/regression/opencsgtest/circle-small-expected.png Binary files differnew file mode 100644 index 0000000..9813b20 --- /dev/null +++ b/tests/regression/opencsgtest/circle-small-expected.png diff --git a/tests/regression/opencsgtest/ellipse-arc-expected.png b/tests/regression/opencsgtest/ellipse-arc-expected.png Binary files differnew file mode 100644 index 0000000..551630d --- /dev/null +++ b/tests/regression/opencsgtest/ellipse-arc-expected.png diff --git a/tests/regression/opencsgtest/ellipse-arc-rot-expected.png b/tests/regression/opencsgtest/ellipse-arc-rot-expected.png Binary files differnew file mode 100644 index 0000000..6b2a8e6 --- /dev/null +++ b/tests/regression/opencsgtest/ellipse-arc-rot-expected.png diff --git a/tests/regression/opencsgtest/ellipse-expected.png b/tests/regression/opencsgtest/ellipse-expected.png Binary files differnew file mode 100644 index 0000000..70ccad2 --- /dev/null +++ b/tests/regression/opencsgtest/ellipse-expected.png diff --git a/tests/regression/opencsgtest/ellipse-reverse-expected.png b/tests/regression/opencsgtest/ellipse-reverse-expected.png Binary files differnew file mode 100644 index 0000000..56c4710 --- /dev/null +++ b/tests/regression/opencsgtest/ellipse-reverse-expected.png diff --git a/tests/regression/opencsgtest/ellipse-rot-expected.png b/tests/regression/opencsgtest/ellipse-rot-expected.png Binary files differnew file mode 100644 index 0000000..598caa1 --- /dev/null +++ b/tests/regression/opencsgtest/ellipse-rot-expected.png diff --git a/tests/regression/opencsgtest/lwpolyline-closed-expected.png b/tests/regression/opencsgtest/lwpolyline-closed-expected.png Binary files differnew file mode 100644 index 0000000..c29d554 --- /dev/null +++ b/tests/regression/opencsgtest/lwpolyline-closed-expected.png diff --git a/tests/regression/opencsgtest/lwpolyline-expected.png b/tests/regression/opencsgtest/lwpolyline-expected.png Binary files differnew file mode 100644 index 0000000..c29d554 --- /dev/null +++ b/tests/regression/opencsgtest/lwpolyline-expected.png diff --git a/tests/regression/opencsgtest/lwpolyline2-expected.png b/tests/regression/opencsgtest/lwpolyline2-expected.png Binary files differnew file mode 100644 index 0000000..bdcb048 --- /dev/null +++ b/tests/regression/opencsgtest/lwpolyline2-expected.png diff --git a/tests/regression/opencsgtest/multiple-layers-expected.png b/tests/regression/opencsgtest/multiple-layers-expected.png Binary files differnew file mode 100644 index 0000000..1ba71bf --- /dev/null +++ b/tests/regression/opencsgtest/multiple-layers-expected.png diff --git a/tests/regression/opencsgtest/polygon-concave-expected.png b/tests/regression/opencsgtest/polygon-concave-expected.png Binary files differnew file mode 100644 index 0000000..130a5e6 --- /dev/null +++ b/tests/regression/opencsgtest/polygon-concave-expected.png diff --git a/tests/regression/opencsgtest/polygon-concave-hole-expected.png b/tests/regression/opencsgtest/polygon-concave-hole-expected.png Binary files differnew file mode 100644 index 0000000..22f035c --- /dev/null +++ b/tests/regression/opencsgtest/polygon-concave-hole-expected.png diff --git a/tests/regression/opencsgtest/polygon-concave-simple-expected.png b/tests/regression/opencsgtest/polygon-concave-simple-expected.png Binary files differnew file mode 100644 index 0000000..cf0569c --- /dev/null +++ b/tests/regression/opencsgtest/polygon-concave-simple-expected.png diff --git a/tests/regression/opencsgtest/polygon-holes-touch-expected.png b/tests/regression/opencsgtest/polygon-holes-touch-expected.png Binary files differnew file mode 100644 index 0000000..f72a36d --- /dev/null +++ b/tests/regression/opencsgtest/polygon-holes-touch-expected.png diff --git a/tests/regression/opencsgtest/polygon-intersect-expected.png b/tests/regression/opencsgtest/polygon-intersect-expected.png Binary files differnew file mode 100644 index 0000000..6f4f437 --- /dev/null +++ b/tests/regression/opencsgtest/polygon-intersect-expected.png diff --git a/tests/regression/opencsgtest/polygon-many-holes-expected.png b/tests/regression/opencsgtest/polygon-many-holes-expected.png Binary files differnew file mode 100644 index 0000000..cdbeae4 --- /dev/null +++ b/tests/regression/opencsgtest/polygon-many-holes-expected.png diff --git a/tests/regression/opencsgtest/polygon-mesh-expected.png b/tests/regression/opencsgtest/polygon-mesh-expected.png Binary files differnew file mode 100644 index 0000000..6f4f437 --- /dev/null +++ b/tests/regression/opencsgtest/polygon-mesh-expected.png diff --git a/tests/regression/opencsgtest/polygon-overlap-expected.png b/tests/regression/opencsgtest/polygon-overlap-expected.png Binary files differnew file mode 100644 index 0000000..6f4f437 --- /dev/null +++ b/tests/regression/opencsgtest/polygon-overlap-expected.png diff --git a/tests/regression/opencsgtest/polygon-riser-expected.png b/tests/regression/opencsgtest/polygon-riser-expected.png Binary files differnew file mode 100644 index 0000000..3513481 --- /dev/null +++ b/tests/regression/opencsgtest/polygon-riser-expected.png diff --git a/tests/regression/opencsgtest/polygon-self-intersect-expected.png b/tests/regression/opencsgtest/polygon-self-intersect-expected.png Binary files differnew file mode 100644 index 0000000..6f4f437 --- /dev/null +++ b/tests/regression/opencsgtest/polygon-self-intersect-expected.png diff --git a/tests/regression/opencsgtest/polygon8-expected.png b/tests/regression/opencsgtest/polygon8-expected.png Binary files differnew file mode 100644 index 0000000..5ee7c85 --- /dev/null +++ b/tests/regression/opencsgtest/polygon8-expected.png diff --git a/tests/regression/opencsgtest/polygons-expected.png b/tests/regression/opencsgtest/polygons-expected.png Binary files differnew file mode 100644 index 0000000..3ad971f --- /dev/null +++ b/tests/regression/opencsgtest/polygons-expected.png diff --git a/tests/regression/opencsgtest/transform-insert-expected.png b/tests/regression/opencsgtest/transform-insert-expected.png Binary files differnew file mode 100644 index 0000000..1d88a08 --- /dev/null +++ b/tests/regression/opencsgtest/transform-insert-expected.png diff --git a/tests/regression/opencsgtest/transform-tests-expected.png b/tests/regression/opencsgtest/transform-tests-expected.png Binary files differindex 9c763ba..dc43942 100644 --- a/tests/regression/opencsgtest/transform-tests-expected.png +++ b/tests/regression/opencsgtest/transform-tests-expected.png diff --git a/tests/regression/opencsgtest/triangle-with-duplicate-vertex-expected.png b/tests/regression/opencsgtest/triangle-with-duplicate-vertex-expected.png Binary files differnew file mode 100644 index 0000000..393de76 --- /dev/null +++ b/tests/regression/opencsgtest/triangle-with-duplicate-vertex-expected.png |
