Make test cases work with all possible variations.

fkdosilovic · fkdosilovic · commit e8b05b2a79b2 · 2024-12-17T21:51:42.000+01:00
diff --git a/src/judge0/api.py b/src/judge0/api.py
@@ -260,10 +260,27 @@ def create_submissions_from_test_cases(
 
     if isinstance(test_cases, TestCase) or test_cases is None:
         test_cases_list = [test_cases]
+        multiple_test_cases = False
     else:
-        test_cases_list = test_cases
-
-    test_cases_list = [TestCase.from_record(tc) for tc in test_cases_list]
+        try:
+            # Let's assume that we are dealing with multiple test_cases that
+            # can be created from test_cases argument. If this fails, i.e.
+            # raises a ValueError, we know we are dealing with a test_cases=dict,
+            # or test_cases=["in", "out"], or test_cases=tuple("in", "out").
+            test_cases_list = [TestCase.from_record(tc) for tc in test_cases]
+
+            # It is possible to send test_cases={}, or test_cases=[], or
+            # test_cases=tuple([]). In this case, we are treating that as None.
+            if len(test_cases) > 0:
+                multiple_test_cases = True
+            else:
+                multiple_test_cases = False
+                test_cases_list = [None]
+        except ValueError:
+            test_cases_list = [test_cases]
+            multiple_test_cases = False
+
+    test_cases_list = [TestCase.from_record(test_case=tc) for tc in test_cases_list]
 
     all_submissions = []
     for submission in submissions_list:
@@ -274,9 +291,7 @@ def create_submissions_from_test_cases(
                 submission_copy.expected_output = test_case.expected_output
             all_submissions.append(submission_copy)
 
-    if isinstance(submissions, Submission) and (
-        isinstance(test_cases, TestCase) or test_cases is None
-    ):
+    if isinstance(submissions, Submission) and (not multiple_test_cases):
         return all_submissions[0]
     else:
         return all_submissions
diff --git a/tests/test_api_test_cases.py b/tests/test_api_test_cases.py
@@ -1,4 +1,4 @@
-"""Separate file containg tests related to test case functionality."""
+"""Separate file containing tests related to test case functionality."""
 
 import judge0
 import pytest
@@ -67,6 +67,94 @@ def test_create_submissions_from_test_cases_return_type(
     assert type(output) is expected_type
 
 
+class TestCreateSubmissionsFromTestCases:
+    @pytest.mark.parametrize(
+        "test_case,stdin,expected_output",
+        [
+            [TestCase(), None, None],
+            [[], None, None],
+            [{}, None, None],
+            [tuple([]), None, None],
+        ],
+    )
+    def test_empty_test_case(self, test_case, stdin, expected_output):
+        submission = create_submissions_from_test_cases(
+            Submission(), test_cases=test_case
+        )
+
+        assert (
+            submission.stdin == stdin and submission.expected_output == expected_output
+        )
+
+    @pytest.mark.parametrize(
+        "test_case,stdin,expected_output",
+        [
+            [TestCase(), None, None],
+            [TestCase(input="input"), "input", None],
+            [TestCase(expected_output="output"), None, "output"],
+            [["input_list"], "input_list", None],
+            [["input_list", "output_list"], "input_list", "output_list"],
+            [{"input": "input_dict"}, "input_dict", None],
+            [
+                {"input": "input_dict", "expected_output": "output_dict"},
+                "input_dict",
+                "output_dict",
+            ],
+            [("input_tuple",), "input_tuple", None],
+            [("input_tuple", "output_tuple"), "input_tuple", "output_tuple"],
+        ],
+    )
+    def test_single_test_case(self, test_case, stdin, expected_output):
+        submission = create_submissions_from_test_cases(
+            Submission(), test_cases=test_case
+        )
+
+        assert (
+            submission.stdin == stdin and submission.expected_output == expected_output
+        )
+
+    @pytest.mark.parametrize(
+        "test_cases,stdin,expected_output",
+        [
+            [[TestCase()], None, None],
+            [[TestCase(input="input")], "input", None],
+            [[TestCase(expected_output="output")], None, "output"],
+            [(["input_list"],), "input_list", None],
+            [(["input_list", "output_list"],), "input_list", "output_list"],
+            [({"input": "input_dict"},), "input_dict", None],
+            [
+                ({"input": "input_dict", "expected_output": "output_dict"},),
+                "input_dict",
+                "output_dict",
+            ],
+            [
+                [
+                    ("input_tuple",),
+                ],
+                "input_tuple",
+                None,
+            ],
+            [
+                [
+                    ("input_tuple", "output_tuple"),
+                ],
+                "input_tuple",
+                "output_tuple",
+            ],
+        ],
+    )
+    def test_single_test_case_in_iterable(self, test_cases, stdin, expected_output):
+        submissions = create_submissions_from_test_cases(
+            Submission(), test_cases=test_cases
+        )
+
+        for submission in submissions:
+            assert (
+                submission.stdin == stdin
+                and submission.expected_output == expected_output
+            )
+
+
 @pytest.mark.parametrize(
     "source_code_or_submissions,test_cases,expected_status",
     [
