From dcddb09e550bab66dcae24acc50de3b688a1b007 Mon Sep 17 00:00:00 2001
From: Chinmay Pendharkar <notthetup@gmail.com>
Date: Fri, 27 Aug 2021 10:46:05 +0800
Subject: [PATCH] test(*): fixing breaking tests because of fjagejs

---
 build.gradle                                  | 21 +++++++++++++++++++
 gateways/js/dist/esm/fjage.js                 |  2 +-
 gateways/js/dist/fjage.js                     |  2 +-
 gateways/js/test/browser-test.cjs             |  6 ++++--
 .../org/arl/fjage/test/fjagejsTest.groovy     |  4 +++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 367a52de..4a312457 100644
--- a/build.gradle
+++ b/build.gradle
@@ -92,6 +92,27 @@ javadoc.doLast {
   }
 }
 
+task buildjs { 
+  doLast {
+    def result = exec {
+      ignoreExitValue = true
+      commandLine 'npm', '-v'
+      errorOutput = new ByteArrayOutputStream()
+      standardOutput = new ByteArrayOutputStream()
+    }
+    if(result.getExitValue()==0){
+      exec {
+        workingDir 'gateways/js'
+        commandLine 'npm', 'run', 'build'
+      }
+    }else{
+      project.logger.lifecycle('npm not found. Using cached fjage.js build')
+    }
+  }
+}
+
+processResources.dependsOn("buildjs")
+
 task jsdoc(type: Exec){
   workingDir 'gateways/js'
   executable 'npm'
diff --git a/gateways/js/dist/esm/fjage.js b/gateways/js/dist/esm/fjage.js
index d09bf79d..5510ed1f 100644
--- a/gateways/js/dist/esm/fjage.js
+++ b/gateways/js/dist/esm/fjage.js
@@ -1,4 +1,4 @@
-/* fjage.js v1.9.1-rc5 2021-08-04T07:48:57.240Z */
+/* fjage.js v1.9.1-rc5 2021-08-27T02:38:54.627Z */
 
 /* global window self */
 
diff --git a/gateways/js/dist/fjage.js b/gateways/js/dist/fjage.js
index d10003a4..b949c03e 100644
--- a/gateways/js/dist/fjage.js
+++ b/gateways/js/dist/fjage.js
@@ -1,4 +1,4 @@
-/* fjage.js v1.9.1-rc5 2021-08-04T07:48:57.240Z */
+/* fjage.js v1.9.1-rc5 2021-08-27T02:38:54.627Z */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
diff --git a/gateways/js/test/browser-test.cjs b/gateways/js/test/browser-test.cjs
index 35460088..58c4ba14 100644
--- a/gateways/js/test/browser-test.cjs
+++ b/gateways/js/test/browser-test.cjs
@@ -3,13 +3,15 @@
 const puppeteer = require('puppeteer');
 const statik = require('node-static');
 
+const port = 8000;
+
 console.log('\nSetting up local static server at http://localhost:8000/test');
 const file = new statik.Server('.');
 let server = require('http').createServer(function (request, response) {
   request.addListener('end', function () {
     file.serve(request, response);
   }).resume();
-}).listen(8000);
+}).listen(port);
 
 
 (async () => {
@@ -20,7 +22,7 @@ let server = require('http').createServer(function (request, response) {
     msg.type() == 'error' && console.log('PAGE ERR:', msg.text());
     msg.type() == 'warning' && console.log('PAGE WARN:', msg.text());
   });
-  await page.goto('http://127.0.0.1:8000/test', {waitUntil: 'networkidle2'});
+  await page.goto('http://127.0.0.1:'+port+'/test', {waitUntil: 'networkidle2'});
   await page.waitForSelector('.jasmine-overall-result');
   await page.waitForTimeout(100);
   await browser.close();
diff --git a/src/test/groovy/org/arl/fjage/test/fjagejsTest.groovy b/src/test/groovy/org/arl/fjage/test/fjagejsTest.groovy
index 8afe441e..1063bd56 100644
--- a/src/test/groovy/org/arl/fjage/test/fjagejsTest.groovy
+++ b/src/test/groovy/org/arl/fjage/test/fjagejsTest.groovy
@@ -98,7 +98,9 @@ class fjagejsTest {
     println "-------------------------------------------------------------"
     container.shutdown()
     platform.shutdown()
-    assertTrue(ret == 0 && testRes["node"].didPass && testRes["browser"].didPass)
+    assertTrue(ret == 0)
+    assertTrue(testRes["node"].didPass)
+    assertTrue(testRes["browser"].didPass)
   }
 }