Refactor management command tests

Author: aclark4life

tests/encryption_/test_base.py

@@ -115,7 +115,6 @@ def test_get_encrypted_fields_map(self):
                 },
             ]
         }
-        self.maxDiff = None
         connection = connections["encrypted"]
         auto_encryption_opts = getattr(connection.connection._options, "auto_encryption_opts", None)
         with connection.schema_editor() as editor:
@@ -131,11 +130,6 @@ def test_get_encrypted_fields_map(self):
                 expected_encrypted_fields_map,
             )
 
-    def test_set_encrypted_fields_map_in_client(self):
-        # TODO: Create new client with and without schema map provided then
-        # sync database to ensure encrypted collections are created in both
-        pass
-
     def test_appointment(self):
         self.assertEqual(Appointment.objects.get(time="8:00").time, time(8, 0))
 

tests/encryption_/test_management.py

@@ -6,8 +6,15 @@
 
 from .routers import TestEncryptedRouter
 
-EXPECTED_ENCRYPTED_FIELDS_MAP = {
-    "encryption__patientrecord": {
+
+@modify_settings(
+    INSTALLED_APPS={"prepend": "django_mongodb_backend"},
+)
+@override_settings(DATABASE_ROUTERS=[TestEncryptedRouter()])
+class EncryptedFieldsManagementCommandTests(TransactionTestCase):
+    databases = {"default", "encrypted"}
+    available_apps = ["django_mongodb_backend", "encryption_"]
+    expected_patient_record = {
         "fields": [
             {
                 "bsonType": "string",
@@ -35,19 +42,9 @@
                 "queries": {"queryType": "range"},
             },
         ]
-    },
-}
-
+    }
 
-@modify_settings(
-    INSTALLED_APPS={"prepend": "django_mongodb_backend"},
-)
-@override_settings(DATABASE_ROUTERS=[TestEncryptedRouter()])
-class EncryptedFieldsManagementCommandTests(TransactionTestCase):
-    databases = {"default", "encrypted"}
-    available_apps = ["django_mongodb_backend", "encryption_"]
-
-    def _compare_json(self, json1, json2):
+    def _compare_output(self, json1, json2):
         # Remove keyIds since they are different for each run.
         for field in json2["fields"]:
             del field["keyId"]
@@ -63,10 +60,10 @@ def test_show_encrypted_fields_map(self):
             verbosity=0,
             stdout=out,
         )
-        output_json = json_util.loads(out.getvalue())
-        self._compare_json(
-            EXPECTED_ENCRYPTED_FIELDS_MAP["encryption__patientrecord"],
-            output_json["encryption__patientrecord"],
+        command_output = json_util.loads(out.getvalue())
+        self._compare_output(
+            self.expected_patient_record,
+            command_output["encryption__patientrecord"],
         )
 
     def test_create_new_keys(self):
@@ -80,8 +77,11 @@ def test_create_new_keys(self):
             verbosity=0,
             stdout=out,
         )
-        output_json = json_util.loads(out.getvalue())
-        self._compare_json(
-            EXPECTED_ENCRYPTED_FIELDS_MAP["encryption__patientrecord"],
-            output_json["encryption__patientrecord"],
+        command_output = json_util.loads(out.getvalue())
+        self._compare_output(
+            self.expected_patient_record,
+            command_output["encryption__patientrecord"],
         )
+
+        # TODO: Create a new connection to verify that the keys can be used
+        # in a client-side configuration to migrate the encrypted fields.