Merge pull request #45 from vizzuhq/veghdev

integration test: parallel run, simplify code

Author: simzer

ci/docker/vizzu-test-cloudbuild

@@ -15,4 +15,4 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
 ADD . /workspace/
 WORKDIR /workspace/test/integration
 RUN npm install
-RUN node vizzutest.js -r DISABLED -u /example/lib/vizzu.min.js
+RUN node test.js --vizzu /example/lib/vizzu.min.js --images DISABLED --hashes DISABLED --nologs

test/integration/man.js

@@ -0,0 +1,35 @@
+const yargs = require("yargs");
+
+const Manual = require("./modules/manual/manual.js");
+
+
+try {
+    var argv = yargs
+        .usage("Usage: [options]")
+
+        .help("h")
+        .alias("h", "help")
+        .version(false)
+
+        .alias("p", "port")
+        .describe("p", "Change workspace host's port")
+        .nargs("p", 1)
+        .default("p", "8080")
+
+        .array("c")
+        .alias("c", "configs")
+        .nargs("c", 1)
+        .describe("c",
+            "Change the list of config file's path of the test cases" +
+            "\n(relative or absolute path where the repo folder is the root)" +
+            "\n")
+        .default("c",
+            ["/test/integration/test_cases/test_cases.json"])
+        .argv;
+
+    let manual = new Manual(argv.configs, argv.port);
+    manual.run();
+} catch (err) {
+    process.exitCode = 1;
+    console.error(err);
+}

test/integration/manual/manual.js

@@ -0,0 +1,102 @@
+const path = require("path");
+const fs = require("fs");
+
+const Chrome = require("../../modules/browser/chrome.js");
+
+
+class BrowsersChrome {
+
+    #browsers = [];
+
+    #browsersNum;
+    #browsersGui;
+
+    #browsersLogPath;
+    #browsersLogFilePrefix;
+    #browsersLogTimeStamp;
+
+    #timeout = 120000;
+
+
+    constructor(browsersNum, browsersGui, browsersLogPath = undefined, browsersLogTimeStamp = undefined) {
+        this.setBrowsersNum(browsersNum);
+        this.#browsersGui = browsersGui;
+        if (browsersLogPath && browsersLogTimeStamp) {
+            this.#browsersLogPath = browsersLogPath;
+            this.#browsersLogFilePrefix = "chrome";
+            this.#browsersLogTimeStamp = browsersLogTimeStamp;
+        } else {
+            if (browsersLogPath || browsersLogTimeStamp) {
+                throw new Error("parameter is required");
+            }
+        }
+    }
+
+
+    startBrowsers() {
+        let browsersReady = [];
+        for (let i = 0; i < this.#browsersNum; i++) {
+            let browser = new Chrome(!this.#browsersGui);
+            this.#browsers.push(browser);
+            browsersReady.push(browser.initializing);
+        }
+        return Promise.all(browsersReady);
+    }
+
+
+    closeBrowsers() {
+        this.#browsers.forEach((browser, index) => {
+            if (browser) {
+                let browserLogReady = new Promise(resolve => { resolve() });
+                if (this.#browsersLogPath) {
+                    browserLogReady = new Promise((resolve, reject) => {
+                        fs.mkdir(this.#browsersLogPath, { recursive: true, force: true }, err => {
+                            if (err) {
+                                return reject(err);
+                            }
+                            return resolve(path.join(this.#browsersLogPath, this.#browsersLogFilePrefix + "_" + index + '_' + this.#browsersLogTimeStamp + ".log"));
+                        });
+                    });
+                }
+                browserLogReady.then((browserLog) => {
+                    browser.closeBrowser(browserLog);
+                });
+            }
+        });
+    }
+
+
+    shiftBrowser() {
+        return this.#browsers.shift();
+    }
+
+
+    pushBrowser(browser) {
+        this.#browsers.push(browser);
+    }
+
+
+    getBrowsersNum() {
+        return this.#browsersNum;
+    }
+
+
+    setBrowsersNum(browsersNum) {
+        browsersNum = parseInt(browsersNum);
+        if (isNaN(browsersNum)) {
+            throw new Error("browsersNum is integer");
+        }
+        this.#browsersNum = browsersNum;
+
+        let rate = 0.1;
+        this.#timeout = parseInt(this.#timeout * Math.pow(1 + rate, this.#browsersNum));
+    }
+
+
+    getTimeout() {
+        return this.#timeout;
+    }
+}
+
+
+module.exports = BrowsersChrome;