Update tests and remove test router

- There is now one test "test_encrypted_fields_map", more to come.
- Routing is done in the Django test suite settings.

Author: aclark4life

tests/encryption_/models.py

@@ -7,7 +7,6 @@
 class Person(EncryptedModel):
     name = models.CharField("name", max_length=100)
     ssn = EncryptedCharField("ssn", max_length=11, queries=["equality"])
-    ssn2 = EncryptedCharField("ssn", max_length=11, queries=["equality"])
 
     class Meta:
         required_db_features = {"supports_queryable_encryption"}

tests/encryption_/routers.py

@@ -1,28 +1,22 @@
 from django.db import connection
-from django.test import TestCase, override_settings
+from django.test import TestCase
 
 from .models import Person
-from .routers import EncryptedRouter
 
 
-@override_settings(DATABASE_ROUTERS=[EncryptedRouter()])
 class EncryptedModelTests(TestCase):
     databases = {"default", "encrypted"}
 
     @classmethod
     def setUpTestData(cls):
         cls.person = Person(ssn="123-45-6789")
 
-    def test_encrypted_fields_map_on_instance(self):
+    def test_encrypted_fields_map(self):
+        """ """
         expected = {
-            "fields": {
-                "ssn": "EncryptedCharField",
-            }
+            "fields": [
+                {"path": "ssn", "bsonType": "string", "queries": [{"queryType": "equality"}]}
+            ]
         }
         with connection.schema_editor() as editor:
             self.assertEqual(editor._get_encrypted_fields_map(self.person), expected)
-
-    def test_non_encrypted_fields_not_included(self):
-        with connection.schema_editor() as editor:
-            encrypted_field_names = editor._get_encrypted_fields_map(self.person).get("fields")
-            self.assertNotIn("name", encrypted_field_names)