CUE schema: specify testdata.yaml (2023-07-draft), fix some tests

RagnarGrootKoerkamp · Mar 4, 2024 · 5a12a3e · 5a12a3e
1 parent 3b23e62
commit 5a12a3e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 58 deletions.
diff --git a/doc/generators.yaml b/doc/generators.yaml
@@ -176,10 +176,7 @@ data:
       hard_cases_group:
         # Directories may contain a testdata.yaml that will be written as specified.
         testdata.yaml:
-          on_reject: break
-          accept_score: "25"
-          range: 0 25
-          grader_flags: min
+          input_validator_flags: --max_n 1000
 
         # To enable automatic numbering of testcases, data: may also contain a list of
         # single-element dictionaries instead of a single dictionary. In this case,

diff --git a/support/schemas/generators.cue b/support/schemas/generators.cue
@@ -1,6 +1,4 @@
-package problemformat
-
-// cue version 0.6
+// Use cue version 0.6 or later
 // To validate generators.yaml using cue:
 // > cue vet generators.yaml *.cue -d "#Generators"
 
@@ -49,7 +47,7 @@ casepath: =~"^\(filename)(/\(basename))*$"
 #data_list: {[name | ""]: #testgroup | #testcase} & struct.MinFields(1) & struct.MaxFields(1)
 
 #testgroup: {
-	data?: #data_dict | [...#data_list]
+	data?: null |  #data_dict | [...#data_list]
 	include?: [...name]
 	#config
 }

diff --git a/support/schemas/testdata.cue b/support/schemas/testdata.cue
diff --git a/test/problems/generatorincludes/generators/generators.yaml b/test/problems/generatorincludes/generators/generators.yaml
@@ -11,8 +11,8 @@ data:
     data:
       - small:
           testdata.yaml:
-            input_validator_flags: --small
-            input_validators:
+            output_validator_flags: space_change_sensitive
+            input_validator_flags:
               connected: --small
               strongly-connected: --small
           data: