Code review fixes

- Remove t1/t2 in test_time
- Factor out skipUnlessDBFeature into base test case.
- Test encryption_patient not encryption_patientrecord (still not right,
  but will follow up to clarify/fix)

Author: aclark4life

tests/encryption_/test_base.py

@@ -1,6 +1,7 @@
-from django.test import TestCase
+from django.test import TestCase, skipUnlessDBFeature
 
 
+@skipUnlessDBFeature("supports_queryable_encryption")
 class EncryptionTestCase(TestCase):
     databases = {"default", "encrypted"}
     maxDiff = None

tests/encryption_/test_fields.py

@@ -1,7 +1,7 @@
 import datetime
 from decimal import Decimal
 
-from django.test import TestCase, skipUnlessDBFeature
+from django.test import TestCase
 
 from .models import (
     Billing,
@@ -30,7 +30,6 @@
 from .test_base import EncryptionTestCase
 
 
-@skipUnlessDBFeature("supports_queryable_encryption")
 class PatientModelTests(EncryptionTestCase):
     def setUp(self):
         self.billing = Billing(cc_type="Visa", cc_number="4111111111111111")
@@ -46,7 +45,6 @@ def test_patient(self):
         self.assertEqual(patient.patient_record.billing.cc_number, "4111111111111111")
 
 
-@skipUnlessDBFeature("supports_queryable_encryption")
 class EncryptedFieldTests(TestCase):
     databases = {"default", "encrypted"}
 
@@ -145,6 +143,9 @@ def test_small_integer(self):
         self.assertRange(EncryptedSmallIntegerTest, low=-5, high=2, threshold=0)
 
     def test_time(self):
-        t1 = datetime.time(10, 0)
-        t2 = datetime.time(15, 0)
-        self.assertRange(EncryptedTimeTest, low=t1, high=t2, threshold=datetime.time(12, 0))
+        self.assertRange(
+            EncryptedTimeTest,
+            low=datetime.time(10, 0),
+            high=datetime.time(15, 0),
+            threshold=datetime.time(12, 0),
+        )

tests/encryption_/test_management.py

@@ -2,17 +2,16 @@
 
 from bson import json_util
 from django.core.management import call_command
-from django.test import modify_settings, skipUnlessDBFeature
+from django.test import modify_settings
 
 from .test_base import EncryptionTestCase
 
 
-@skipUnlessDBFeature("supports_queryable_encryption")
 @modify_settings(INSTALLED_APPS={"prepend": "django_mongodb_backend"})
 class CommandTests(EncryptionTestCase):
     # Expected encrypted field maps for all Encrypted* models
     expected_maps = {
-        "encryption__patientrecord": {
+        "encryption__patient": {
             "fields": [
                 {"bsonType": "string", "path": "ssn", "queries": {"queryType": "equality"}},
                 {"bsonType": "object", "path": "billing"},

tests/encryption_/test_schema.py

@@ -1,11 +1,9 @@
 from django.db import connections
-from django.test import skipUnlessDBFeature
 
 from . import models
 from .test_base import EncryptionTestCase
 
 
-@skipUnlessDBFeature("supports_queryable_encryption")
 class SchemaTests(EncryptionTestCase):
     # Expected encrypted fields map per model
     expected_map = {