From 98d4bd6b61979840e8d02369bf348d0b7bc3b10b Mon Sep 17 00:00:00 2001 From: KarlLundengaard Date: Tue, 22 Aug 2023 23:11:38 +0100 Subject: [PATCH 1/5] Updated tests to look for matched_case --- tests/commands.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/commands.py b/tests/commands.py index 7ec7d02..59d445b 100644 --- a/tests/commands.py +++ b/tests/commands.py @@ -79,7 +79,7 @@ def test_single_feedback_case(self): result = response["result"] # type: ignore self.assertTrue(result["is_correct"]) - self.assertNotIn("match", result) + self.assertNotIn("matched_case", result) self.assertNotIn("feedback", result) def test_single_feedback_case_match(self): @@ -102,7 +102,7 @@ def test_single_feedback_case_match(self): result = response["result"] # type: ignore self.assertFalse(result["is_correct"]) - self.assertEqual(result["match"], 0) + self.assertEqual(result["matched_case"], 0) self.assertEqual(result["feedback"], "should be 'hello'.") def test_case_warning_data_structure(self): @@ -159,7 +159,7 @@ def test_multiple_feedback_cases_single_match(self): result = response["result"] # type: ignore self.assertFalse(result["is_correct"]) - self.assertEqual(result["match"], 1) + self.assertEqual(result["matched_case"], 1) self.assertEqual(result["feedback"], "should be 'yes'.") def test_multiple_feedback_cases_multiple_matches(self): @@ -191,7 +191,7 @@ def test_multiple_feedback_cases_multiple_matches(self): result = response["result"] # type: ignore self.assertFalse(result["is_correct"]) - self.assertEqual(result["match"], 0) + self.assertEqual(result["matched_case"], 0) self.assertEqual(result["feedback"], "should be 'hello'.") def test_case_params_overwrite_eval_params(self): @@ -216,7 +216,7 @@ def test_case_params_overwrite_eval_params(self): result = response["result"] # type: ignore self.assertTrue(result["is_correct"]) - self.assertNotIn("match", result) + self.assertNotIn("matched_case", result) self.assertNotIn("feedback", result) def test_invalid_case_entry_doesnt_raise_exception(self): @@ -312,7 +312,7 @@ def test_overriding_eval_feedback_to_correct_case(self): result = response["result"] # type: ignore self.assertTrue(result["is_correct"]) - self.assertEqual(result["match"], 0) + self.assertEqual(result["matched_case"], 0) self.assertEqual(result["feedback"], "should be 'hello'.") def test_overriding_eval_feedback_to_incorrect_case(self): @@ -336,7 +336,7 @@ def test_overriding_eval_feedback_to_incorrect_case(self): result = response["result"] # type: ignore self.assertFalse(result["is_correct"]) - self.assertEqual(result["match"], 0) + self.assertEqual(result["matched_case"], 0) self.assertEqual(result["feedback"], "should be 'hello'.") def test_valid_preview_command(self): @@ -345,7 +345,7 @@ def test_valid_preview_command(self): response = commands.preview(event) result = response["result"] # type: ignore - self.assertEqual(result["preview"], "hello") + self.assertEqual(result["preview"]["latex"], "hello") def test_invalid_preview_args_raises_parse_error(self): event = {"headers": "any", "other": "params"} From fb677c3a6038c9756278b8a4484bc137aef89700 Mon Sep 17 00:00:00 2001 From: KarlLundengaard Date: Fri, 1 Sep 2023 15:46:32 +0100 Subject: [PATCH 2/5] Revert "Updated tests to look for matched_case" This reverts commit 98d4bd6b61979840e8d02369bf348d0b7bc3b10b. --- tests/commands.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/commands.py b/tests/commands.py index 59d445b..7ec7d02 100644 --- a/tests/commands.py +++ b/tests/commands.py @@ -79,7 +79,7 @@ def test_single_feedback_case(self): result = response["result"] # type: ignore self.assertTrue(result["is_correct"]) - self.assertNotIn("matched_case", result) + self.assertNotIn("match", result) self.assertNotIn("feedback", result) def test_single_feedback_case_match(self): @@ -102,7 +102,7 @@ def test_single_feedback_case_match(self): result = response["result"] # type: ignore self.assertFalse(result["is_correct"]) - self.assertEqual(result["matched_case"], 0) + self.assertEqual(result["match"], 0) self.assertEqual(result["feedback"], "should be 'hello'.") def test_case_warning_data_structure(self): @@ -159,7 +159,7 @@ def test_multiple_feedback_cases_single_match(self): result = response["result"] # type: ignore self.assertFalse(result["is_correct"]) - self.assertEqual(result["matched_case"], 1) + self.assertEqual(result["match"], 1) self.assertEqual(result["feedback"], "should be 'yes'.") def test_multiple_feedback_cases_multiple_matches(self): @@ -191,7 +191,7 @@ def test_multiple_feedback_cases_multiple_matches(self): result = response["result"] # type: ignore self.assertFalse(result["is_correct"]) - self.assertEqual(result["matched_case"], 0) + self.assertEqual(result["match"], 0) self.assertEqual(result["feedback"], "should be 'hello'.") def test_case_params_overwrite_eval_params(self): @@ -216,7 +216,7 @@ def test_case_params_overwrite_eval_params(self): result = response["result"] # type: ignore self.assertTrue(result["is_correct"]) - self.assertNotIn("matched_case", result) + self.assertNotIn("match", result) self.assertNotIn("feedback", result) def test_invalid_case_entry_doesnt_raise_exception(self): @@ -312,7 +312,7 @@ def test_overriding_eval_feedback_to_correct_case(self): result = response["result"] # type: ignore self.assertTrue(result["is_correct"]) - self.assertEqual(result["matched_case"], 0) + self.assertEqual(result["match"], 0) self.assertEqual(result["feedback"], "should be 'hello'.") def test_overriding_eval_feedback_to_incorrect_case(self): @@ -336,7 +336,7 @@ def test_overriding_eval_feedback_to_incorrect_case(self): result = response["result"] # type: ignore self.assertFalse(result["is_correct"]) - self.assertEqual(result["matched_case"], 0) + self.assertEqual(result["match"], 0) self.assertEqual(result["feedback"], "should be 'hello'.") def test_valid_preview_command(self): @@ -345,7 +345,7 @@ def test_valid_preview_command(self): response = commands.preview(event) result = response["result"] # type: ignore - self.assertEqual(result["preview"]["latex"], "hello") + self.assertEqual(result["preview"], "hello") def test_invalid_preview_args_raises_parse_error(self): event = {"headers": "any", "other": "params"} From e1ae6dbae9ad285ef50bb42c27a02dd8d783d96c Mon Sep 17 00:00:00 2001 From: KarlLundengaard Date: Fri, 1 Sep 2023 15:46:37 +0100 Subject: [PATCH 3/5] Revert "The lambda backend expects 'matched_case'" This reverts commit a94cf4e78c8afd0eb42ed6dae59431e358679e83. --- tools/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/commands.py b/tools/commands.py index 26261c9..86fe0f4 100644 --- a/tools/commands.py +++ b/tools/commands.py @@ -139,7 +139,7 @@ def evaluate(event: JsonType) -> Response: if match is not None: result["feedback"] = match["feedback"] - result["matched_case"] = match["id"] + result["match"] = match["id"] # Override is_correct provided by the # original block by the case 'mark' From 4d7706eef6014f457ebd0d850435021121b539cc Mon Sep 17 00:00:00 2001 From: KarlLundengaard Date: Mon, 4 Sep 2023 11:28:05 +0100 Subject: [PATCH 4/5] Revert "Revert "Updated tests to look for matched_case"" This reverts commit fb677c3a6038c9756278b8a4484bc137aef89700. --- tests/commands.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/commands.py b/tests/commands.py index 7ec7d02..59d445b 100644 --- a/tests/commands.py +++ b/tests/commands.py @@ -79,7 +79,7 @@ def test_single_feedback_case(self): result = response["result"] # type: ignore self.assertTrue(result["is_correct"]) - self.assertNotIn("match", result) + self.assertNotIn("matched_case", result) self.assertNotIn("feedback", result) def test_single_feedback_case_match(self): @@ -102,7 +102,7 @@ def test_single_feedback_case_match(self): result = response["result"] # type: ignore self.assertFalse(result["is_correct"]) - self.assertEqual(result["match"], 0) + self.assertEqual(result["matched_case"], 0) self.assertEqual(result["feedback"], "should be 'hello'.") def test_case_warning_data_structure(self): @@ -159,7 +159,7 @@ def test_multiple_feedback_cases_single_match(self): result = response["result"] # type: ignore self.assertFalse(result["is_correct"]) - self.assertEqual(result["match"], 1) + self.assertEqual(result["matched_case"], 1) self.assertEqual(result["feedback"], "should be 'yes'.") def test_multiple_feedback_cases_multiple_matches(self): @@ -191,7 +191,7 @@ def test_multiple_feedback_cases_multiple_matches(self): result = response["result"] # type: ignore self.assertFalse(result["is_correct"]) - self.assertEqual(result["match"], 0) + self.assertEqual(result["matched_case"], 0) self.assertEqual(result["feedback"], "should be 'hello'.") def test_case_params_overwrite_eval_params(self): @@ -216,7 +216,7 @@ def test_case_params_overwrite_eval_params(self): result = response["result"] # type: ignore self.assertTrue(result["is_correct"]) - self.assertNotIn("match", result) + self.assertNotIn("matched_case", result) self.assertNotIn("feedback", result) def test_invalid_case_entry_doesnt_raise_exception(self): @@ -312,7 +312,7 @@ def test_overriding_eval_feedback_to_correct_case(self): result = response["result"] # type: ignore self.assertTrue(result["is_correct"]) - self.assertEqual(result["match"], 0) + self.assertEqual(result["matched_case"], 0) self.assertEqual(result["feedback"], "should be 'hello'.") def test_overriding_eval_feedback_to_incorrect_case(self): @@ -336,7 +336,7 @@ def test_overriding_eval_feedback_to_incorrect_case(self): result = response["result"] # type: ignore self.assertFalse(result["is_correct"]) - self.assertEqual(result["match"], 0) + self.assertEqual(result["matched_case"], 0) self.assertEqual(result["feedback"], "should be 'hello'.") def test_valid_preview_command(self): @@ -345,7 +345,7 @@ def test_valid_preview_command(self): response = commands.preview(event) result = response["result"] # type: ignore - self.assertEqual(result["preview"], "hello") + self.assertEqual(result["preview"]["latex"], "hello") def test_invalid_preview_args_raises_parse_error(self): event = {"headers": "any", "other": "params"} From 2dcce02546384f715e82fd135db37f66a0ff59e1 Mon Sep 17 00:00:00 2001 From: KarlLundengaard Date: Mon, 4 Sep 2023 11:28:09 +0100 Subject: [PATCH 5/5] Revert "Revert "The lambda backend expects 'matched_case'"" This reverts commit e1ae6dbae9ad285ef50bb42c27a02dd8d783d96c. --- tools/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/commands.py b/tools/commands.py index 86fe0f4..26261c9 100644 --- a/tools/commands.py +++ b/tools/commands.py @@ -139,7 +139,7 @@ def evaluate(event: JsonType) -> Response: if match is not None: result["feedback"] = match["feedback"] - result["match"] = match["id"] + result["matched_case"] = match["id"] # Override is_correct provided by the # original block by the case 'mark'