@admc.com/eslintplugin-sn-test 3.15.2 → 3.15.3

package/masterTest.js

@@ -6,29 +6,13 @@ if (!__filename.startsWith(process.cwd() + path.sep))  // eslint-disable-line pr
 const relTestPath = __filename.substring(process.cwd().length + 1);
 const fs = require("fs");
 const ex =  // eslint-disable-next-line max-len
-  /^test[/\\](good|bad1|bad2|badSys)[/\\](?:([\w-]+)[/\\])?([\w.-]+[/\\][\w-]+)-test[.]js$/.exec(relTestPath);
+  /^test[/\\](\d+)[/\\](?:([\w-]+)[/\\])?([\w.-]+[/\\][\w-]+)-test[.]js$/.exec(relTestPath);
 if (!ex) throw new Error(`Bad test file path: ${relTestPath}`);
-let expectExitVal;
-switch (ex[1]) {
-    case "good":
-        expectExitVal = 0;
-        break;
-    case "bad1":
-        expectExitVal = 1;
-        break;
-    case "bad2":
-        expectExitVal = 2;
-        break;
-    case "badSys":
-        expectExitVal = 253;
-        break;
-}
-if (expectExitVal === undefined)
-    throw new Error(`eslintplugin-sn-test framework doesn't support test sub-type '${ex[1]}'`);
+const expectExitVal = parseInt(ex[1]);
 const altscope = ex[2];
 const tableBase = ex[3];
 // eslint-disable-next-line no-extra-parens, prefer-template
-const scriptPath = path.join(`${ex[1]}Scripts`, `${altscope?(altscope+"/"):""}${tableBase}.js`);
+const scriptPath = path.join(`${ex[1]}scripts`, `${altscope?(altscope+"/"):""}${tableBase}.js`);
 if (!fs.existsSync(scriptPath)) throw new Error(`Script file missing: ${scriptPath}`);
 if (!fs.statSync(scriptPath).isFile()) throw new Error(`Script is not a file: ${scriptPath}`);
 const params = [ "node_modules/.bin/snLint", scriptPath, "-c" ];
@@ -42,5 +26,5 @@ const childProcess = require("child_process").
 
 it(altscope ? `${tableBase} | ${altscope}` : tableBase, () => {
     if (expectExitVal !== childProcess.status)
-        throw new Error(`Failed with code ${childProcess.status}`);
+        throw new Error(`Failed with code ${childProcess.status} (expected ${expectExitVal})`);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@admc.com/eslintplugin-sn-test",
-  "version": "3.15.2",
+  "version": "3.15.3",
   "description": "External tests for ESLint plugin @admc.com/eslint-plugin-sn",
   "scripts": {
     "test": "mocha --recursive",

package/populateTest.bash

@@ -49,21 +49,21 @@ Abort() {
 [ -n "$TMPDIR" ] || TMPDIR=/tmp
 TMPFILE="$TMPDIR/${PROGNAME#.*}.$$"
 trap 'rm -f "$TMPFILE"' EXIT
-[ -d goodScripts ] || Abort "Directory 'goodScripts' is missing"
-[ -d bad1Scripts ] || Abort "Directory 'bad1Scripts' is missing"
-[ -d bad2Scripts ] || Abort "Directory 'bad2Scripts' is missing"
-[ -d badSysScripts ] || Abort "Directory 'badScripts' is missing"
-find goodScripts bad1Scripts bad2Scripts badSysScripts -name '*.js' > "$TMPFILE" ||
+[ -d 0scripts ] || Abort "Directory '0scripts' is missing"
+[ -d 1scripts ] || Abort "Directory '1scripts' is missing"
+[ -d 2scripts ] || Abort "Directory '2scripts' is missing"
+[ -d 254scripts ] || Abort "Directory '254scripts' is missing"
+find [0-9]scripts [0-9][0-9][0-9]scripts -name '*.js' > "$TMPFILE" ||
 Abort 'find command failed'
-[ -n "$REPLACE_MODE" ] && rm -rf test/good test/bad1 test/bad2 test/badSys
+[ -n "$REPLACE_MODE" ] && rm -rf test/[012] test/[0-9][0-9][0-9]
 while read SCRIPT_PATH; do
-    GB=
+    RV=
     case "$SCRIPT_PATH" in
-        bad1Scripts/*|bad2Scripts/*|goodScripts/*|badSysScripts/*) ;;
+        [0-9]scripts/*|[0-9][0-9][0-9]scripts/*) ;;
         *) Abort "Unexpected SCRIPT_PATH prefix: $SCRIPT_PATH";;
     esac
-    GB="${SCRIPT_PATH%%Scripts*}"
-    REBASED="test/$GB/${SCRIPT_PATH#*Scripts/}"
+    RV="${SCRIPT_PATH%%scripts*}"
+    REBASED="test/$RV/${SCRIPT_PATH#*scripts/}"
     TEST_PATH="${REBASED%.js}-test.js"
     [ -e "$TEST_PATH" ] && {
         [ -f "$TEST_PATH" ] || Abort "Existing filesystem node not a file: $TEST_PATH"

package/badSysScripts/invalid_table/invalidTable.js

@@ -1,2 +0,0 @@
-"use strict";
-if ([].forEach === undefined) throw new Error("Should never get this");