Default to pass-fail problem type if not explicitly set.

Author: meisterT

webapp/src/Entity/Problem.php

@@ -338,7 +338,11 @@ public function setTypes(array $types): Problem
         foreach ($types as $type) {
             $this->types |= $type;
         }
-        if (!($this->types & self::TYPE_PASS_FAIL) xor ($this->types & self::TYPE_SCORING)) {
+        if (!($this->types & self::TYPE_SCORING)) {
+            // In case the problem is not explicitly a scoring problem, default to pass-fail.
+            $this->types |= self::TYPE_PASS_FAIL;
+        }
+        if (($this->types & self::TYPE_PASS_FAIL) && ($this->types & self::TYPE_SCORING)) {
             throw new Exception("Invalid problem type: must be exactly one of 'pass-fail' or 'scoring'.");
         }
         if ($this->types & self::TYPE_SUBMIT_ANSWER) {

webapp/tests/Unit/Service/ImportProblemServiceTest.php

@@ -58,6 +58,9 @@ public function testTypesYamlTest()
         foreach ([
                      'pass-fail',
                      'scoring',
+                     'multi-pass',
+                     'interactive',
+                     'submit-answer',
                      'pass-fail multi-pass',
                      'pass-fail interactive',
                      'pass-fail submit-answer',
@@ -77,6 +80,10 @@ public function testTypesYamlTest()
             $ret = ImportProblemService::parseYaml($yaml, $messages, $validationMode, PropertyAccess::createPropertyAccessor(), $problem);
             $messageString = var_export($messages, true);
             $this->assertTrue($ret, 'Parsing failed for type: ' . $type . ', messages: ' . $messageString);
+            if (in_array($type, ['interactive', 'multi-pass', 'submit-answer'])) {
+                // Default to pass-fail if not explicitly set.
+                $type = 'pass-fail ' . $type;
+            }
             $typesString = str_replace(' ', ', ', $type);
             $this->assertEquals($typesString, $problem->getTypesAsString());
         }
@@ -100,11 +107,9 @@ public function testUnknownProblemType()
 
     public function testInvalidProblemType() {
         foreach ([
-                     'interactive',
-                     'multi-pass',
-                     'submit-answer',
-                     'pass-fail submit-answer multi-pass',
-                     'pass-fail submit-answer interactive',
+                     'pass-fail scoring',
+                     'submit-answer multi-pass',
+                     'submit-answer interactive',
                  ] as $type) {
             $yaml = <<<YAML
 name: test