First pass at migrating test_university

Author: ethho

tests/schema_university.py

@@ -1,9 +1,7 @@
 import datajoint as dj
+import inspect
 
-schema = dj.Schema()
 
-
-@schema
 class Student(dj.Manual):
     definition = """
     student_id : int unsigned   # university-wide ID number
@@ -20,7 +18,6 @@ class Student(dj.Manual):
     """
 
 
-@schema
 class Department(dj.Manual):
     definition = """
     dept : varchar(6)   # abbreviated department name, e.g. BIOL
@@ -31,7 +28,6 @@ class Department(dj.Manual):
     """
 
 
-@schema
 class StudentMajor(dj.Manual):
     definition = """
     -> Student
@@ -41,7 +37,6 @@ class StudentMajor(dj.Manual):
     """
 
 
-@schema
 class Course(dj.Manual):
     definition = """
     -> Department
@@ -52,15 +47,13 @@ class Course(dj.Manual):
     """
 
 
-@schema
 class Term(dj.Manual):
     definition = """
     term_year : year
     term      : enum('Spring', 'Summer', 'Fall')
     """
 
 
-@schema
 class Section(dj.Manual):
     definition = """
     -> Course
@@ -71,7 +64,6 @@ class Section(dj.Manual):
     """
 
 
-@schema
 class CurrentTerm(dj.Manual):
     definition = """
     omega=0 : tinyint
@@ -80,15 +72,13 @@ class CurrentTerm(dj.Manual):
     """
 
 
-@schema
 class Enroll(dj.Manual):
     definition = """
     -> Student
     -> Section
     """
 
 
-@schema
 class LetterGrade(dj.Lookup):
     definition = """
     grade : char(2)
@@ -110,10 +100,13 @@ class LetterGrade(dj.Lookup):
     ]
 
 
-@schema
 class Grade(dj.Manual):
     definition = """
     -> Enroll
     ---
     -> LetterGrade
     """
+
+
+LOCALS_UNI = {k: v for k, v in locals().items() if inspect.isclass(v)}
+__all__ = list(LOCALS_UNI)

tests/test_university.py

@@ -1,27 +1,44 @@
-from nose.tools import assert_true, assert_list_equal, assert_false, raises
+import pytest
 import hashlib
+from pathlib import Path
 from datajoint import DataJointError
+import datajoint as dj
 from .schema_university import *
-from . import PREFIX, CONN_INFO
+from . import PREFIX, schema_university
 
 
 def _hash4(table):
-    """hash of table contents"""
+    """Hash of table contents"""
     data = table.fetch(order_by="KEY", as_dict=True)
     blob = dj.blob.pack(data, compress=False)
     return hashlib.md5(blob).digest().hex()[:4]
 
 
-@raises(DataJointError)
-def test_activate_unauthorized():
-    schema.activate("unauthorized", connection=dj.conn(**CONN_INFO))
-
-
-def test_activate():
-    schema.activate(
-        PREFIX + "_university", connection=dj.conn(**CONN_INFO)
-    )  # deferred activation
+@pytest.fixture
+def schema_uni_inactive():
+    schema = dj.Schema(context=schema_university.LOCALS_UNI)
+    schema(Student)
+    schema(Department)
+    schema(StudentMajor)
+    schema(Course)
+    schema(Term)
+    schema(Section)
+    schema(CurrentTerm)
+    schema(Enroll)
+    schema(LetterGrade)
+    schema(Grade)
+    yield schema
+    schema.drop()
+
+
+@pytest.fixture
+def schema_uni(db_creds_test, schema_uni_inactive, connection_test):
+    # Deferred activation
+    schema_uni_inactive.activate(
+        PREFIX + "_university", connection=dj.conn(**db_creds_test)
+    )
     # ---------------  Fill University -------------------
+    test_data_dir = Path(__file__).parent / "data"
     for table in (
         Student,
         Department,
@@ -33,12 +50,19 @@ def test_activate():
         Enroll,
         Grade,
     ):
-        from pathlib import Path
+        path = test_data_dir / Path(table.__name__ + ".csv")
+        assert path.is_file(), f"File {path} is not a file"
+        assert path.exists(), f"File {path} does not exist"
+        table().insert(path)
+    return schema_uni_inactive
+
 
-        table().insert(Path("./data/" + table.__name__ + ".csv"))
+def test_activate_unauthorized(schema_uni_inactive, db_creds_test, connection_test):
+    with pytest.raises(DataJointError):
+        schema_uni_inactive.activate("unauthorized", connection=dj.conn(**db_creds_test))
 
 
-def test_fill():
+def test_fill(schema_uni):
     """check that the randomized tables are consistently defined"""
     # check randomized tables
     assert len(Student()) == 300 and _hash4(Student) == "1e1a"
@@ -48,7 +72,7 @@ def test_fill():
     assert len(Grade()) == 3027 and _hash4(Grade) == "4a9d"
 
 
-def test_restrict():
+def test_restrict(schema_uni):
     """
     test diverse restrictions from the university database.
     This test relies on a specific instantiation of the database.
@@ -90,7 +114,7 @@ def test_restrict():
     assert len(special) == 158
 
 
-def test_advanced_join():
+def test_advanced_join(schema_uni):
     """test advanced joins"""
     # Students with ungraded courses in current term
     ungraded = Enroll * CurrentTerm - Grade
@@ -102,14 +126,14 @@ def test_advanced_join():
     assert len(ungraded.join(major)) == len(ungraded & major) == 31
 
 
-def test_union():
+def test_union(schema_uni):
     # effective left join Enroll with Major
     q1 = (Enroll & "student_id=101") + (Enroll & "student_id=102")
     q2 = Enroll & "student_id in (101, 102)"
     assert len(q1) == len(q2) == 41
 
 
-def test_aggr():
+def test_aggr(schema_uni):
     avg_grade_per_course = Course.aggr(
         Grade * LetterGrade, avg_grade="round(avg(points), 2)"
     )