Merge remote-tracking branch 'origin/master' into GH-2571

Author: mmews

n4js-libs/npm-test.sh

@@ -18,15 +18,13 @@ echo "========= Running tests defined in the individual packages of yarn workspa
 
 
 echo "========= Running mangelhaft tests for all packages in yarn workspace 'n4js-libs' ..."
-REPORT_NAME="./build/report.xml"
 mkdir -p "./build"
 echo "Run mangelhaft ..."
-packages/n4js-mangelhaft-cli/src-gen/org/eclipse/n4js/mangelhaft/runner/node/NodeTestMain.js \
-        ./packages/org.eclipse.n4js.mangelhaft.test/test-catalog.json \
-        --xunitReportFile $REPORT_NAME \
+./packages/n4js-mangelhaft-cli/src-gen/org/eclipse/n4js/mangelhaft/runner/node/NodeTestMain.js \
+        packages/* \
+        --xunitReportFile "./build/report.xml" \
         --sonarTestExecutionReportFile ./build/sqreport.xml \
         --xunitReportName test-report \
         --xunitReportPackage n4js-libs-report \
         --nycCoveragePath ./build/coverage.json
 echo "Done running mangehaft."
-echo "Saved test report at: ${REPORT_NAME}"

n4js-libs/packages/n4js-cli/src/n4js/Globals.n4js

@@ -37,7 +37,7 @@ export public const JRE_INFO_MAP = new Map<Platform, JreInfo>([
     [Platform.x64_sunos,   null],
     [Platform.x32_win32,   {bin: "bin/java.exe", name: "OpenJDK-jre_x86-32_windows_hotspot_2021-05-06-23-30.zip"}],
     [Platform.x64_win32,   {bin: "bin/java.exe", name: "OpenJDK-jre_x64_windows_hotspot_2021-05-06-23-30.zip"}]]
-     as Iterable<Iterable2<Platform, JreInfo>>);
+    );
 
 
 @StringBased

n4js-libs/packages/n4js-mangelhaft-cli/src/n4js/org/eclipse/n4js/mangelhaft/runner/node/NodeTestAPI.n4js

@@ -17,18 +17,23 @@ const cwd = process.cwd();
 const resolvePath = (p: string): string => lib_path.resolve(cwd, p);
 
 const nomnomOptions: Object = {
-    testCatalog: {
+    testCatalogs: {
         position: 0,
-        list: false,
-        default: ".",
-        metavar: "PATH|NPM-relpath",
-        help: "Test catalog (JSON) or project location to be inspected for test cases."
+        list: true,
+        default: ["."],
+        metavar: "PATH|NPM-relpath|glob",
+        help: "Test catalog (JSON) or project location(s) to be inspected for test catalog(s)."
     },
     filter: {
         abbr: "f",
         list: true,
         help: "Filter for matching test cases."
     },
+    mergeResult: {
+        abbr: "mr",
+        flag: true,
+        help: "Merge all results into a single file stored in CWD."
+    },
     xunitReportFile: {
         metavar: "PATH",
         transform: resolvePath,

n4js-libs/packages/n4js-mangelhaft-cli/src/n4js/org/eclipse/n4js/mangelhaft/runner/node/NodeTestCLI.n4js

@@ -10,13 +10,5 @@
  *   NumberFour AG - Initial API and implementation
  */
 
-import NodeTestAPI from "org/eclipse/n4js/mangelhaft/runner/node/NodeTestAPI";
-import {NodeTestCLI} from "org/eclipse/n4js/mangelhaft/runner/node/NodeTestCLI";
-import {waitAndExitProcess} from "org/eclipse/n4js/mangelhaft/util/proc";
 
-waitAndExitProcess(async () => {
-    const options = NodeTestCLI.parseCommandLine();
-    if (options) {
-        await NodeTestAPI.exec(options);
-    }
-});
+import("./NodeTestRunner.js");

n4js-libs/packages/n4js-mangelhaft-cli/src/n4js/org/eclipse/n4js/mangelhaft/runner/node/NodeTestMain.n4js

@@ -15,14 +15,20 @@ import { XUnitReportSpec } from "org/eclipse/n4js/mangelhaft/reporter/xunit/XUni
  */
 export default public class NodeTestOptions extends XUnitReportSpec {
     /**
-     * Test catalog to be tested.
+     * One or more files/directories/globs pointing to the test catalog to be tested.
      */
-    public testCatalog: string;
+    public testCatalogs: string[];
+
     /**
      * Filter for matching test cases.
      */
     public filter: string[];
 
+    /**
+     * Merge all results into a single file stored in CWD.
+     */
+    public mergeResult: boolean;
+
     /**
      * Sonar base dir.
      */