Fixed tests for new polygon() behavior, sending only 2D points to OpenSCAD

etjones-erisyon · etjones-erisyon · commit f79d68c7fbb8 · 2020-05-24T12:55:45.000-05:00
diff --git a/solid/test/test_solidpython.py b/solid/test/test_solidpython.py
@@ -16,7 +16,7 @@
 from solid.test.ExpandedTestCase import DiffOutput
 
 scad_test_case_templates = [
-    {'name': 'polygon', 'class': 'polygon' , 'kwargs': {'paths': [[0, 1, 2]]}, 'expected': '\n\npolygon(paths = [[0, 1, 2]], points = [[0, 0, 0], [1, 0, 0], [0, 1, 0]]);', 'args': {'points': [[0, 0, 0], [1, 0, 0], [0, 1, 0]]}, },
+    {'name': 'polygon', 'class': 'polygon' , 'kwargs': {'paths': [[0, 1, 2]]}, 'expected': '\n\npolygon(paths = [[0, 1, 2]], points = [[0, 0], [1, 0], [0, 1]]);', 'args': {'points': [[0, 0, 0], [1, 0, 0], [0, 1, 0]]}, },
     {'name': 'circle', 'class': 'circle' , 'kwargs': {'segments': 12, 'r': 1}, 'expected': '\n\ncircle($fn = 12, r = 1);', 'args': {}, },
     {'name': 'circle_diam', 'class': 'circle' , 'kwargs': {'segments': 12, 'd': 1}, 'expected': '\n\ncircle($fn = 12, d = 1);', 'args': {}, },
     {'name': 'square', 'class': 'square' , 'kwargs': {'center': False, 'size': 1}, 'expected': '\n\nsquare(center = false, size = 1);', 'args': {}, },
diff --git a/solid/test/test_splines.py b/solid/test/test_splines.py
@@ -73,15 +73,6 @@ def test_bezier_points_3d(self):
         expected = [Point3(-2.00, -1.00, 0.00),Point3(0.00, 0.00, 0.75), Point3(2.00, 1.00, 0.00)]
         self.assertPointsListsEqual(expected, actual)
 
-    def test_bezier_polygon(self):
-        # Notably, OpenSCAD won't render a polygon made of 3-tuples, even if it
-        # lies in the XY plane. Verify that our generated polygon() code contains
-        # only 2-tuples
-        poly = bezier_polygon(self.bezier_controls, extrude_height=0, subdivisions=self.subdivisions)
-        actual = all((isinstance(p, Point2) for p in poly.params['points']))
-        expected = True
-        self.assertEqual(expected, actual)
-
     def test_catmull_rom_prism(self):
         sides = 3
         UP = Vector3(0,0,1)
