Test coverage attribution

.circleci/package.sh

@@ -69,22 +69,26 @@ run_lint () {
 	local ESLINT_FILE=artifacts/eslint_report
 	mkdir -p artifacts
 
-	if ! npm run lint -- -f unix -o "${ESLINT_FILE}.txt"; then
-		echo "eslint plain failed"
-	fi
-	if ! npm run lint -- -f json -o "${ESLINT_FILE}.json"; then
-		## sonarqube report
-		echo "eslint json failed"
-	fi
+    ESLINT_RETURN_CODE=0
+	npm run lint -- -f json -o "${ESLINT_FILE}.json.tmp" || ESLINT_RETURN_CODE=$?
+    echo "eslint returned code=$ESLINT_RETURN_CODE"
 
+    jq '.' < "${ESLINT_FILE}.json.tmp" > "${ESLINT_FILE}.json"
     sed -i 's|/home/circleci/project/|/root/project/|g' "${ESLINT_FILE}.json"
-	if [ "$(find artifacts -name "eslint_report.json" | wc -l)" != "0" ]; then
-		jq '.' < "${ESLINT_FILE}.json" > "${ESLINT_FILE}_pretty.json"
-	else
-		echo "ERROR: ${ESLINT_FILE}.json not found"
-		exit 1
-	fi
-	echo 'eslint successful'
+
+    if [ ! -f "${ESLINT_FILE}.json" ]; then
+        echo "ERROR: ${ESLINT_FILE}.json not found"
+        exit 1
+    fi
+
+    MESSAGE_COUNT=$(jq '[.[] | .messages | length] | add' < ${ESLINT_FILE}.json.tmp)
+    ERROR_COUNT=$(jq '[.[] | .errorCount] | add' < ${ESLINT_FILE}.json.tmp)
+    WARNING_COUNT=$(jq '[.[] | .warningCount] | add' < ${ESLINT_FILE}.json.tmp)
+
+    echo 'eslint summary:'
+    echo " - message count:  $MESSAGE_COUNT"
+    echo " - error count:    $ERROR_COUNT"
+    echo " - warning count:  $WARNING_COUNT"
 }
 
 ########## MAIN BLOCK ##########

.vscode/settings.json

@@ -1,26 +1,10 @@
 {
-	// "eslint.lintTask.enable": true,
-	"eslint.codeActionsOnSave.mode": "problems",
-	// "extension-test-runner.extractSettings": {
-	// 	"suite": [ "suite" ],
-	// 	"test": [ "test" ],
-	// 	// "extractWith": "syntax",
-	// 	"extractWith": "evaluation",
-	// },
-	"git.branchProtection": [
-		"main"
+	"circleci.filters.branchFilter": "allBranches",
+    "circleci.persistedProjectSelection": [
+		"gh/kenherring/ablunit-test-runner"
 	],
-	"extension-test-runner.extractSettings": {
-		"suite": [
-			"describe",
-			"suite"
-		],
-		"test": [
-			"it",
-			"test"
-		],
-		"extractWith": "syntax"
-	},
+	"eslint.lintTask.enable": true,
+	"eslint.codeActionsOnSave.mode": "problems",
 	"files.associations": {
 		"ablunit-test-profile*.json": "jsonc"
 	},
@@ -37,6 +21,9 @@
 		"out": true,
 		"node_modules": true
 	},
+	"git.branchProtection": [
+		"main"
+	],
 	"json.schemas": [
 		{
 			"fileMatch": [
@@ -66,8 +53,4 @@
 	"task.autoDetect": "on",
 	"typescript.preferences.quoteStyle": "single",
     "typescript.validate.enable": true,
-    "circleci.filters.branchFilter": "allBranches",
-    "circleci.persistedProjectSelection": [
-		"gh/kenherring/ablunit-test-runner"
-	],
 }

docker/build.xml

@@ -36,4 +36,12 @@
 		<echo>compile successful!</echo>
 	</target>
 
+	<target name="extract">
+		<echo>extracting ${env.DLC}/tty/ablunit.pl</echo>
+  		<copy todir="../resources/tty/ablunit/">
+    		<plfileset src="${env.DLC}/tty/ablunit.pl" includes="**/*" />
+  		</copy>
+		<echo>extract complete</echo>
+	</target>
+
 </project>

docker/run_tests.sh

@@ -11,7 +11,7 @@ options:
                 alternative: set the ABLUNIT_TEST_RUNNER_VSCODE_VERSION environment variable
   -b            drop to bash shell inside container on failure
   -B            same as -b, but only on error
-  -C | -d       delete volume 'test-runner-cache' before running tests
+  -C | -d       delete volumes 'vscode-cli-cache' and 'test-runner-cache' before running tests
   -i            run install and run test
   -m            copy modified files and staged files
   -n            run tests without coverage
@@ -120,10 +120,10 @@ initialize () {
 	fi
 
 	## create volume for .vscode-test directory to persist vscode application downloads
-	if ! docker volume ls | grep -q test-runner-cache; then
-		echo "creating test-runner-cache volume"
-		docker volume create --name test-runner-cache
-	fi
+	# if ! docker volume ls | grep -q test-runner-cache; then
+	# 	echo "creating test-runner-cache volume"
+	# 	docker volume create --name test-runner-cache
+	# fi
 	if ! docker volume ls | grep -q vscode-cli-cache; then
 		echo "creating vscode-cli-cache"
 		docker volume create --name vscode-cli-cache
@@ -149,7 +149,7 @@ initialize () {
 }
 
 run_tests_in_docker () {
-	echo "[$(date +%Y-%m-%d:%H:%M:%S) $0 ${FUNCNAME[0]}] pwd=$(pwd)"
+	echo "[$(date +%Y-%m-%d:%H:%M:%S) $0 ${FUNCNAME[0]}] pwd=$(pwd) ABLUNIT_TEST_RUNNER_OE_VERSION=$ABLUNIT_TEST_RUNNER_OE_VERSION"
 	local ABLUNIT_TEST_RUNNER_OE_VERSION
 
 	for ABLUNIT_TEST_RUNNER_OE_VERSION in "${OE_VERSIONS[@]}"; do
@@ -178,7 +178,7 @@ run_tests_in_docker () {
 		[ -n "${ABLUNIT_TEST_RUNNER_PROJECT_NAME:-}" ] && ARGS+=(-e ABLUNIT_TEST_RUNNER_PROJECT_NAME)
 		ARGS+=(
 			-v "${PWD}":/home/circleci/ablunit-test-runner:ro
-			-v vscode-cli-cache:/home/circleci/project/.vscode-test
+			-v "vscode-cli-cache-$ABLUNIT_TEST_RUNNER_OE_VERSION":/home/circleci/project/.vscode-test
 			kherring/ablunit-test-runner:"${ABLUNIT_TEST_RUNNER_OE_VERSION}"
 			bash -c "/home/circleci/ablunit-test-runner/docker/$SCRIPT.sh $OPTS;"
 		)

eslint.config.mjs

@@ -86,21 +86,29 @@ export default [{
 		'@typescript-eslint/no-unnecessary-condition': 0,
 		'no-unused-vars': 'off',
 
-		'@typescript-eslint/no-unused-vars': ['warn', {
-			argsIgnorePattern: '^_',
-			vars: 'all',
-			args: 'none',
-			ignoreRestSiblings: false,
-		}],
+		'@typescript-eslint/no-unused-vars': [
+			'error',
+			{
+				'args': 'all',
+				'argsIgnorePattern': '^_',
+				'caughtErrors': 'all',
+				'caughtErrorsIgnorePattern': '^_',
+				'destructuredArrayIgnorePattern': '^_',
+				'varsIgnorePattern': '^_',
+				'ignoreRestSiblings': true,
+			}
+		],
 
 		'@typescript-eslint/prefer-readonly': 'warn',
 		'@typescript-eslint/restrict-plus-operands': 'off',
-		'@typescript-eslint/switch-exhaustiveness-check': 'warn',
+		'@typescript-eslint/switch-exhaustiveness-check': ['warn', {
+			considerDefaultExhaustiveForUnions: true,
+		}],
 		'promise/catch-or-return': 'warn',
 		'promise/no-callback-in-promise': 'off',
 
 		'promise/always-return': ['warn', {
-			ignoreLastCallback: true,
+			ignoreLastCallback: true
 		}],
 
 		'no-console': 'warn',

openedge-project.json

@@ -1,7 +1,7 @@
 {
     "name": "ablunit-test-runner",
     "buildPath": [
-        { "type": "source", "path": "resources/VSCodeTestRunner", "includes": "**/*.p,**/*.cls"},
+        { "type": "source", "path": "resources/VSCodeTestRunner", "includes": "**/*.p,**/*.cls", "build": "resources/VSCodeTestRunner"},
         { "type": "propath", "path": "${DLC}/tty/ablunit.pl", "includes": "**/*" }
     ],
     "buildDirectory": "target"

resources/VSCodeTestRunner/ABLUnitCore.p

@@ -1,18 +1,31 @@
 // This file replaces the standard ABLUnitCore.p when the basedir is
 // included as part of the propath ahead of ablunit.pl.
 
+using VSCode.ABLUnit.Runner.ABLRunner.
+
 block-level on error undo, throw.
 create widget-pool.
 
 define variable quitOnEnd as logical init false no-undo.
+define variable VERBOSE as logical no-undo.
+VERBOSE = (os-getenv('VERBOSE') = 'true' or os-getenv('VERBOSE') = '1').
 
+if VERBOSE then
+	run printPropath.
 run main.
 if quitOnEnd then
 	quit.
 else
 	return.
 
 ////////// FUNCS AND PROCS //////////
+procedure printPropath :
+	message "PROPATH:~n" + replace(PROPATH, ',', '~n - ').
+	define variable cnt as integer no-undo.
+	do cnt = 1 to num-entries(propath, ','):
+		message ' - '+ entry(cnt, propath).
+	end.
+end procedure.
 
 procedure createDatabaseAliases :
 	define variable aliasesSessionParam as character no-undo.
@@ -34,6 +47,7 @@ procedure createDatabaseAliases :
 	do dbCount = 1 to num-entries(aliasesSessionParam,';'):
 		assign aliasList = entry(dbCount, aliasesSessionParam,';').
 		assign databaseName = entry(1,aliasList).
+		if VERBOSE then message "databaseName=" + databaseName.
 
 		do aliasCount = 2 to num-entries(aliaslist,','):
 			assign aliasName = entry(aliasCount, aliasList).
@@ -64,12 +78,12 @@ function writeErrorToLog returns logical (outputLocation as character, msg as ch
 		else
 			log-manager:logfile-name = session:temp-dir + "ablunit.log".
 	end.
-	log-manager:write-message (msg).
+	log-manager:write-message(msg).
 	return true.
 end function.
 
 procedure main :
-	define variable ablRunner as class OpenEdge.ABLUnit.Runner.ABLRunner no-undo.
+	define variable ablRunner as class ABLRunner no-undo.
 	define variable testConfig as class OpenEdge.ABLUnit.Runner.TestConfig no-undo.
 	define variable updateFile as character no-undo.
 
@@ -80,7 +94,7 @@ procedure main :
 	testConfig = readTestConfig(getParameter(trim(trim(session:parameter,'"'),"'"), 'CFG')).
 	quitOnEnd = (testConfig = ?) or testConfig:quitOnEnd.
 
-	ablRunner = new OpenEdge.ABLUnit.Runner.ABLRunner(testConfig, updateFile).
+	ablRunner = new ABLRunner(testConfig, updateFile).
 	ablRunner:RunTests().
 
 	// the `-catchStop 1` startup parameter is default in 11.7+
@@ -109,7 +123,10 @@ procedure main :
 			writeErrorToLog(testConfig:outputLocation, s:CallStack).
 		end.
 		if testConfig:ShowErrorMessage then
+		do:
 			message e:GetMessage(1) view-as alert-box error.
+			message e:CallStack.
+		end.
 		if testConfig:ThrowError then
 			undo, throw e.
 	end.