test attachment excluded fields: set intersection into a variable for…

… readability

forms/tests/test_api.py

@@ -465,10 +465,13 @@ def test_attachment_post_public(
     response = admin_client.post(url, data=payload)
     assert response.status_code == 201
 
-    # When attachments are created, the HTTP response should not return any sensitive or unnecessary data
-    # Checks that the response does not contain any of the keys in EXCLUDED_ATTACHMENT_FIELDS
+    # When attachments are created,
+    # the HTTP response should not return any sensitive or unnecessary data
     attachment_keys = response.json().keys()
-    assert len(set(EXCLUDED_ATTACHMENT_FIELDS).intersection(set(attachment_keys))) == 0
+    unwanted_fields_in_response = set(EXCLUDED_ATTACHMENT_FIELDS).intersection(
+        set(attachment_keys)
+    )
+    assert len(unwanted_fields_in_response) == 0
 
     attachment_id = response.json()["id"]
     url = reverse("v1:pub_answer-list")

plotsearch/tests/api/test_plot_search.py

@@ -824,15 +824,14 @@ def test_area_search_create_simple_public(
     response = admin_client.post(
         url, json.dumps(data, cls=DjangoJSONEncoder), content_type="application/json"
     )
+
+    # When attachments are created,
+    # the HTTP response should not return any sensitive or unnecessary data
     attachments = response.json().get("area_search_attachments")
-    assert (
-        len(
-            set(attachments[0].keys()).intersection(
-                set(EXCLUDED_AREA_SEARCH_ATTACHMENT_FIELDS)
-            )
-        )
-        == 0
+    unwanted_fields_in_response = set(attachments[0].keys()).intersection(
+        set(EXCLUDED_AREA_SEARCH_ATTACHMENT_FIELDS)
     )
+    assert len(unwanted_fields_in_response) == 0
 
     assert response.status_code == 201, "%s %s" % (response.status_code, response.data)
     assert AreaSearch.objects.filter(id=response.data["id"]).exists()
@@ -905,17 +904,15 @@ def test_area_search_attachment_create_public(
 
     assert response.status_code == 201
 
-    # When attachments are created, the HTTP response should not return any sensitive or unnecessary data
-    # Checks that the response does not contain any of the keys in EXCLUDED_ATTACHMENT_FIELDS
+    # When attachments are created,
+    # the HTTP response should not return any sensitive or unnecessary data
     attachment_keys = response.json().keys()
-    assert (
-        len(
-            set(EXCLUDED_AREA_SEARCH_ATTACHMENT_FIELDS).intersection(
-                set(attachment_keys)
-            )
-        )
-        == 0
-    )
+
+    unwanted_fields_in_response = set(
+        EXCLUDED_AREA_SEARCH_ATTACHMENT_FIELDS
+    ).intersection(set(attachment_keys))
+
+    assert len(unwanted_fields_in_response) == 0
     assert AreaSearchAttachment.objects.filter(
         area_search=area_search_test_data
     ).exists()

plotsearch/tests/serializers/test_plot_search_serializers.py

@@ -80,16 +80,19 @@ def test_get_plan_unit_or_custom_detailed_plan_badrequest(
 
 
 @pytest.mark.django_db
-def test_attachment_public_serializer(attachment_factory, user_factory):
+def test_attachment_public_serializer_unwanted_fields(attachment_factory, user_factory):
     user = user_factory()
     example_file = SimpleUploadedFile(name="example.txt", content=b"Lorem lipsum")
     attachment = attachment_factory(attachment=example_file, user=user)
     data = AttachmentPublicSerializer(attachment).data
-    assert len(set(data.keys()).intersection(set(EXCLUDED_ATTACHMENT_FIELDS))) == 0
+    unwanted_fields_in_data = set(data.keys()).intersection(
+        set(EXCLUDED_ATTACHMENT_FIELDS)
+    )
+    assert len(unwanted_fields_in_data) == 0
 
 
 @pytest.mark.django_db
-def test_area_search_attachment_public_serializer(
+def test_area_search_attachment_public_serializer_unwanted_fields(
     area_search_attachment_factory, user_factory
 ):
     user = user_factory()
@@ -98,7 +101,7 @@ def test_area_search_attachment_public_serializer(
         attachment=example_file, user=user
     )
     data = AreaSearchAttachmentPublicSerializer(area_search_attachment).data
-    assert (
-        len(set(data.keys()).intersection(set(EXCLUDED_AREA_SEARCH_ATTACHMENT_FIELDS)))
-        == 0
+    unwanted_fields_in_data = set(data.keys()).intersection(
+        set(EXCLUDED_AREA_SEARCH_ATTACHMENT_FIELDS)
     )
+    assert len(unwanted_fields_in_data) == 0