Properly set validation mode for interactive problems without validation: custom.

meisterT · nickygerritsen · commit 06082e8adb99 · 2025-05-23T18:57:51.000Z
diff --git a/webapp/src/Service/ImportProblemService.php b/webapp/src/Service/ImportProblemService.php
@@ -1025,10 +1025,14 @@ public static function parseYaml(bool|string $problemYaml, array &$messages, str
             }
         }
 
+        $validationMode = 'default';
         if (isset($yamlData['type'])) {
             $types = explode(' ', $yamlData['type']);
             // Validation happens later when we set the properties.
             $yamlProblemProperties['typesAsString'] = $types;
+            if (in_array('interactive', $types)) {
+                $validationMode = 'custom interactive';
+            }
         } else {
             $yamlProblemProperties['typesAsString'] = ['pass-fail'];
         }
@@ -1037,7 +1041,6 @@ public static function parseYaml(bool|string $problemYaml, array &$messages, str
             $yamlProblemProperties['special_compare_args'] = $yamlData['validator_flags'];
         }
 
-        $validationMode = 'default';
         if (isset($yamlData['validation'])
             && ($yamlData['validation'] == 'custom' ||
                 $yamlData['validation'] == 'custom interactive' ||
diff --git a/webapp/tests/Unit/Service/ImportProblemServiceTest.php b/webapp/tests/Unit/Service/ImportProblemServiceTest.php
@@ -294,7 +294,7 @@ public function testKattisExample()
         $this->assertEmpty($messages);
         $this->assertEquals('Guess the Number', $problem->getName());
         $this->assertEquals('pass-fail, interactive', $problem->getTypesAsString());
-        $this->assertEquals('default', $validationMode);
+        $this->assertEquals('custom interactive', $validationMode);
         $this->assertEquals(0, $problem->getTimelimit());
         $this->assertEquals(null, $problem->getMemlimit());
         $this->assertEquals(null, $problem->getOutputlimit());

Original file line number	Diff line number	Diff line change
`@@ -1025,10 +1025,14 @@ public static function parseYaml(bool\|string $problemYaml, array &$messages, str`
`1025`	`1025`	`}`
`1026`	`1026`	`}`
`1027`	`1027`
	`1028`	`+ $validationMode = 'default';`
`1028`	`1029`	`if (isset($yamlData['type'])) {`
`1029`	`1030`	`$types = explode(' ', $yamlData['type']);`
`1030`	`1031`	`// Validation happens later when we set the properties.`
`1031`	`1032`	`$yamlProblemProperties['typesAsString'] = $types;`
	`1033`	`+ if (in_array('interactive', $types)) {`
	`1034`	`+ $validationMode = 'custom interactive';`
	`1035`	`+ }`
`1032`	`1036`	`} else {`
`1033`	`1037`	`$yamlProblemProperties['typesAsString'] = ['pass-fail'];`
`1034`	`1038`	`}`
`@@ -1037,7 +1041,6 @@ public static function parseYaml(bool\|string $problemYaml, array &$messages, str`
`1037`	`1041`	`$yamlProblemProperties['special_compare_args'] = $yamlData['validator_flags'];`
`1038`	`1042`	`}`
`1039`	`1043`
`1040`		`- $validationMode = 'default';`
`1041`	`1044`	`if (isset($yamlData['validation'])`
`1042`	`1045`	`&& ($yamlData['validation'] == 'custom' \|\|`
`1043`	`1046`	`$yamlData['validation'] == 'custom interactive' \|\|`