update to tests

Author: jtsodapop

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6
+FROM python:3.7
 
 COPY . /usr/src/labelbox
 WORKDIR /usr/src/labelbox

labelbox/schema/ontology_generator.py

@@ -143,7 +143,7 @@ def add_classification(self, classification: Classification):
                                            for c in self.classifications):
             raise InconsistentOntologyException(
                 f"Duplicate nested classification '{classification.instructions}' "
-                f"for option '{self.label}'")
+                f"for tool '{self.name}'")
         self.classifications.append(classification)      
 
 @dataclass
@@ -175,7 +175,7 @@ def add_classification(self, classification: Classification) -> Classification:
         if classification.instructions in (c.instructions 
                                            for c in self.classifications):
             raise InconsistentOntologyException(
-                f"Duplicate classifications instructions '{classification.instructions}'. ")
+                f"Duplicate classification instructions '{classification.instructions}'. ")
         self.classifications.append(classification)
 
     def asdict(self):

tests/integration/test_ontology.py

@@ -1,10 +1,3 @@
-"""
-TODO:
-test option.add_option
-test classification.add_option
-test tool.add_classification
-consider testing and ensuring failed scenarios
-"""
 from typing import Any, Dict, List, Union
 
 import pytest
@@ -21,7 +14,7 @@
             "color": "#FF0000",
             "tool": "rectangle",
             "classifications": []
-}],
+        }],
         "classifications": [{
             "required": True,
             "instructions": "This is a question.",
@@ -71,9 +64,12 @@ def test_add_ontology_tool() -> None:
 
     second_tool = Tool(tool = Tool.Type.SEGMENTATION, name = "segmentation")
     o.add_tool(second_tool)
-
     assert len(o.tools) == 2
 
+    with pytest.raises(InconsistentOntologyException) as exc:
+        o.add_tool(Tool(tool=Tool.Type.BBOX, name = "bounding box"))
+    assert "Duplicate tool name" in str(exc.value)
+
 def test_add_ontology_classification() -> None:
     o = Ontology()
     o.add_classification(Classification(
@@ -82,23 +78,56 @@ def test_add_ontology_classification() -> None:
     second_classification = Classification(
         class_type = Classification.Type.CHECKLIST, instructions = "checklist")
     o.add_classification(second_classification)
-
     assert len(o.classifications) == 2
 
+    with pytest.raises(InconsistentOntologyException) as exc:
+        o.add_classification(Classification(
+            class_type = Classification.Type.TEXT, instructions = "text"))
+    assert "Duplicate classification instructions" in str(exc.value)
+
+def test_tool_add_classification() -> None:
+    t = Tool(tool = Tool.Type.SEGMENTATION, name = "segmentation")
+    c = Classification(
+        class_type = Classification.Type.TEXT, instructions = "text")
+    t.add_classification(c)
+    assert t.classifications[0] == c
+
+    with pytest.raises(Exception) as exc:
+        t.add_classification(c)
+    assert "Duplicate nested classification" in str(exc)
+
+def test_classification_add_option() -> None:
+    c = Classification(
+        class_type = Classification.Type.RADIO, instructions = "radio")
+    o = Option(value = "option")
+    c.add_option(o)
+    assert c.options[0] == o
+
+    with pytest.raises(InconsistentOntologyException) as exc:
+        c.add_option(Option(value = "option"))
+    assert "Duplicate option" in str(exc.value)
+
+def test_option_add_option() -> None:
+    o = Option(value = "option")
+    c = Classification(
+        class_type = Classification.Type.TEXT, instructions = "text")
+    o.add_option(c)
+    assert o.options[0] == c
+
+    with pytest.raises(InconsistentOntologyException) as exc:
+        o.add_option(c)
+    assert "Duplicate nested classification" in str(exc.value)    
+
 def test_ontology_asdict(project) -> None:
     o = Ontology.from_project(project)
     assert o.asdict() == project.ontology().normalized
 
 def test_from_project_ontology(client, project) -> None:
-    frontend = list(
-        client.get_labeling_frontends(
-            where=LabelingFrontend.name == "Editor"))[0]
+    frontend = list(client.get_labeling_frontends(
+        where=LabelingFrontend.name == "Editor"))[0]
     project.setup(frontend, _SAMPLE_ONTOLOGY)    
     o = Ontology.from_project(project)
 
     assert o.tools[0].tool == Tool.Type.BBOX
     assert o.classifications[0].class_type == Classification.Type.RADIO
-    assert o.classifications[0].options[0].value.lower() == "yes"
-
-    
-    
+    assert o.classifications[0].options[0].value.lower() == "yes"