Merge pull request #453 from thaliproject/issue_171

Wifi-based mocks for the current version

Author: vjrantal

.gitignore

@@ -12,12 +12,17 @@ gradlew.bat
 # Nodejs
 node_modules
 npm-debug.log
+
 # Cordova
 out/
 
 # VS Code
 .settings/
+.vscode/
 
 # Testing
 test/TestServer/server-address.js
 test/www/jxcore/server-address.js
+
+# Misc
+thali/readme.md

build.sh

@@ -48,6 +48,10 @@ fi
 thali/install/setUpDesktop.sh;ERROR_ABORT
 cd test/www/jxcore/;ERROR_ABORT
 jx npm test;ERROR_ABORT
+jx npm run test-meta;ERROR_ABORT
+# Disabled coordinated tests since there was some
+# issue with them in the CI.
+#jx npm run test-coordinated;ERROR_ABORT
 # Make sure we are back in the project root folder
 # after the test execution
 cd $PROJECT_ROOT;ERROR_ABORT

mobile_test.json

@@ -10,7 +10,7 @@
     "android": "com.test.thalitest",
     "ios": "com.test.thalitest"
   },
-  "timeout": 1800,
+  "timeout": 1200,
   "serverScript": "test/TestServer/"
 }
 

test/README.md

@@ -67,17 +67,23 @@ environment.
 All of the tests are designed to be run on the desktop. Tests that require the ThaliEmitter (our mobile environment)
 will de-activate themselves when run on the desktop. What is especially nice about running on the desktop is that
 one can develop and debug directly in the Thali_CordovaPlugin directory. There is no need to do the kind of 
-copying and pasting that Cordova development normally requires. Note that only the unit tests run on the desktop.
-The perf tests are focused exclusively on measuring on the wire perf and so don't make sense (yet) on the desktop.
+copying and pasting that Cordova development normally requires.
 
 To set up your desktop environment for development go to Thali_CordovaPlugin/thali/install and run 
 `sudo jx npm run setupDesktop`.
 
-Sudo is needed because this script installs a symbolic link into your global NPM directory.
+Sudo might be needed because this script installs a symbolic link into your global NPM directory.
 
-You can run all the tests by going to Thali_CordovaPlugin/test/www/jxcore and issuing `jx UnitTest_app.js`. But the
-tests will happily run stand alone so you can run a test directly (e.g. `jx testConnectionTable.js`) thus allowing
-you to easily run and debug individual tests.
+You can run all the tests by going to Thali_CordovaPlugin/test/www/jxcore and issuing one of the following:
+
+```
+$ jx npm test
+$ jx npm run test-meta
+$ jx npm run test-coordinated
+```
+
+Some tests will also happily run stand alone so you can run a test directly (e.g. `jx bv_tests/testThaliCryptoManager.js`)
+thus allowing you to easily run and debug individual tests.
 
 ### Writing Unit Tests
 The Unit Tests are kept in Thali_CordovaPlugin/test/www/jxcore/bv_tests. So please put new tests there.

test/TestServer/TestFramework.js

@@ -93,14 +93,14 @@ TestFramework.prototype.addDevice = function(device) {
   } else if (this.devices[device.platform].length >= this.requiredDevices[device.platform]) {
     // Discard surplus devices..
     logger.info("Discarding surplus device: %s", device.deviceName);
+    this.removeDevice(device);
     device.socket.emit("discard");
   }
 }
 
-TestFramework.prototype.removeDevice = function(device) {
+TestFramework.prototype.removeDevice = function (device) {
   var i = this.devices[device.platform].indexOf(device);
   this.devices[device.platform].splice(i, 1);
-  assert(this.devices[device.platform].indexOf(device) == -1);
-}
+};
 
 module.exports = TestFramework;

test/TestServer/UnitTestFramework.js

@@ -22,7 +22,12 @@ function UnitTestFramework(testConfig, _logger)
   var unitTestConfig = require(configFile);
 
   UnitTestFramework.super_.call(this, testConfig, unitTestConfig, _logger);
-  this.runningTests = [];
+
+  // Track which platforms we expect to be running on
+  var self = this;
+  self.runningTests = Object.keys(self.requiredDevices).filter(function (platform) {
+    return self.requiredDevices[platform];
+  });
 }
 
 util.inherits(UnitTestFramework, TestFramework);
@@ -46,7 +51,7 @@ UnitTestFramework.prototype.startTests = function(platform, tests) {
   var self = this;
   function doTest(test, cb) {
 
-    logger.info("Running test: " + test);
+    logger.info("Running on %s test: %s", platform, test);
 
     // Perform a single test
 
@@ -89,8 +94,17 @@ UnitTestFramework.prototype.startTests = function(platform, tests) {
         }
       });
 
-      // Start setup for this test
-      device.socket.emit("setup", test);
+      if (typeof jxcore !== 'undefined' && jxcore.utils.OSInfo().isMobile) {
+        // The timeout is added as a workaround for an issue
+        // where the client hasn't necessarily had time
+        // to add correct listeners on the socket
+        setTimeout(function() {
+          // Start setup for this test
+          device.socket.emit("setup", test);
+        }, 1000);
+      } else {
+        device.socket.emit("setup", test);
+      }
     });
   }
 
@@ -106,7 +120,7 @@ UnitTestFramework.prototype.startTests = function(platform, tests) {
 
       // ALL DONE !!
       // All devices have completed all their tests
-      logger.info("Test run complete");
+      logger.info("Test run on %s complete", platform);
 
       // The whole point !! Log test results from the
       // server
@@ -117,7 +131,7 @@ UnitTestFramework.prototype.startTests = function(platform, tests) {
         device.socket.emit("complete");
       });
 
-      // We're done runnign for this platform..
+      // We're done running for this platform..
       self.runningTests = self.runningTests.filter(function(p) {
         return (p != platform);
       });
@@ -130,7 +144,6 @@ UnitTestFramework.prototype.startTests = function(platform, tests) {
   }
 
   toComplete = devices.length;
-  this.runningTests.push(platform);
 
   devices.forEach(function(device) {
     // Wait for devices to signal they've scheduled their

test/www/jxcore/PerfTest_app.js

@@ -37,30 +37,16 @@ function getDeviceCharacteristics(cb) {
           if (!myName || !bluetoothAddress) {
             console.log('An error while getting the device characteristics!');
           }
-          testUtils.setMyName(myName);
+          testUtils.setName(myName);
           cb(myName, bluetoothAddress);
-
-          // Below is only for logging purposes.
-          // Once we have had the BT off and we just turned it on,
-          // we need to wait untill the BLE support is reported rigth way
-          // seen with LG G4, Not seen with Motorola Nexus 6.
-          setTimeout(function () {
-            Mobile('IsBLESupported').callNative(function (err) {
-              if (err) {
-                console.log('BLE is not supported: ' + err );
-                return;
-              }
-              console.log("BLE is supported");
-            });
-          }, 5000);
         });
       });
     });
   } else {
     Mobile('GetDeviceName').callNative(function (deviceName) {
       // In case of iOS, the device name is used directly, because
       // the one returned in the one that user can set.
-      testUtils.setMyName(deviceName);
+      testUtils.setName(deviceName);
       cb(deviceName, null);
     });
   }

test/www/jxcore/UnitTest_app.js

@@ -8,11 +8,15 @@
 
 var testUtils = require("./lib/testUtils");
 
+if (typeof Mobile === 'undefined') {
+  global.Mobile = require('./lib/MobileUsingWifi.js');
+}
+
 testUtils.toggleRadios(true);
 
 Mobile('GetDeviceName').callNative(function (name) {
   console.log("My device name is: %s", name);
-  testUtils.setMyName(name);
+  testUtils.setName(name);
   require('./runTests.js');
   console.log('Test app app.js loaded');
 });

test/www/jxcore/bv_tests/testMultiplex.js

@@ -33,8 +33,9 @@ test('multiplex can send data', function (t) {
     socket.pipe(plex1).pipe(socket);
   });
 
-  server.listen(6001, function () {
-    var socket = net.createConnection({port: 6001}, function () {
+  server.listen(0, function () {
+    var serverPort = server.address().port;
+    var socket = net.createConnection({port: serverPort}, function () {
       var plex2 = multiplex();
       var stream = plex2.createStream();
       stream.write(new Buffer(testMessage));
@@ -48,12 +49,13 @@ test('muxServerBridge', function (t) {
   var len = 200;
   var testMessage = randomstring.generate(len);
 
-  var server = net.createServer(function (socket) {
+  var testServer = net.createServer(function (socket) {
     socket.pipe(socket);
   });
 
-  server.listen(6001, function () {
-    var muxServerBridge = tcpmultiplex.muxServerBridge(6001);
+  testServer.listen(0, function () {
+    var testServerPort = testServer.address().port;
+    var muxServerBridge = tcpmultiplex.muxServerBridge(testServerPort);
     muxServerBridge.listen(function () {
       var serverPort = muxServerBridge.address().port;
 

test/www/jxcore/bv_tests/testThaliCryptoManager.js

@@ -7,12 +7,12 @@ var path = require('path');
 var crypto = require('crypto');
 var tape = require('../lib/thali-tape');
 var cryptomanager = require('thali/thalicryptomanager');
-var os = require('os');
+var testUtils = require('../lib/testUtils.js');
 
 // get the values needed for running the tests
 var configValues = cryptomanager.getConfigValuesForTestingOnly();
 
-var fileLocation = path.join(os.tmpdir(), './pkcs12folder');
+var fileLocation = path.join(testUtils.tmpDirectory(), './pkcs12folder');
 
 // test setup & teardown activities
 var test = tape({