[test/id] Update id tests

Author: mpsonntag

test/test_doc.py

@@ -37,10 +37,10 @@ def test_id(self):
         doc = Document()
         self.assertIsNotNone(doc.id)
 
-        doc = Document("D", id="79b613eb-a256-46bf-84f6-207df465b8f7")
+        doc = Document("D", oid="79b613eb-a256-46bf-84f6-207df465b8f7")
         self.assertEqual(doc.id, "79b613eb-a256-46bf-84f6-207df465b8f7")
 
-        doc = Document("D", id="id")
+        doc = Document("D", oid="id")
         self.assertNotEqual(doc.id, "id")
 
         # Make sure id cannot be reset programmatically.

test/test_doc_integration.py

@@ -62,7 +62,7 @@ def test_id(self):
 
         # Test correct save and load of assigned id.
         assigned_id = "79b613eb-a256-46bf-84f6-207df465b8f7"
-        self.doc = odml.Document(id=assigned_id)
+        self.doc = odml.Document(oid=assigned_id)
         jdoc, xdoc, ydoc = self.save_load()
 
         self.assertEqual(jdoc.id, assigned_id)

test/test_property.py

@@ -436,10 +436,10 @@ def test_id(self):
         p = Property(name="P")
         self.assertIsNotNone(p.id)
 
-        p = Property("P", id="79b613eb-a256-46bf-84f6-207df465b8f7")
+        p = Property("P", oid="79b613eb-a256-46bf-84f6-207df465b8f7")
         self.assertEqual(p.id, "79b613eb-a256-46bf-84f6-207df465b8f7")
 
-        p = Property("P", id="id")
+        p = Property("P", oid="id")
         self.assertNotEqual(p.id, "id")
 
         # Make sure id cannot be reset programmatically.

test/test_property_integration.py

@@ -63,7 +63,7 @@ def test_id(self):
         # Test correct save and load of assigned id.
         prop_name = "assigned_id"
         assigned_id = "79b613eb-a256-46bf-84f6-207df465b8f7"
-        _ = odml.Property(name=prop_name, id=assigned_id,
+        _ = odml.Property(name=prop_name, oid=assigned_id,
                           parent=self.doc.sections[0])
 
         jdoc, xdoc, ydoc = self.save_load()

test/test_section.py

@@ -207,10 +207,10 @@ def test_id(self):
         s = Section(name="S")
         self.assertIsNotNone(s.id)
 
-        s = Section("S", id="79b613eb-a256-46bf-84f6-207df465b8f7")
+        s = Section("S", oid="79b613eb-a256-46bf-84f6-207df465b8f7")
         self.assertEqual(s.id, "79b613eb-a256-46bf-84f6-207df465b8f7")
 
-        s = Section("S", id="id")
+        s = Section("S", oid="id")
         self.assertNotEqual(s.id, "id")
 
         # Make sure id cannot be reset programmatically.

test/test_section_integration.py

@@ -55,20 +55,20 @@ def test_id(self):
 
         jdoc, xdoc, ydoc = self.save_load()
 
-        self.assertEqual(jdoc.sections[sec_name].id, sec.id)
-        self.assertEqual(xdoc.sections[sec_name].id, sec.id)
-        self.assertEqual(ydoc.sections[sec_name].id, sec.id)
+        self.assertEqual(jdoc.sections[sec_name].oid, sec.oid)
+        self.assertEqual(xdoc.sections[sec_name].oid, sec.oid)
+        self.assertEqual(ydoc.sections[sec_name].oid, sec.oid)
 
         # Test correct save and load of assigned id.
         sec_name = "assigned_id"
         assigned_id = "79b613eb-a256-46bf-84f6-207df465b8f7"
-        _ = odml.Section(name=sec_name, id=assigned_id, parent=self.doc)
+        _ = odml.Section(name=sec_name, oid=assigned_id, parent=self.doc)
 
         jdoc, xdoc, ydoc = self.save_load()
 
-        self.assertEqual(jdoc.sections[sec_name].id, assigned_id)
-        self.assertEqual(xdoc.sections[sec_name].id, assigned_id)
-        self.assertEqual(ydoc.sections[sec_name].id, assigned_id)
+        self.assertEqual(jdoc.sections[sec_name].oid, assigned_id)
+        self.assertEqual(xdoc.sections[sec_name].oid, assigned_id)
+        self.assertEqual(ydoc.sections[sec_name].oid, assigned_id)
 
     def test_simple_attributes(self):
         """