testaro 8.4.7 → 9.0.0

package/validation/executors/run.js

@@ -0,0 +1,40 @@
+// run.js
+// Validator for immediate job execution.
+
+// ########## IMPORTS
+
+const fs = require('fs/promises');
+
+// ########## CONSTANTS
+
+const {doJob} = require('../../run');
+const jobID = '00000-simple-example';
+
+// ########## OPERATION
+
+// Get the simple job.
+fs.readFile(`${__dirname}/../jobs/todo/${jobID}.json`, 'utf8')
+.then(async jobJSON => {
+  const report = JSON.parse(jobJSON);
+  // Run it.
+  await doJob(report);
+  try {
+    // Check the report against expectations.
+    const {acts, jobData} = report;
+    if (acts.length !== 3) {
+      console.log('Failure: Counts of acts is not 3');
+    }
+    else if (! jobData) {
+      console.log('Failure: Report omits jobData');
+    }
+    else if (jobData.endTime < jobData.startTime) {
+      console.log('Failure: End time precedes start time');
+    }
+    else {
+      console.log('Success');
+    }
+  }
+  catch(error) {
+    console.log(`ERROR: ${error.message}`);
+  }
+});

package/validation/executors/watchDir.js

@@ -10,18 +10,19 @@ const fs = require('fs/promises');
 // Override cycle environment variables with validation-specific ones.
 process.env.PROTOCOL = 'http';
 process.env.JOBDIR = `${__dirname}/../watch`;
-process.env.DONEDIR = `${__dirname}/../done`;
 process.env.REPORTDIR = `${__dirname}/../../temp`;
 const jobID = '00000-simple-example';
-const {cycle} = require(`${__dirname}/../../watch`);
+const {cycle} = require('../../watch');
 
 // Start checking for jobs every 5 seconds.
 cycle(true, false, 5)
 .then(() => {
-  console.log('Watch validation ended');
+  console.log('Success: Watch validation ended');
 });
-// Copy a job into JOBDIR after 7 seconds.
+// Make a job available after 7 seconds.
 setTimeout(() => {
-  fs.copyFile(`${__dirname}/../jobs/${jobID}.json`, `${process.env.JOBDIR}/${jobID}.json`);
-  console.log('Job copied into watched-job directory after 7 seconds');
+  fs.copyFile(
+    `${__dirname}/../jobs/todo/${jobID}.json`, `${process.env.JOBDIR}/todo/${jobID}.json`
+  );
+  console.log('Job made available after 7 seconds');
 }, 7000);

package/validation/executors/watchNet.js

@@ -9,11 +9,11 @@ const fs = require('fs/promises');
 
 // Override cycle environment variables with validation-specific ones.
 process.env.PROTOCOL = 'http';
-const jobDir = `${__dirname}/../jobs`;
+const jobDir = `${__dirname}/../jobs/todo`;
 process.env.JOB_URL = 'localhost:3007/api/job';
 process.env.REPORT_URL = 'localhost:3007/api';
 process.env.AGENT = 'testarauth';
-const {cycle} = require(`${__dirname}/../../watch`);
+const {cycle} = require('../../watch');
 const client = require(process.env.PROTOCOL);
 const jobID = '00000-simple-example';
 
@@ -81,11 +81,10 @@ const requestHandler = (request, response) => {
             const bodyJSON = bodyParts.join('');
             const body = JSON.parse(bodyJSON);
             if (
-              body.job
-              && body.acts
+              body.acts
               && body.jobData
-              && body.agent
-              && body.agent === process.env.AGENT
+              && body.jobData.agent
+              && body.jobData.agent === process.env.AGENT
             ) {
               ack.result = 'Success: Valid report submitted';
             }

package/validation/jobs/done/README.md

@@ -0,0 +1,3 @@
+# jobs
+
+Directory containing validated jobs.

package/validation/jobs/{00000-simple-example.json → todo/00000-simple-example.json}

@@ -1,9 +1,9 @@
 {
   "id": "00000-simple-example",
-  "what": "Test example.com with bulk",
+  "what": "Test example.edu with bulk",
   "strict": true,
   "timeLimit": 10,
-  "commands": [
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -11,7 +11,7 @@
     },
     {
       "type": "url",
-      "which": "https://example.com/",
+      "which": "https://example.edu/",
       "what": "Example.com",
       "id": "example"
     },
@@ -24,13 +24,12 @@
   "sources": {
     "script": "simple",
     "batch": "",
-    "host": {
+    "target": {
       "id": "example",
-      "which": "https://example.com",
-      "what": "Example.com"
+      "what": "Example"
     },
     "requester": "user@domain.tld"
   },
-  "jobCreationTime": "2022-11-12T22:51:45",
+  "creationTime": "2022-11-12T22:51:45",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/allHidden.json

@@ -2,7 +2,8 @@
   "id": "allHiddenVal",
   "what": "validation of allHidden test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -308,6 +309,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/bulk.json

@@ -2,7 +2,8 @@
   "id": "bulkVal",
   "what": "validation of bulk test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -42,6 +43,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/docType.json

@@ -2,7 +2,8 @@
   "id": "docTypeVal",
   "what": "validation of docType test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -40,6 +41,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/elements.json

@@ -2,7 +2,8 @@
   "id": "elementsVal",
   "what": "validation of elements test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -134,6 +135,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/embAc.json

@@ -2,7 +2,8 @@
   "id": "embAcVal",
   "what": "validation of embAc test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -48,6 +49,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/filter.json

@@ -2,7 +2,8 @@
   "id": "filterVal",
   "what": "validation of filter test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -49,6 +50,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/focAll.json

@@ -2,7 +2,8 @@
   "id": "focAllVal",
   "what": "validation of focAll test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -62,6 +63,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/focInd.json

@@ -2,7 +2,8 @@
   "id": "focIndVal",
   "what": "validation of focInd test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -63,6 +64,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/focOp.json

@@ -2,7 +2,8 @@
   "id": "focOpVal",
   "what": "validation of focOp test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -56,6 +57,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/focVis.json

@@ -2,7 +2,8 @@
   "id": "focVisVal",
   "what": "validation of focVis test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -29,6 +30,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/hover.json

@@ -2,7 +2,8 @@
   "id": "hoverVal",
   "what": "validation of hover test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -112,6 +113,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/labClash.json

@@ -2,7 +2,8 @@
   "id": "labClashVal",
   "what": "validation of labClash test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -46,6 +47,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/linkTo.json

@@ -2,7 +2,8 @@
   "id": "linkToVal",
   "what": "validation of linkTo test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -29,6 +30,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/linkUl.json

@@ -2,7 +2,8 @@
   "id": "linkUlVal",
   "what": "validation of linkUl test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -65,6 +66,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/menuNav.json

@@ -2,7 +2,8 @@
   "id": "menuNavVal",
   "what": "validation of menuNav test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -100,6 +101,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/miniText.json

@@ -2,7 +2,8 @@
   "id": "miniTextVal",
   "what": "validation of miniText test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -30,6 +31,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/motion.json

@@ -2,7 +2,8 @@
   "id": "motionVal",
   "what": "validation of motion test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "webkit",
@@ -56,6 +57,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/nonTable.json

@@ -2,7 +2,8 @@
   "id": "nonTableVal",
   "what": "validation of nonTable test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -31,6 +32,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/radioSet.json

@@ -2,7 +2,8 @@
   "id": "radioSetVal",
   "what": "validation of radioSet test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -46,6 +47,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/role.json

@@ -2,7 +2,8 @@
   "id": "roleVal",
   "what": "validation of role test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -54,6 +55,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/styleDiff.json

@@ -2,7 +2,8 @@
   "id": "styleDiffVal",
   "what": "validation of styleDiff test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -65,6 +66,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/tabNav.json

@@ -2,7 +2,8 @@
   "id": "tabNavVal",
   "what": "validation of tabNav test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -100,6 +101,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/textNodes.json

@@ -2,7 +2,8 @@
   "id": "elementsVal",
   "what": "validation of elements test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -92,6 +93,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/title.json

@@ -2,7 +2,8 @@
   "id": "titleVal",
   "what": "validation of title test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -40,6 +41,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/titledEl.json

@@ -2,7 +2,8 @@
   "id": "titledElVal",
   "what": "validation of titledEl test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -31,6 +32,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/tests/jobs/zIndex.json

@@ -2,7 +2,8 @@
   "id": "zIndexVal",
   "what": "validation of zIndex test",
   "strict": true,
-  "commands": [
+  "timeLimit": 20,
+  "acts": [
     {
       "type": "launch",
       "which": "chromium",
@@ -43,6 +44,6 @@
     "host": {},
     "requester": ""
   },
-  "jobCreationTime": "2002-11-12T09:31:00",
+  "creationTime": "2002-11-12T09:31:00",
   "timeStamp": "00000"
 }

package/validation/validateTest.js

@@ -2,18 +2,13 @@
 // Validator for one Testaro test.
 
 const fs = require('fs').promises;
-const {doJob} = require(`${__dirname}/../run`);
+const {doJob} = require('../run');
 exports.validateTest = async testID => {
   const jobFileNames = await fs.readdir(`${__dirname}/tests/jobs`);
   for (const jobFileName of jobFileNames.filter(fileName => fileName === `${testID}.json`)) {
     const rawJobJSON = await fs.readFile(`${__dirname}/tests/jobs/${jobFileName}`, 'utf8');
     const jobJSON = rawJobJSON.replace(/__targets__/g, 'file://validation/tests/targets');
-    const job = JSON.parse(jobJSON);
-    const report = {
-      job,
-      acts: [],
-      jobData: {}
-    };
+    const report = JSON.parse(jobJSON);
     await doJob(report);
     const {acts, jobData} = report;
     if (jobData.endTime && /^\d{4}-.+$/.test(jobData.endTime)) {
@@ -24,7 +19,7 @@ exports.validateTest = async testID => {
     }
     const testActs = acts.filter(act => act.type && act.type === 'test');
     if (
-      testActs.length === job.commands.filter(cmd => cmd.type === 'test').length
+      testActs.length === report.acts.filter(act => act.type === 'test').length
       && testActs.every(testAct => testAct.result && testAct.result.failureCount !== undefined)
     ) {
       console.log('Success: Reports have been correctly populated');