Rename/refactor tests, add stub connection test

Author: aclark4life

tests/encryption_/test_base.py

@@ -15,7 +15,7 @@
 
 @skipUnlessDBFeature("supports_queryable_encryption")
 @override_settings(DATABASE_ROUTERS=[TestEncryptedRouter()])
-class QueryableEncryptionTestCase(TransactionTestCase):
+class QueryableEncryptionTests(TransactionTestCase):
     databases = {"default", "encrypted"}
     available_apps = ["encryption_"]
 

tests/encryption_/test_connection.py

@@ -0,0 +1,12 @@
+from .test_base import QueryableEncryptionTests
+
+
+class TestConnection(QueryableEncryptionTests):
+    def test_connection(self):
+        # raise ImproperlyConfigured(
+        #       "Encrypted fields found but "
+        #       "DATABASES[[self.connection.alias}]['OPTIONS'] is missing "
+        #       "auto_encryption_opts. Please set `auto_encryption_opts` "
+        #       "in the connection settings."
+        #   )
+        pass

tests/encryption_/test_fields.py

@@ -4,7 +4,6 @@
 from bson.binary import Binary
 from django.conf import settings
 from django.db import connections
-from django.test import override_settings
 
 from .models import (
     Appointment,
@@ -14,12 +13,10 @@
     PatientPortalUser,
     PatientRecord,
 )
-from .routers import TestEncryptedRouter
-from .test_base import QueryableEncryptionTestCase
+from .test_base import QueryableEncryptionTests
 
 
-@override_settings(DATABASE_ROUTERS=[TestEncryptedRouter()])
-class QueryableEncryptionFieldTests(QueryableEncryptionTestCase):
+class FieldTests(QueryableEncryptionTests):
     def test_appointment(self):
         self.assertEqual(Appointment.objects.get(time="8:00").time, time(8, 0))
 

tests/encryption_/test_management.py

@@ -2,17 +2,17 @@
 
 from bson import json_util
 from django.core.management import call_command
-from django.test import modify_settings, override_settings
+from django.test import TransactionTestCase, modify_settings, override_settings, skipUnlessDBFeature
 
 from .routers import TestEncryptedRouter
-from .test_base import QueryableEncryptionTestCase
 
 
+@skipUnlessDBFeature("supports_queryable_encryption")
 @modify_settings(
     INSTALLED_APPS={"prepend": "django_mongodb_backend"},
 )
 @override_settings(DATABASE_ROUTERS=[TestEncryptedRouter()])
-class QueryableEncryptionCommandTests(QueryableEncryptionTestCase):
+class CommandTests(TransactionTestCase):
     available_apps = ["django_mongodb_backend", "encryption_"]
     maxDiff = None
     expected_patient_record = {

tests/encryption_/test_schema.py

@@ -1,12 +1,9 @@
 from django.db import connections
-from django.test import override_settings
 
-from .routers import TestEncryptedRouter
-from .test_base import QueryableEncryptionTestCase
+from .test_base import QueryableEncryptionTests
 
 
-@override_settings(DATABASE_ROUTERS=[TestEncryptedRouter()])
-class QueryableEncryptionSchemaTests(QueryableEncryptionTestCase):
+class SchemaTests(QueryableEncryptionTests):
     maxDiff = None
 
     def test_get_encrypted_fields_map(self):