Simplify test results data

src/data/types.js

@@ -70,15 +70,30 @@
  * @property {string} name name of the test plan, defaults to 'unknown'
  * @property {AriaATCIData.Log[]} log debug messages emitted during execution of test plan
  * @property {object[]} tests
+ * @property {string} tests[].id id of a test in a test plan
  * @property {string} tests[].filepath filepath of file describing the test in the test plan
  * @property {AriaATCIData.Log[]} tests[].log subset of log emitted during this single test
- * @property {AriaATCIData.TestResult[]} tests[].results
+ * @property {AriaATCIData.TestResultOutput[]} tests[].results
  */
 
 /**
  * Result from a single test in a test plan.
  * @typedef AriaATCIData.TestResult
- * @property {number} testId numeric id of a test in a test plan
+ * @property {string} testId id of a test in a test plan
+ * @property {number} presentationNumber numeric id of a test in a test plan
+ * @property {object[]} commands input commands and the speech emitted
+ * @property {string} commands[].command id of input command sent to system
+ * @property {string} [commands[].response] speech emitted
+ * @property {string[]} [commands[].errors] errors that occured while during command
+ * @property {object[]} commands[].assertions
+ * @property {string} commands[].assertions[].expectation
+ * @property {"pass"|"fail"|null} commands[].assertions[].verdict
+ * @property {Record<string, string>} capabilities Information about the system under test
+ */
+
+/**
+ * Result from a single test in a test plan.
+ * @typedef AriaATCIData.TestResultOutput
  * @property {object[]} commands input commands and the speech emitted
  * @property {string} commands[].command id of input command sent to system
  * @property {string} [commands[].response] speech emitted

src/host/plan-object.js

@@ -58,7 +58,7 @@ export function addTestToTestPlan(testPlan, filepath) {
     testPlan.files.find(file => file.name === filepath),
     () => `File ${filepath} does not exist in test plan.`
   );
-  return { ...testPlan, tests: [...testPlan.tests, { filepath, log: [], results: [] }] };
+  return { ...testPlan, tests: [...testPlan.tests, { filepath, id: '', log: [], results: [] }] };
 }
 
 /**
@@ -94,9 +94,14 @@ export function addTestLogToTestPlan(testPlan, { filepath: testFilepath }) {
  */
 export function addTestResultToTestPlan(testPlan, testFilepath, result) {
   const test = testPlan.tests.find(({ filepath }) => filepath === testFilepath);
+  const { testId, presentationNumber, ...resultOutput } = result;
   return {
     ...testPlan,
-    tests: arrayUtil.replace(testPlan.tests, test, { ...test, results: [...test.results, result] }),
+    tests: arrayUtil.replace(testPlan.tests, test, {
+      ...test,
+      id: testId,
+      results: [...test.results, resultOutput],
+    }),
   };
 }
 

src/host/types.js

@@ -48,6 +48,7 @@
  * @property {object} serverOptions
  * @property {AriaATCIShared.BaseURL} serverOptions.baseUrl
  * @property {object[]} tests
+ * @property {string} tests[].id
  * @property {string} tests[].filepath
  * @property {number[]} tests[].log
  * @property {Array} tests[].results

src/runner/mock-test-runner.js

@@ -88,7 +88,6 @@ export class MockTestRunner {
     }
 
     return {
-      testId: task.info.testId,
       capabilities: {
         browserName: 'mock',
         browserVersion: '1.0',

src/runner/types.js

@@ -28,7 +28,7 @@
 
 /**
  * @typedef AriaATCIRunner.TestRunner
- * @property {function(AriaATCIData.Test): Promise<AriaATCIData.TestResult>} run run a test
+ * @property {function(AriaATCIData.Test): Promise<AriaATCIData.TestResultOutput>} run run a test
  */
 
 /**