Fix tests for building frames in tests.test_typedef and tests.test_term

Author: althonos

tests/common.py

@@ -10,39 +10,41 @@
 
 class _TestFrame(object):
 
-    type = NotImplementedError
+    Frame = NotImplementedError
+    NameClause = None
+    CreatedByClause = None
 
     def setUp(self):
         self.id = fastobo.id.PrefixedIdent("MS", "1000031")
 
     def test_init(self):
         try:
-            frame = self.type(self.id)
+            frame = self.Frame(self.id)
         except Exception:
             self.fail("could not create frame instances")
 
     def test_init_iterable(self):
         try:
-            frame = self.type(self.id, [])
+            frame = self.Frame(self.id, [])
         except Exception:
             self.fail("could not create frame instances")
         try:
-            frame = self.type(self.id, [
-                fastobo.term.NameClause("thing"),
-                fastobo.term.CreatedByClause("Martin Larralde")
+            frame = self.Frame(self.id, [
+                self.NameClause("thing"),
+                self.CreatedByClause("Martin Larralde")
             ])
         except Exception:
             self.fail("could not create frame from iterable")
 
     def test_init_type_error(self):
-        self.assertRaises(TypeError, self.type, 1)
-        self.assertRaises(TypeError, self.type, [1])
-        self.assertRaises(TypeError, self.type, ["abc"])
-        self.assertRaises(TypeError, self.type, "abc")
-        self.assertRaises(TypeError, self.type, self.id, 1)
-        self.assertRaises(TypeError, self.type, self.id, [1])
-        self.assertRaises(TypeError, self.type, self.id, ["abc"])
-        self.assertRaises(TypeError, self.type, self.id, "abc")
+        self.assertRaises(TypeError, self.Frame, 1)
+        self.assertRaises(TypeError, self.Frame, [1])
+        self.assertRaises(TypeError, self.Frame, ["abc"])
+        self.assertRaises(TypeError, self.Frame, "abc")
+        self.assertRaises(TypeError, self.Frame, self.id, 1)
+        self.assertRaises(TypeError, self.Frame, self.id, [1])
+        self.assertRaises(TypeError, self.Frame, self.id, ["abc"])
+        self.assertRaises(TypeError, self.Frame, self.id, "abc")
 
 
 # --- DefClause --------------------------------------------------------------
@@ -122,7 +124,7 @@ def test_eq(self):
 
 # --- CreationDateClause -----------------------------------------------------
 
-class _TestIsObsoleteClause(object):
+class _TestCreationDateClause(object):
 
     type = NotImplementedError
 
@@ -132,12 +134,12 @@ def test_date(self):
         self.assertEqual(str(clause), "creation_date: 2021-01-23")
         self.assertEqual(repr(clause), "CreationDateClause(datetime.date(2021, 1, 23))")
         self.assertEqual(clause.date, d1)
-        self.assertIsInstance(clause.date, d1)
+        self.assertIsInstance(clause.date, datetime.date)
         d2 = datetime.date(2021, 2, 15)
         clause.date = d2
         self.assertIsInstance(clause.date, datetime.date)
 
-    def test_date(self):
+    def test_datetime(self):
         d1 = datetime.datetime(2021, 1, 23, 12)
         clause = self.type(d1)
         self.assertEqual(str(clause), "creation_date: 2021-01-23T12:00:00")

tests/test_term.py

@@ -10,13 +10,15 @@
     _TestIsObsoleteClause,
     _TestDefClause,
     _TestConsiderClause,
-    _TestIsObsoleteClause,
+    _TestCreationDateClause,
 )
 
 # --- TermFrame --------------------------------------------------------------
 
 class TestTermFrame(_TestFrame, unittest.TestCase):
-    type = fastobo.term.TermFrame
+    Frame = fastobo.term.TermFrame
+    NameClause = fastobo.term.NameClause
+    CreatedByClause = fastobo.term.CreatedByClause
 
 
 # --- DefClause --------------------------------------------------------------
@@ -39,5 +41,5 @@ class TestIsObsoleteClause(_TestIsObsoleteClause, unittest.TestCase):
 
 # --- CreationDateClause -----------------------------------------------------
 
-class TestIsObsoleteClause(_TestIsObsoleteClause, unittest.TestCase):
+class TestCreationDateClause(_TestCreationDateClause, unittest.TestCase):
     type = fastobo.term.CreationDateClause

tests/test_typedef.py

@@ -10,13 +10,15 @@
     _TestIsObsoleteClause,
     _TestDefClause,
     _TestConsiderClause,
-    _TestIsObsoleteClause,
+    _TestCreationDateClause,
 )
 
-# --- TermFrame --------------------------------------------------------------
+# --- TypedefFrame -----------------------------------------------------------
 
 class TestTypedefFrame(_TestFrame, unittest.TestCase):
-    type = fastobo.typedef.TypedefFrame
+    Frame = fastobo.typedef.TypedefFrame
+    NameClause = fastobo.typedef.NameClause
+    CreatedByClause = fastobo.typedef.CreatedByClause
 
 
 # --- DefClause --------------------------------------------------------------
@@ -39,5 +41,5 @@ class TestIsObsoleteClause(_TestIsObsoleteClause, unittest.TestCase):
 
 # --- CreationDateClause -----------------------------------------------------
 
-class TestIsObsoleteClause(_TestIsObsoleteClause, unittest.TestCase):
+class TestCreationDateClause(_TestCreationDateClause, unittest.TestCase):
     type = fastobo.typedef.CreationDateClause