Files features

tested/configs.py

@@ -67,7 +67,7 @@ class Options:
     """
 
 
-@fallback_field(get_converter(), {"testplan": "test_suite", "plan_name": "test_suite"})
+@fallback_field({"testplan": "test_suite", "plan_name": "test_suite"})
 @define
 class DodonaConfig:
     resources: Path

tested/dsl/schema-strict.json

@@ -276,11 +276,18 @@
         },
         "stdin" : {
           "description" : "Stdin for this context",
-          "type" : [
-            "string",
-            "number",
-            "integer",
-            "boolean"
+          "oneOf" : [
+            {
+              "type" : [
+                "string",
+                "number",
+                "integer",
+                "boolean"
+              ]
+            },
+            {
+              "$ref": "#/definitions/fileData"
+            }
           ]
         },
         "arguments" : {
@@ -336,11 +343,18 @@
           ]
         },
         "files" : {
+          "description" : "Deprecated: use input_files instead.",
           "type" : "array",
           "items" : {
             "$ref" : "#/definitions/file"
           }
         },
+        "input_files": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/fileDataRequiredPath"
+          }
+        },
         "return" : {
           "description" : "Expected return value",
           "$ref" : "#/definitions/returnOutputChannel"
@@ -354,6 +368,10 @@
           "$ref" : "#/definitions/textOutputChannel"
         },
         "file": {
+          "description" : "Deprecated: use output_files instead.",
+          "$ref" : "#/definitions/fileOutputChannel"
+        },
+        "output_files": {
           "description" : "Expected files generated by the submission.",
           "$ref" : "#/definitions/fileOutputChannel"
         },
@@ -598,6 +616,35 @@
             }
           }
         },
+        {
+          "type" : "object",
+          "description" : "Built-in oracle for files.",
+          "required" : [
+            "data"
+          ],
+          "properties" : {
+            "data" : {
+              "type" : "array",
+              "description" : "Files to expect.",
+              "items" : {
+                "$ref" : "#/definitions/fileDataFullyRequired"
+              }
+            },
+            "oracle" : {
+              "const" : "builtin"
+            },
+            "config" : {
+              "$ref" : "#/definitions/fileConfigurationOptions"
+            }
+          }
+        },
+        {
+          "type" : "array",
+          "description" : "Built-in oracle for files.",
+          "items" : {
+            "$ref" : "#/definitions/fileDataFullyRequired"
+          }
+        },
         {
           "type" : "object",
           "description" : "Custom oracle for file values.",
@@ -643,6 +690,49 @@
               }
             }
           }
+        },
+        {
+          "type" : "object",
+          "description" : "Custom oracle for file values.",
+          "required" : [
+            "oracle",
+            "data"
+          ],
+          "properties" : {
+            "oracle" : {
+              "const" : "custom_check"
+            },
+            "data" : {
+              "type" : "array",
+              "description" : "Files to expect.",
+              "items" : {
+                "$ref" : "#/definitions/fileDataFullyRequired"
+              }
+            },
+            "file" : {
+              "type" : "string",
+              "description" : "The path to the file containing the custom check function."
+            },
+            "name" : {
+              "type" : "string",
+              "description" : "The name of the custom check function.",
+              "default" : "evaluate"
+            },
+            "arguments" : {
+              "type" : "array",
+              "description" : "List of YAML (or tagged expression) values to use as arguments to the function.",
+              "items" : {
+                "$ref" : "#/definitions/yamlValueOrPythonExpression"
+              }
+            },
+            "languages": {
+              "type" : "array",
+              "description" : "Which programming languages are supported by this oracle.",
+              "items" : {
+                "$ref" : "#/definitions/programmingLanguage"
+              }
+            }
+          }
         }
       ]
     },
@@ -890,6 +980,76 @@
           "$ref" : "#/definitions/fileConfigurationOptions"
         }
       }
+    },
+    "fileData": {
+      "type": "object",
+      "additionalProperties" : false,
+      "anyOf" : [
+        {
+          "required" : [
+            "content"
+          ]
+        },
+        {
+          "required" : [
+            "path"
+          ]
+        }
+      ],
+      "properties": {
+        "content": {
+          "type": [
+            "string",
+            "path"
+          ],
+          "description" : "Content of the file, which will be provided inline or written to disk in the workdir. If a !path, the file contents will be read from the provided path."
+        },
+        "path": {
+          "type": "string",
+          "description" : "Path to the file, relative to the workdir. Used to display in the output."
+        }
+      }
+    },
+    "fileDataRequiredPath": {
+      "type": "object",
+      "additionalProperties" : false,
+      "required" : [
+        "path"
+      ],
+      "properties": {
+        "content": {
+          "type": [
+            "string",
+            "path"
+          ],
+          "description" : "Content of the file, which will be provided inline or written to disk in the workdir. If a !path, the file contents will be read from the provided path."
+        },
+        "path": {
+          "type": "string",
+          "description" : "Path to the file, relative to the workdir. Used to display in the output."
+        }
+      }
+    },
+    "fileDataFullyRequired": {
+      "type": "object",
+      "additionalProperties" : false,
+      "required" : [
+        "path",
+        "content"
+      ],
+      "properties": {
+        "content": {
+          "type": [
+            "string",
+            "path"
+          ],
+          "description" : "Content of the file, which will be provided inline or written to disk in the workdir. If a !path, the file contents will be read from the provided path."
+        },
+        "path": {
+          "type": "string",
+          "description" : "Path to the file, relative to the workdir. Used to display in the output."
+        }
+      }
     }
   }
 }