Clean up tests

Author: koopmant

app/tests/challenges_tests/test_forms.py

@@ -14,39 +14,45 @@
 )
 
 
+@pytest.mark.parametrize(
+    "required_field",
+    [
+        "title",
+        "short_name",
+        "start_date",
+        "end_date",
+        "abstract",
+        "contact_email",
+        "organizers",
+        "challenge_setup",
+        "data_set",
+        "submission_assessment",
+        "challenge_publication",
+        "code_availability",
+        "expected_number_of_teams",
+        "number_of_tasks",
+        "challenge_fee_agreement",
+        "algorithm_inputs",
+        "algorithm_outputs",
+        "average_size_of_test_image_in_mb",
+        "inference_time_average_minutes",
+        "algorithm_selectable_gpu_type_choices",
+        "algorithm_maximum_settable_memory_gb",
+        "phase_1_number_of_submissions_per_team",
+        "phase_2_number_of_submissions_per_team",
+        "phase_1_number_of_test_images",
+        "phase_2_number_of_test_images",
+    ],
+)
 @pytest.mark.django_db
-def test_challenge_request_budget_fields_required():
-    user = UserFactory.build()
-    # fill all fields except for budget and input / output fields
+def test_challenge_request_budget_fields_required(required_field):
+    user = UserFactory()
     data = {
         "creator": user,
         "title": "Test request",
         "short_name": "example1234",
         "start_date": datetime.date.today(),
         "end_date": datetime.date.today() + datetime.timedelta(days=1),
-        "expected_number_of_participants": 10,
-        "abstract": "test",
-        "contact_email": "test@test.com",
-        "organizers": "test",
-        "challenge_setup": "test",
-        "data_set": "test",
-        "submission_assessment": "test",
-        "challenge_publication": "test",
-        "code_availability": "test",
-        "expected_number_of_teams": 10,
-        "number_of_tasks": 1,
-        "challenge_fee_agreement": True,
-    }
-    form = ChallengeRequestForm(data=data, creator=user)
-    assert not form.is_valid()
-
-    data2 = {
-        "creator": user,
-        "title": "Test request",
-        "short_name": "example1234",
-        "start_date": datetime.date.today(),
-        "end_date": datetime.date.today() + datetime.timedelta(days=1),
-        "expected_number_of_participants": 10,
         "abstract": "test",
         "contact_email": "test@test.com",
         "organizers": "test",
@@ -69,8 +75,15 @@ def test_challenge_request_budget_fields_required():
         "phase_1_number_of_test_images": 1,
         "phase_2_number_of_test_images": 1,
     }
-    form2 = ChallengeRequestForm(data=data2, creator=user)
-    assert form2.is_valid()
+    form = ChallengeRequestForm(data=data, creator=user)
+    assert form.is_valid(), form.errors
+
+    data.pop(required_field)
+
+    form = ChallengeRequestForm(data=data, creator=user)
+    assert not form.is_valid()
+    assert required_field in form.errors
+    assert form.errors[required_field] == ["This field is required."]
 
 
 @pytest.mark.django_db

app/tests/challenges_tests/test_views.py

@@ -433,6 +433,9 @@ def test_challenge_request_date_check(client):
             "algorithm_outputs": "foo",
             "average_size_of_test_image_in_mb": 1,
             "inference_time_average_minutes": 11,
+            "algorithm_maximum_settable_memory_gb": 32,
+            "algorithm_selectable_gpu_type_choices": ["", "T4"],
+            "number_of_tasks": 1,
             "phase_1_number_of_submissions_per_team": 1,
             "phase_2_number_of_submissions_per_team": 1,
             "phase_1_number_of_test_images": 1,
@@ -442,10 +445,7 @@ def test_challenge_request_date_check(client):
     )
     assert response.status_code == 200
     assert response.context["form"].errors == {
-        "algorithm_maximum_settable_memory_gb": ["This field is required."],
-        "algorithm_selectable_gpu_type_choices": ["This field is required."],
         "end_date": ["This field is required."],
-        "number_of_tasks": ["This field is required."],
         "start_date": ["This field is required."],
     }
 
@@ -472,6 +472,9 @@ def test_challenge_request_date_check(client):
             "algorithm_outputs": "foo",
             "average_size_of_test_image_in_mb": 1,
             "inference_time_average_minutes": 11,
+            "algorithm_maximum_settable_memory_gb": 32,
+            "algorithm_selectable_gpu_type_choices": ["", "T4"],
+            "number_of_tasks": 1,
             "phase_1_number_of_submissions_per_team": 1,
             "phase_2_number_of_submissions_per_team": 1,
             "phase_1_number_of_test_images": 1,
@@ -482,9 +485,6 @@ def test_challenge_request_date_check(client):
     assert response.status_code == 200
     assert response.context["form"].errors == {
         "__all__": ["The start date needs to be before the end date."],
-        "algorithm_maximum_settable_memory_gb": ["This field is required."],
-        "algorithm_selectable_gpu_type_choices": ["This field is required."],
-        "number_of_tasks": ["This field is required."],
     }