Tests Point3dVector as tuple

Author: brgix

src/osut/osut.py

@@ -1046,21 +1046,12 @@ def is_same_vtx(s1=None, s2=None, indexed=True) -> bool:
         False: If invalid input (see logs).
 
     """
-    try:
-        s1 = list(s1)
-    except ValueError as e:
-        return False
-
-    try:
-        s2 = list(s2)
-    except ValueError as e:
-        return False
-
-    if len(s1) != len(s2):
-        return False
-
-    if indexed not in [True, False]:
-        indexed = True
+    s1  = list(to_p3Dv(s1))
+    s2  = list(to_p3Dv(s2))
+    if not s1: return False
+    if not s2: return False
+    if len(s1) != len(s2): return False
+    if indexed not in [True, False]: indexed = True
 
     if indexed:
         xOK = abs(s1[0].x() - s2[0].x()) < CN.TOL

tests/test_osut.py

@@ -86,13 +86,13 @@ def test04_materials(self):
 
     def test05_construction_thickness(self):
         o = osut.oslg
-        v = int("".join(openstudio.openStudioVersion().split(".")))
         self.assertEqual(o.status(), 0)
         self.assertEqual(o.level(), INF)
         self.assertEqual(o.reset(DBG), DBG)
         self.assertEqual(o.level(), DBG)
         self.assertEqual(o.status(), 0)
 
+        version = int("".join(openstudio.openStudioVersion().split(".")))
         translator = openstudio.osversion.VersionTranslator()
 
         # The v1.11.5 (2016) seb.osm, shipped with OpenStudio, holds (what
@@ -119,12 +119,12 @@ def test05_construction_thickness(self):
         thzone = thzone.get()
 
         # Before the fix.
-        if v >= 350:
+        if version >= 350:
             self.assertTrue(plenum.isEnclosedVolume())
             self.assertTrue(plenum.isVolumeDefaulted())
             self.assertTrue(plenum.isVolumeAutocalculated())
 
-        if 350 < v < 370:
+        if 350 < version < 370:
             self.assertEqual(round(plenum.volume(), 0), 234)
         else:
             self.assertEqual(round(plenum.volume(), 0), 0)
@@ -144,18 +144,28 @@ def test05_construction_thickness(self):
             self.assertEqual(len(adj.vertices()), len(s.vertices()))
 
             # Same vertex sequence? Should be in reverse order.
-            # for i, vertex in enumerate(adj.vertices()):
-            #     self.assertTrue(mod1.same?(vertex, s.vertices.at(i))).to be true
-            #
-            # expect(adj.surfaceType).to eq("RoofCeiling")
-            # expect(s.surfaceType).to eq("RoofCeiling")
-            # expect(s.setSurfaceType("Floor")).to be true
-            # expect(s.setVertices(s.vertices.reverse)).to be true
-            #
-            # # Vertices now in reverse order.
-            # adj.vertices.reverse.each_with_index do |vertex, i|
-            #     expect(mod1.same?(vertex, s.vertices.at(i))).to be true
+            for i, vtx in enumerate(adj.vertices()):
+                self.assertTrue(osut.is_same_vtx(vtx, s.vertices()[i]))
 
+            self.assertEqual(adj.surfaceType(), "RoofCeiling")
+            self.assertEqual(s.surfaceType(), "RoofCeiling")
+            self.assertTrue(s.setSurfaceType("Floor"))
+            vtx = list(s.vertices())
+            vtx.reverse()
+            self.assertTrue(s.setVertices(vtx))
+
+            # Vertices now in reverse order.
+            rvtx = list(adj.vertices())
+            rvtx.reverse()
+
+            for i, vtx in enumerate(rvtx):
+                self.assertTrue(osut.is_same_vtx(vtx, s.vertices()[i]))
+
+        # After the fix.
+        if version >= 350:
+            self.assertTrue(plenum.isEnclosedVolume())
+            self.assertTrue(plenum.isVolumeDefaulted())
+            self.assertTrue(plenum.isVolumeAutocalculated())
 
 
     def test06_insulatingLayer(self):