Code review fixes

Author: aclark4life

tests/encryption_/test_base.py

@@ -4,7 +4,7 @@
 from bson.binary import Binary
 from django.conf import settings
 from django.db import connections, models
-from django.test import TransactionTestCase, modify_settings, override_settings
+from django.test import TransactionTestCase, override_settings
 
 from django_mongodb_backend.fields import EncryptedFieldMixin
 
@@ -33,13 +33,10 @@ class EncryptedSlugField(EncryptedFieldMixin, models.SlugField):
     """
 
 
-@modify_settings(
-    INSTALLED_APPS={"prepend": "django_mongodb_backend"},
-)
 @override_settings(DATABASE_ROUTERS=[TestEncryptedRouter()])
 class EncryptedFieldTests(TransactionTestCase):
     databases = {"default", "encrypted"}
-    available_apps = ["django_mongodb_backend", "encryption_"]
+    available_apps = ["encryption_"]
 
     def setUp(self):
         self.appointment = Appointment.objects.create(time="8:00")

tests/encryption_/test_management.py

@@ -7,25 +7,6 @@
 from .routers import TestEncryptedRouter
 
 EXPECTED_ENCRYPTED_FIELDS_MAP = {
-    "encryption__billing": {
-        "fields": [
-            {
-                "bsonType": "string",
-                "path": "cc_type",
-                "queries": {"queryType": "equality"},
-            },
-            {
-                "bsonType": "long",
-                "path": "cc_number",
-                "queries": {"queryType": "equality"},
-            },
-            {
-                "bsonType": "decimal",
-                "path": "account_balance",
-                "queries": {"queryType": "range"},
-            },
-        ]
-    },
     "encryption__patientrecord": {
         "fields": [
             {
@@ -55,51 +36,6 @@
             },
         ]
     },
-    "encryption__patient": {
-        "fields": [
-            {
-                "bsonType": "int",
-                "path": "patient_id",
-                "queries": {"queryType": "equality"},
-            },
-            {
-                "bsonType": "string",
-                "path": "patient_name",
-            },
-            {
-                "bsonType": "string",
-                "path": "patient_notes",
-                "queries": {"queryType": "equality"},
-            },
-            {
-                "bsonType": "date",
-                "path": "registration_date",
-                "queries": {"queryType": "equality"},
-            },
-            {
-                "bsonType": "bool",
-                "path": "is_active",
-                "queries": {"queryType": "equality"},
-            },
-            {"bsonType": "string", "path": "email", "queries": {"queryType": "equality"}},
-        ]
-    },
-    "encryption__patientportaluser": {
-        "fields": [
-            {"bsonType": "string", "path": "ip_address", "queries": {"queryType": "equality"}},
-            {"bsonType": "string", "path": "url", "queries": {"queryType": "equality"}},
-        ]
-    },
-    "encryption__encryptednumbers": {
-        "fields": [
-            {"bsonType": "int", "path": "pos_bigint", "queries": {"queryType": "equality"}},
-            {"bsonType": "int", "path": "pos_smallint", "queries": {"queryType": "equality"}},
-            {"bsonType": "int", "path": "smallint", "queries": {"queryType": "equality"}},
-        ]
-    },
-    "encryption__appointment": {
-        "fields": [{"bsonType": "date", "path": "time", "queries": {"queryType": "equality"}}]
-    },
 }
 
 
@@ -113,11 +49,8 @@ class EncryptedFieldsManagementCommandTests(TransactionTestCase):
 
     def _compare_json(self, json1, json2):
         # Remove keyIds since they are different for each run.
-        for table in json2:
-            for field in json2[table]["fields"]:
-                del field["keyId"]
-        # TODO: probably we don't need to test the entire mapping, otherwise it
-        # requires updates every time a new model or field is added!
+        for field in json2["fields"]:
+            del field["keyId"]
         self.assertEqual(json1, json2)
 
     def test_show_encrypted_fields_map(self):
@@ -131,7 +64,10 @@ def test_show_encrypted_fields_map(self):
             stdout=out,
         )
         output_json = json_util.loads(out.getvalue())
-        self._compare_json(EXPECTED_ENCRYPTED_FIELDS_MAP, output_json)
+        self._compare_json(
+            EXPECTED_ENCRYPTED_FIELDS_MAP["encryption__patientrecord"],
+            output_json["encryption__patientrecord"],
+        )
 
     def test_create_encrypted_fields_map(self):
         self.maxDiff = None
@@ -145,4 +81,7 @@ def test_create_encrypted_fields_map(self):
             stdout=out,
         )
         output_json = json_util.loads(out.getvalue())
-        self._compare_json(EXPECTED_ENCRYPTED_FIELDS_MAP, output_json)
+        self._compare_json(
+            EXPECTED_ENCRYPTED_FIELDS_MAP["encryption__patientrecord"],
+            output_json["encryption__patientrecord"],
+        )