[test] Adapt Tests to Section Type Requirement

Author: fschrader1992

test/test_doc_integration.py

@@ -104,25 +104,26 @@ def test_children(self):
         """
         This test checks the correct saving and loading of Section children of a Document.
         """
+        s_type = "type"
         # Lvl 1 child Sections
-        sec_lvl_11 = odml.Section(name="sec_11", parent=self.doc)
-        _ = odml.Section(name="sec_12", parent=self.doc)
+        sec_lvl_11 = odml.Section(name="sec_11", type=s_type, parent=self.doc)
+        _ = odml.Section(name="sec_12", type=s_type, parent=self.doc)
 
         # Lvl 2 child Sections
-        sec_lvl_21 = odml.Section(name="sec_21", parent=sec_lvl_11)
-        _ = odml.Section(name="sec_22", parent=sec_lvl_11)
-        _ = odml.Section(name="sec_23", parent=sec_lvl_11)
+        sec_lvl_21 = odml.Section(name="sec_21", type=s_type, parent=sec_lvl_11)
+        _ = odml.Section(name="sec_22", type=s_type, parent=sec_lvl_11)
+        _ = odml.Section(name="sec_23", type=s_type, parent=sec_lvl_11)
 
         # Lvl 2 child Properties
         _ = odml.Property(name="prop_21", parent=sec_lvl_11)
         _ = odml.Property(name="prop_22", parent=sec_lvl_11)
         _ = odml.Property(name="prop_23", parent=sec_lvl_11)
 
         # Lvl 3 child Sections
-        _ = odml.Section(name="sec_31", parent=sec_lvl_21)
-        _ = odml.Section(name="sec_32", parent=sec_lvl_21)
-        _ = odml.Section(name="sec_33", parent=sec_lvl_21)
-        _ = odml.Section(name="sec_34", parent=sec_lvl_21)
+        _ = odml.Section(name="sec_31", type=s_type, parent=sec_lvl_21)
+        _ = odml.Section(name="sec_32", type=s_type, parent=sec_lvl_21)
+        _ = odml.Section(name="sec_33", type=s_type, parent=sec_lvl_21)
+        _ = odml.Section(name="sec_34", type=s_type, parent=sec_lvl_21)
 
         # Lvl 3 child Properties
         _ = odml.Property(name="prop_31", parent=sec_lvl_21)

test/test_dumper.py

@@ -16,17 +16,19 @@ def setUp(self):
         self.captured_stdout = StringIO()
         sys.stdout = self.captured_stdout
 
+        s_type = "type"
+
         self.doc = odml.Document(author='Rave', version='1.0')
-        s1 = odml.Section(name='Cell')
+        s1 = odml.Section(name='Cell', type=s_type)
         p1 = odml.Property(name='Type', values='Rechargeable')
         s1.append(p1)
 
-        s2 = odml.Section(name='Electrolyte')
+        s2 = odml.Section(name='Electrolyte', type=s_type)
         p2 = odml.Property(name='Composition', values='Ni-Cd')
         s2.append(p2)
         s1.append(s2)
 
-        s3 = odml.Section(name='Electrode')
+        s3 = odml.Section(name='Electrode', type=s_type)
         p3 = odml.Property(name='Material', values='Nickel')
         p4 = odml.Property(name='Models', values=['AA', 'AAA'])
         s3.append(p3)
@@ -41,11 +43,11 @@ def test_dump_doc(self):
         odml.tools.dumper.dump_doc(self.doc)
         output = [x.strip() for x in self.captured_stdout.getvalue().split('\n') if x]
         expected_output = []
-        expected_output.append("*Cell ()")
+        expected_output.append("*Cell (type='type')")
         expected_output.append(":Type (values=Rechargeable, dtype='string')")
-        expected_output.append("*Electrolyte ()")
+        expected_output.append("*Electrolyte (type='type')")
         expected_output.append(":Composition (values=Ni-Cd, dtype='string')")
-        expected_output.append("*Electrode ()")
+        expected_output.append("*Electrode (type='type')")
         expected_output.append(":Material (values=Nickel, dtype='string')")
         expected_output.append(":Models (values=[AA,AAA], dtype='string')")
         self.assertEqual(len(output), len(expected_output))

test/test_section_integration.py

@@ -51,7 +51,8 @@ def save_load(self):
     def test_id(self):
         # Test correct save and load of generated id.
         sec_name = "empty_id"
-        sec = odml.Section(name=sec_name, parent=self.doc)
+        sec_type = "type"
+        sec = odml.Section(name=sec_name, type=sec_type, parent=self.doc)
 
         jdoc, xdoc, ydoc = self.save_load()
 
@@ -62,7 +63,7 @@ def test_id(self):
         # Test correct save and load of assigned id.
         sec_name = "assigned_id"
         assigned_id = "79b613eb-a256-46bf-84f6-207df465b8f7"
-        _ = odml.Section(name=sec_name, oid=assigned_id, parent=self.doc)
+        _ = odml.Section(name=sec_name, oid=assigned_id, type=sec_type, parent=self.doc)
 
         jdoc, xdoc, ydoc = self.save_load()
 
@@ -116,31 +117,32 @@ def test_children(self):
         This test checks correct writing and loading of Section and Property
         children of a Section.
         """
-        root = odml.Section(name="root", parent=self.doc)
+        s_type = "type"
+        root = odml.Section(name="root", type=s_type, parent=self.doc)
 
         # Lvl 1 child Sections
-        sec_lvl_11 = odml.Section(name="sec_11", parent=root)
-        _ = odml.Section(name="sec_12", parent=root)
+        sec_lvl_11 = odml.Section(name="sec_11", type=s_type, parent=root)
+        _ = odml.Section(name="sec_12", type=s_type, parent=root)
 
         # Lvl 1 child Properties
         _ = odml.Property(name="prop_11", parent=root)
         _ = odml.Property(name="prop_12", parent=root)
 
         # Lvl 2 child Sections
-        sec_lvl_21 = odml.Section(name="sec_21", parent=sec_lvl_11)
-        _ = odml.Section(name="sec_22", parent=sec_lvl_11)
-        _ = odml.Section(name="sec_23", parent=sec_lvl_11)
+        sec_lvl_21 = odml.Section(name="sec_21", type=s_type, parent=sec_lvl_11)
+        _ = odml.Section(name="sec_22", type=s_type, parent=sec_lvl_11)
+        _ = odml.Section(name="sec_23", type=s_type, parent=sec_lvl_11)
 
         # Lvl 2 child Properties
         _ = odml.Property(name="prop_21", parent=sec_lvl_11)
         _ = odml.Property(name="prop_22", parent=sec_lvl_11)
         _ = odml.Property(name="prop_23", parent=sec_lvl_11)
 
         # Lvl 3 child Sections
-        _ = odml.Section(name="sec_31", parent=sec_lvl_21)
-        _ = odml.Section(name="sec_32", parent=sec_lvl_21)
-        _ = odml.Section(name="sec_33", parent=sec_lvl_21)
-        _ = odml.Section(name="sec_34", parent=sec_lvl_21)
+        _ = odml.Section(name="sec_31", type=s_type, parent=sec_lvl_21)
+        _ = odml.Section(name="sec_32", type=s_type, parent=sec_lvl_21)
+        _ = odml.Section(name="sec_33", type=s_type, parent=sec_lvl_21)
+        _ = odml.Section(name="sec_34", type=s_type, parent=sec_lvl_21)
 
         # Lvl 3 child Properties
         _ = odml.Property(name="prop_31", parent=sec_lvl_21)

test/test_validation.py

@@ -135,8 +135,8 @@ def test_standalone_section(self):
 
         sec_one = odml.Section("sec1")
 
-        for err in validate(sec_one).errors:
-            assert not err.is_error
+        res = validate(sec_one)
+        self.assertError(res, "Section type undefined")
 
         doc = samplefile.parse("""s1[undefined]""")
         res = validate(doc)