Merge branch 'main' into main

Author: AlexKempen

.vscode/settings.json

@@ -55,5 +55,8 @@
         "**/assets": true,
         "**/dist": true,
         "**/*.code-search": true
-    }
+    },
+    "python.testing.unittestArgs": ["-v", "-s", "./tests", "-p", "*test*.py"],
+    "python.testing.pytestEnabled": false,
+    "python.testing.unittestEnabled": true
 }

backend_tools/pull_scripts.py

@@ -5,7 +5,6 @@
 from onshape_api.endpoints import feature_studios
 from featurescript import feature_studio
 from featurescript.transform import transform
-from featurescript import conf
 from robot_code.documents import BACKEND
 
 

onshape_api/paths/paths.py

@@ -48,7 +48,7 @@ def __hash__(self) -> int:
         return hash(self.document_id)
 
     def __eq__(self, other) -> bool:
-        return isinstance(other, type(self)) and self.document_id == other.document_id
+        return isinstance(other, DocumentPath) and self.document_id == other.document_id
 
     def __str__(self) -> str:
         return DocumentPath.to_api_path(self)
@@ -111,7 +111,7 @@ def __hash__(self) -> int:
 
     def __eq__(self, other) -> bool:
         return (
-            isinstance(other, type(self))
+            isinstance(other, InstancePath)
             and super().__eq__(other)
             and self.instance_id == other.instance_id
             and self.wvm == other.wvm
@@ -167,7 +167,7 @@ def __hash__(self) -> int:
 
     def __eq__(self, other) -> bool:
         return (
-            isinstance(other, type(self))
+            isinstance(other, ElementPath)
             and self.__eq__(other)
             and self.element_id == other.element_id
         )
@@ -221,7 +221,7 @@ def __hash__(self) -> int:
 
     def __eq__(self, other) -> bool:
         return (
-            isinstance(other, type(self))
+            isinstance(other, PartPath)
             and self.__eq__(other)
             and self.part_id == other.part_id
         )

tests/path_tests.py

@@ -0,0 +1,44 @@
+import unittest
+
+from onshape_api.paths.paths import DocumentPath, ElementPath, InstancePath
+
+inst_path = InstancePath("1", "2")
+same_path = InstancePath("1", "2")
+diff_path = InstancePath("1", "5")
+
+doc_path = DocumentPath("1")
+element_path = ElementPath("1", "2", "5")
+
+
+class TestPathMethods(unittest.TestCase):
+    def test_basic_comparisons(self):
+        self.assertTrue(inst_path == same_path)
+        self.assertFalse(inst_path is same_path)
+
+    def test_eq(self):
+        self.assertTrue(inst_path.__eq__(same_path))
+
+    def test_hash(self):
+        self.assertTrue(inst_path.__hash__() == same_path.__hash__())
+
+    def test_in(self):
+        self.assertTrue(inst_path in [same_path])
+        self.assertTrue(inst_path in {same_path})
+
+    def test_diff(self):
+        self.assertFalse(inst_path == diff_path)
+        self.assertFalse(inst_path is diff_path)
+        self.assertFalse(inst_path in [diff_path])
+        self.assertFalse(inst_path in {diff_path})
+
+    def test_conversions(self):
+        self.assertFalse(inst_path == doc_path)
+        self.assertFalse(inst_path == element_path)
+        self.assertFalse(inst_path is element_path)
+        self.assertFalse(doc_path is inst_path)
+
+    def test_in_conversions(self):
+        self.assertFalse(doc_path in [inst_path])
+        self.assertFalse(doc_path in {inst_path})
+        self.assertFalse(inst_path in [element_path])
+        self.assertFalse(inst_path in {element_path})