schema: Update to allow sequences of inputs/expect

References #9

examples/sequences.yaml

@@ -0,0 +1,66 @@
+name: "Sequence of inputs/expect, for testing stateful component"
+topic: "DummyComponent"
+cases:
+-
+  name: 'correct data using spacy notation'
+  assertion: 'should pass'
+  inputs: # NOTE: should only sequence for stateful components. Normally use multiple testcases instead
+    -
+      in: true
+    -
+      in: false
+  expect:
+    - 
+      out:
+        equals: true
+    -
+      out:
+        equals: false      
+-
+  name: 'correct data using compact notation'
+  assertion: 'should pass'
+  inputs:
+    - { in: 1000 }
+    - { in: 1001 }
+  expect:
+    - { out: { equals: 1000 } }
+    - { out: { equals: 1001 } }
+
+
+# Failing cases
+-
+  name: 'mismatch between number of inputs and expect'
+  assertion: 'should fail'
+  inputs:
+    - { in: 1000 }
+  expect:
+    - { out: { equals: 1000 } }
+    - { out: { equals: 1001 } }
+-
+  name: 'first output in sequence wrong'
+  assertion: 'should fail'
+  inputs:
+    - { in: 1000 }
+    - { in: 1001 }
+  expect:
+    - { out: { equals: 42 } }
+    - { out: { equals: 1001 } }
+-
+  name: 'second output in sequence wrong'
+  assertion: 'should fail'
+  inputs:
+    - { in: 1000 }
+    - { in: 1001 }
+  expect:
+    - { out: { equals: 1000 } }
+    - { out: { equals: 42 } }
+-
+  name: 'all outputs in sequence wrong'
+  assertion: 'should fail'
+  inputs:
+    - { in: 0 }
+    - { in: 1 }
+  expect:
+    - { out: { equals: 2 } }
+    - { out: { equals: 3 } }
+

schema/outputdata.json

@@ -0,0 +1,18 @@
+{
+  "id": "outputdata.json",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Output data",
+  "description": "Data expected in a testcase.\nEach key refers to a port, and the value is a description of the expected message on that port.\nThere can be one expectation (check) on each message, or an array of them.\n",
+  "type": "object",
+  "items": {
+    "oneOf": [
+      {
+        "$ref": "expectation.json"
+      },
+      {
+        "$ref": "expectations.json"
+      }
+    ]
+  },
+  "required": []
+}

schema/testcase.json

@@ -14,22 +14,34 @@
       "description": "Description of what this testcase asserts"
     },
     "inputs": {
-      "type": "object",
-      "description": "The inputs send to the fixture input ports"
+      "description": "The inputs send to the fixture input ports, or a sequence of such inputs",
+      "oneOf": [
+        {
+          "type": "object"
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": "object"
+          }
+        }
+      ]
     },
     "expect": {
-      "type": "object",
-      "items": {
-        "oneOf": [
-          {
-            "$ref": "expectation.json"
-          },
-          {
-            "$ref": "expectations.json"
-          }
-        ]
-      },
-      "description": "Expected data on fixture output ports.\nOne message is expected per mentioned port.\n"
+      "description": "Expected data on fixture output ports.\nCan either be an object, or a sequence of such objects.\n",
+      "oneOf": [
+        {
+          "$ref": "outputdata.json"
+        },
+        {
+          "type": "array",
+          "items": [
+            {
+              "$ref": "outputdata.json"
+            }
+          ]
+        }
+      ]
     },
     "timeout": {
       "type": "number",

schemata/outputdata.yaml

@@ -0,0 +1,14 @@
+---
+id: outputdata.json
+"$schema": "http://json-schema.org/draft-04/schema"
+title: Output data
+description: |
+  Data expected in a testcase.
+  Each key refers to a port, and the value is a description of the expected message on that port.
+  There can be one expectation (check) on each message, or an array of them.
+type: object
+items:
+  oneOf:
+    - "$ref": "expectation.json"
+    - "$ref": "expectations.json"
+required: []

schemata/testcase.yaml

@@ -5,24 +5,34 @@ title: Testcase
 description: "A single test case"
 type: object
 properties:
+  # mandatory
   name:
     type: string
     description: 'Name of this testcase/scenario'
   assertion:
     type: string
     description: 'Description of what this testcase asserts'
-  inputs: # TODO: allow a list
-    type: object
-    description: 'The inputs send to the fixture input ports'
-  expect: # TODO: allow a list
-    type: object
-    items:
-      oneOf:
-        - "$ref": "expectation.json"
-        - "$ref": "expectations.json"
+  inputs:
+    description: 'The inputs send to the fixture input ports, or a sequence of such inputs'
+    oneOf:
+      - # inputsdata
+        type: object
+      - # sequence of inputsdata
+        type: array
+        items:
+          type: object
+  expect:
     description: |
       Expected data on fixture output ports.
-      One message is expected per mentioned port.
+      Can either be an object, or a sequence of such objects.
+    oneOf:
+      - "$ref": "outputdata.json"
+      - # sequence of expectdata
+        type: array
+        items:
+          - "$ref": "outputdata.json"
+
+  # optional
   timeout:
     type: number
     description: 'Timeout (in milliseconds). Overrides that set in the suite'