Better fallback of values for oracles

dodona-edu · Sep 20, 2023 · 1cdafd3 · 1cdafd3
1 parent 6e8eff1
commit 1cdafd3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/tested/oracles/common.py b/tested/oracles/common.py
@@ -79,7 +79,11 @@ class BooleanEvalResult:
     dsl_actual: str | None = None
 
     def to_oracle_result(
-        self, bundle: Bundle, channel: NormalOutputChannel
+        self,
+        bundle: Bundle,
+        channel: NormalOutputChannel,
+        fallback_actual: str,
+        fallback_expected: str,
     ) -> OracleResult:
         if isinstance(self.result, Status):
             status = self.result
@@ -92,14 +96,14 @@ def to_oracle_result(
             parsed_statement = parse_string(self.dsl_expected, True)
             readable_expected = generate_statement(bundle, parsed_statement)
         else:
-            readable_expected = ""
+            readable_expected = fallback_expected
         if self.readable_actual:
             readable_actual = self.readable_actual
         elif self.dsl_actual:
             parsed_statement = parse_string(self.dsl_actual, True)
             readable_actual = generate_statement(bundle, parsed_statement)
         else:
-            readable_actual = ""
+            readable_actual = fallback_actual
         messages = self.messages
 
         if isinstance(channel, ExceptionOutputChannel):

diff --git a/tested/oracles/programmed.py b/tested/oracles/programmed.py
@@ -126,4 +126,6 @@ def evaluate(
         assert isinstance(result, BooleanEvalResult)
         evaluation_result = result
 
-    return evaluation_result.to_oracle_result(config.bundle, channel)
+    return evaluation_result.to_oracle_result(
+        config.bundle, channel, readable_actual, readable_expected
+    )
diff --git a/tested/oracles/specific.py b/tested/oracles/specific.py
@@ -56,4 +56,4 @@ def evaluate(
             messages=[staff_message, student_message],
         )
 
-    return actual.to_oracle_result(config.bundle, channel)
+    return actual.to_oracle_result(config.bundle, channel, "", "")