Code review fixes (7/7)

Author: aclark4life

tests/encryption_/models.py

@@ -52,7 +52,7 @@ class PatientRecord(models.Model):
     ssn = EncryptedCharField(max_length=11, queries=EQUALITY_QUERY)
     birth_date = EncryptedDateField(queries=RANGE_QUERY)
     profile_picture = EncryptedBinaryField(queries=EQUALITY_QUERY)
-    patient_age = EncryptedIntegerField(
+    patient_age = EncryptedSmallIntegerField(
         "patient_age", queries={**RANGE_QUERY, "min": 0, "max": 100}
     )
     weight = EncryptedFloatField(queries=RANGE_QUERY)

tests/encryption_/test_base.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from django.test import TransactionTestCase, override_settings
+from django.test import TransactionTestCase, override_settings, skipUnlessDBFeature
 
 from .models import (
     Appointment,
@@ -12,6 +12,7 @@
 from .routers import TestEncryptedRouter
 
 
+@skipUnlessDBFeature("supports_queryable_encryption")
 @override_settings(DATABASE_ROUTERS=[TestEncryptedRouter()])
 class QueryableEncryptionTestCase(TransactionTestCase):
     databases = {"default", "encrypted"}

tests/encryption_/test_fields.py

@@ -4,7 +4,7 @@
 from bson.binary import Binary
 from django.conf import settings
 from django.db import connections
-from django.test import override_settings
+from django.test import override_settings, skipUnlessDBFeature
 
 from .models import (
     Appointment,
@@ -18,6 +18,7 @@
 from .test_base import QueryableEncryptionTestCase
 
 
+@skipUnlessDBFeature("supports_queryable_encryption")
 @override_settings(DATABASE_ROUTERS=[TestEncryptedRouter()])
 class QueryableEncryptionFieldTests(QueryableEncryptionTestCase):
     databases = {"default", "encrypted"}

tests/encryption_/test_management.py

@@ -5,13 +5,14 @@
 from bson import json_util
 from django.core.management import call_command
 from django.db import connections
-from django.test import modify_settings, override_settings
+from django.test import modify_settings, override_settings, skipUnlessDBFeature
 from pymongo.encryption import AutoEncryptionOpts
 
 from .routers import TestEncryptedRouter
 from .test_base import QueryableEncryptionTestCase
 
 
+@skipUnlessDBFeature("supports_queryable_encryption")
 @modify_settings(
     INSTALLED_APPS={"prepend": "django_mongodb_backend"},
 )
@@ -82,6 +83,13 @@ def test_create_new_keys(self):
             stdout=out,
         )
         command_output = json_util.loads(out.getvalue())
+
+        # TODO: Until the todo below is fixed, you can test this feature
+        # manually by uncommenting the following line and pasting the output
+        # into your client-side `encrypted_fields_map` configuration. You also
+        # need to temporarily configure server-side encryption for this to
+        # procedure to work.
+        # print(command_output).
         self._compare_output(
             self.expected_patient_record,
             command_output["encryption__patientrecord"],

tests/encryption_/test_schema.py

@@ -1,14 +1,16 @@
 from django.db import connections
-from django.test import override_settings
+from django.test import override_settings, skipUnlessDBFeature
 
 from .routers import TestEncryptedRouter
 from .test_base import QueryableEncryptionTestCase
 
 
+@skipUnlessDBFeature("supports_queryable_encryption")
 @override_settings(DATABASE_ROUTERS=[TestEncryptedRouter()])
 class QueryableEncryptionSchemaTests(QueryableEncryptionTestCase):
     databases = {"default", "encrypted"}
     available_apps = ["encryption_"]
+    maxDiff = None
 
     def test_get_encrypted_fields_map(self):
         """
@@ -24,7 +26,7 @@ def test_get_encrypted_fields_map(self):
         expected_encrypted_fields_map = {
             "fields": [
                 {
-                    "bsonType": "int",
+                    "bsonType": "long",
                     "path": "patient_id",
                     "queries": {"queryType": "equality"},
                 },