Merge pull request #15 from vizzuhq/veghdev

manual and integration test improvements

Author: simzer

ci/cloudfunctions/getVizzuList/index.js

@@ -7,10 +7,22 @@ exports.getVizzuList = (req, res) => {
     const bucket = storage.bucket(bucketName);
     bucket.getFiles().then(files => {
         let ans = [];
+        files[0].sort((a, b) => {
+            if (a.metadata.updated > b.metadata.updated) {
+                return 1;
+            }
+            if (a.metadata.updated < b.metadata.updated) {
+                return -1;
+            }
+            return 0;
+        });
         files[0].forEach(file => {
             let fileEnd = '/vizzu.js'
             if (file.name.endsWith(fileEnd)) {
-                ans.push(file.name.slice(0,-fileEnd.length));
+                let tmp = {};
+                tmp.sha = file.name.slice(0,-fileEnd.length)
+                tmp.time = file.metadata.updated;
+                ans.push(tmp);
             }
         });
         let message = req.query.message || req.body.message || JSON.stringify(ans);

ci/cloudfunctions/getVizzuList/package.json

@@ -1,6 +1,6 @@
 {
     "name": "getVizzuList",
-    "version": "0.0.1",
+    "version": "0.0.2",
     "dependencies": {
         "@google-cloud/storage": "*",
         "@google-cloud/functions-framework": "*"

test/integration/manual/manual.js

@@ -38,8 +38,8 @@ class Manual {
         libList['HEAD'] = 'https://' + remoteStableBucket + '/lib';
         let vizzuListUrl = await fetch('https://' + remoteCloudFunctions + '/getVizzuList');
         let vizzuList = await vizzuListUrl.json();
-        vizzuList.forEach(vizzu => {
-            libList[vizzu] = 'https://' + remoteLatestBucket + '/' + vizzu;
+        vizzuList.slice().reverse().forEach(vizzu => {
+            libList[vizzu.time.substring(0,10) + ' ' + vizzu.time.substring(11,16)  + ' ' + vizzu.sha] = 'https://' + remoteLatestBucket + '/' + vizzu.sha;
         });
         libList['0.2.0'] = 'https://vizzuhq.github.io/vizzu-beta-release/0.2.0';
         this.#server.get('/getLibList', (req, res) => {

test/integration/vizzutest.js

@@ -30,6 +30,7 @@ try {
 
         #testCasesPath;
         #testCases = [];
+        #testCasesRun = [];
         #testCasesData = {};
         #testCasesDataPath;
 
@@ -162,14 +163,15 @@ try {
         async runTestSuite() {
             try {
                 await this.#setUrl(argv.vizzuUrl);
-                let testCases = this.#filterTestCases(argv._);
-                if (testCases.length > 0) {
+                this.#testCasesRun = this.#filterTestCases(argv._);
+                if (this.#testCasesRun.length > 0) {
                     this.#startTestSuite();
-                    for (let i = 0; i < testCases.length; i++) {
-                        await this.#runTestCase(testCases[i]);
+                    console.log('[ TESTS   ]' + ' ' + '[ ' + this.#testCasesRun.length + ' / ' + this.#testCases.length + ' ]');
+                    for (let i = 0; i < this.#testCasesRun.length; i++) {
+                        await this.#runTestCase(i);
                     }
                     if (argv.reportLevel != 'DISABLED') {
-                        this.#createJson(__dirname + '/test_report/', testCases);
+                        this.#createJson(__dirname + '/test_report/', this.#testCasesRun);
                     }
                 }
             } catch (err) {
@@ -236,7 +238,8 @@ try {
             }
         }
 
-        async #runTestCase(testCase) {
+        async #runTestCase(i) {
+            let testCase = this.#testCasesRun[i];
             let testCaseResultPath = __dirname + '/test_report/' + testCase;
             let testCaseData = await this.#runTestCaseClient(testCase, this.#url);
             let testCaseResultObject = this.#getTestCaseResult(testCaseData, testCase);
@@ -245,20 +248,20 @@ try {
 
             let createReport = false;
             if (testCaseResult == 'PASSED') {
-                console.log(('[ ' + testCaseResult.padEnd(padLength, ' ') + ' ] ').success + testCase);
+                console.log(('[ ' + testCaseResult.padEnd(padLength, ' ') + ' ] ').success + '[ ' + String(i + 1).padEnd(String(this.#testCasesRun.length).length, ' ') + ' ] ' + testCase);
                 this.#testSuiteResults.PASSED.push(testCase);
                 if (argv.reportLevel == 'INFO') {
                     createReport = true;
                 }
             } else if (testCaseResult == 'WARNING') {
-                console.warn(('[ ' + testCaseResult.padEnd(padLength, ' ') + ' ] ' + '[ ' + testCaseResultObject.testCaseReultDescription + ' ] ').warn + testCase);
+                console.warn(('[ ' + testCaseResult.padEnd(padLength, ' ') + ' ] ' + '[ ' + String(i + 1).padEnd(String(this.#testCasesRun.length).length, ' ') + ' ] [ ' + testCaseResultObject.testCaseReultDescription + ' ] ').warn + testCase);
                 this.#testSuiteResults.WARNING.push(testCase);
                 if (argv.reportLevel == 'INFO' || argv.reportLevel == 'WARN') {
                     createReport = true;
                 }
             } else {
                 let errParts = testCaseResultObject.testCaseReultDescription.split('http://127.0.0.1:' + + String(this.#workspace.getWorkspacePort())).join(path.resolve(this.#workspacePath)).split('\n');
-                console.error(('[ ' + testCaseResult.padEnd(padLength, ' ') + ' ] ' + '[ ' + errParts[0] + ' ] ').error + testCase);
+                console.error(('[ ' + testCaseResult.padEnd(padLength, ' ') + ' ] ' + '[ ' + String(i + 1).padEnd(String(this.#testCasesRun.length).length, ' ') + ' ] [ ' + errParts[0] + ' ] ').error + testCase);
                 if (errParts.length > 1) {
                     errParts.slice(1).forEach(item => {
                         console.error(''.padEnd(padLength + 7, ' ') + item);