Update test model names prefix and suffix

Author: aclark4life

tests/encryption_/test_management.py

@@ -22,74 +22,74 @@ class CommandTests(EncryptionTestCase):
             ]
         },
         # Equality-queryable fields
-        "encryption__encryptedbinarytest": {
+        "encryption__binarymodel": {
             "fields": [
                 {"bsonType": "binData", "path": "value", "queries": {"queryType": "equality"}}
             ]
         },
-        "encryption__encryptedbooleantest": {
+        "encryption__booleanmodel": {
             "fields": [{"bsonType": "bool", "path": "value", "queries": {"queryType": "equality"}}]
         },
-        "encryption__encryptedchartest": {
+        "encryption__charmodel": {
             "fields": [
                 {"bsonType": "string", "path": "value", "queries": {"queryType": "equality"}}
             ]
         },
-        "encryption__encryptedemailtest": {
+        "encryption__emailmodel": {
             "fields": [
                 {"bsonType": "string", "path": "value", "queries": {"queryType": "equality"}}
             ]
         },
-        "encryption__encryptedgenericipaddresstest": {
+        "encryption__genericipaddressmodel": {
             "fields": [
                 {"bsonType": "string", "path": "value", "queries": {"queryType": "equality"}}
             ]
         },
-        "encryption__encryptedtexttest": {
+        "encryption__textmodel": {
             "fields": [
                 {"bsonType": "string", "path": "value", "queries": {"queryType": "equality"}}
             ]
         },
-        "encryption__encryptedurltest": {
+        "encryption__urlmodel": {
             "fields": [
                 {"bsonType": "string", "path": "value", "queries": {"queryType": "equality"}}
             ]
         },
         # Range-queryable fields
-        "encryption__encryptedbigintegertest": {
+        "encryption__bigintegermodel": {
             "fields": [{"bsonType": "long", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "encryption__encrypteddatetest": {
+        "encryption__datemodel": {
             "fields": [{"bsonType": "date", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "encryption__encrypteddatetimetest": {
+        "encryption__datetimemodel": {
             "fields": [{"bsonType": "date", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "encryption__encrypteddecimaltest": {
+        "encryption__decimalmodel": {
             "fields": [{"bsonType": "decimal", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "encryption__encrypteddurationtest": {
+        "encryption__durationmodel": {
             "fields": [{"bsonType": "long", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "encryption__encryptedfloattest": {
+        "encryption__floatmodel": {
             "fields": [{"bsonType": "double", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "encryption__encryptedintegertest": {
+        "encryption__integermodel": {
             "fields": [{"bsonType": "long", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "encryption__encryptedpositivebigintegertest": {
+        "encryption__positivebigintegermodel": {
             "fields": [{"bsonType": "long", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "encryption__encryptedpositiveintegertest": {
+        "encryption__positiveintegermodel": {
             "fields": [{"bsonType": "long", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "encryption__encryptedpositivesmallintegertest": {
+        "encryption__positivesmallintegermodel": {
             "fields": [{"bsonType": "int", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "encryption__encryptedsmallintegertest": {
+        "encryption__smallintegermodel": {
             "fields": [{"bsonType": "int", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "encryption__encryptedtimetest": {
+        "encryption__timemodel": {
             "fields": [{"bsonType": "date", "path": "value", "queries": {"queryType": "range"}}]
         },
     }

tests/encryption_/test_schema.py

@@ -18,80 +18,80 @@ class SchemaTests(EncryptionTestCase):
                 {"bsonType": "object", "path": "patient_record.billing"},
             ]
         },
-        "EncryptedBinaryTest": {
+        "BinaryModel": {
             "fields": [
                 {"bsonType": "binData", "path": "value", "queries": {"queryType": "equality"}}
             ]
         },
-        "EncryptedBooleanTest": {
+        "BooleanModel": {
             "fields": [{"bsonType": "bool", "path": "value", "queries": {"queryType": "equality"}}]
         },
-        "EncryptedCharTest": {
+        "CharModel": {
             "fields": [
                 {"bsonType": "string", "path": "value", "queries": {"queryType": "equality"}}
             ]
         },
-        "EncryptedEmailTest": {
+        "EmailModel": {
             "fields": [
                 {"bsonType": "string", "path": "value", "queries": {"queryType": "equality"}}
             ]
         },
-        "EncryptedGenericIPAddressTest": {
+        "GenericIPAddressModel": {
             "fields": [
                 {"bsonType": "string", "path": "value", "queries": {"queryType": "equality"}}
             ]
         },
-        "EncryptedTextTest": {
+        "TextModel": {
             "fields": [
                 {"bsonType": "string", "path": "value", "queries": {"queryType": "equality"}}
             ]
         },
-        "EncryptedURLTest": {
+        "URLModel": {
             "fields": [
                 {"bsonType": "string", "path": "value", "queries": {"queryType": "equality"}}
             ]
         },
-        "EncryptedBigIntegerTest": {
+        "BigIntegerModel": {
             "fields": [{"bsonType": "long", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "EncryptedDateTest": {
+        "DateModel": {
             "fields": [{"bsonType": "date", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "EncryptedDateTimeTest": {
+        "DateTimeModel": {
             "fields": [{"bsonType": "date", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "EncryptedDecimalTest": {
+        "DecimalModel": {
             "fields": [{"bsonType": "decimal", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "EncryptedDurationTest": {
+        "DurationModel": {
             "fields": [{"bsonType": "long", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "EncryptedFloatTest": {
+        "FloatModel": {
             "fields": [{"bsonType": "double", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "EncryptedIntegerTest": {
+        "IntegerModel": {
             "fields": [{"bsonType": "long", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "EncryptedPositiveBigIntegerTest": {
+        "PositiveBigIntegerModel": {
             "fields": [{"bsonType": "long", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "EncryptedPositiveIntegerTest": {
+        "PositiveIntegerModel": {
             "fields": [{"bsonType": "long", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "EncryptedPositiveSmallIntegerTest": {
+        "PositiveSmallIntegerModel": {
             "fields": [{"bsonType": "int", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "EncryptedSmallIntegerTest": {
+        "SmallIntegerModel": {
             "fields": [{"bsonType": "int", "path": "value", "queries": {"queryType": "range"}}]
         },
-        "EncryptedTimeTest": {
+        "TimeModel": {
             "fields": [{"bsonType": "date", "path": "value", "queries": {"queryType": "range"}}]
         },
     }
 
     def test_get_encrypted_fields_all_models(self):
         """
-        Loops through all Encrypted*Test models,
+        Loops through all models,
         checks their encrypted fields map from the schema editor,
         and compares to expected BSON type & queries mapping.
         """
@@ -120,7 +120,7 @@ def test_key_creation_and_lookup(self):
         key_vault_db, key_vault_coll = auto_encryption_opts._key_vault_namespace.split(".", 1)
         vault_coll = client[key_vault_db][key_vault_coll]
 
-        model_class = models.EncryptedCharTest
+        model_class = models.CharModel
         test_key_alt_name = f"{model_class._meta.db_table}.value"
         vault_coll.delete_many({"keyAltNames": test_key_alt_name})