grader: Allow OK feedback to be on separate, third line (#644)

ia-toki · Aug 12, 2024 · 68fa199 · 68fa199
1 parent 9c3dc60
commit 68fa199
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/...s/judgels-grader-engines/src/main/java/judgels/gabriel/helpers/TestCaseVerdictParser.java b/...s/judgels-grader-engines/src/main/java/judgels/gabriel/helpers/TestCaseVerdictParser.java
@@ -56,6 +56,9 @@ public TestCaseVerdict parseOutput(String output) throws ScoringException {
                     }
                 }
 
+                if (lines.length > 2) {
+                    feedback = Optional.of(lines[2]);
+                }
                 if (tokens.length > 1) {
                     feedback = Optional.of(tokens[1]);
                 }

diff --git a/...gels-grader-engines/src/test/java/judgels/gabriel/scorers/TestCaseVerdictParserTests.java b/...gels-grader-engines/src/test/java/judgels/gabriel/scorers/TestCaseVerdictParserTests.java
@@ -63,6 +63,12 @@ void ok_points() throws ScoringException {
 
         @Test
         void ok_points_with_feedback() throws ScoringException {
+            assertThat(parser.parseOutput("OK\n70\na feedback\n")).isEqualTo(
+                    new TestCaseVerdict.Builder().verdict(Verdict.OK).points(70.0).feedback("a feedback").build());
+        }
+
+        @Test
+        void ok_points_with_feedback_on_same_line() throws ScoringException {
             assertThat(parser.parseOutput("OK\n70 a feedback\n")).isEqualTo(
                     new TestCaseVerdict.Builder().verdict(Verdict.OK).points(70.0).feedback("a feedback").build());
         }
@@ -75,6 +81,12 @@ void ok_percentage() throws ScoringException {
 
         @Test
         void ok_percentage_with_feedback() throws ScoringException {
+            assertThat(parser.parseOutput("OK\n25%\na feedback\n")).isEqualTo(
+                    new TestCaseVerdict.Builder().verdict(Verdict.OK).percentage(25).feedback("a feedback").build());
+        }
+
+        @Test
+        void ok_percentage_with_feedback_on_same_line() throws ScoringException {
             assertThat(parser.parseOutput("OK\n25% a feedback\n")).isEqualTo(
                     new TestCaseVerdict.Builder().verdict(Verdict.OK).percentage(25).feedback("a feedback").build());
         }