Merge pull request #52 from electricimp/develop

v2.4.2

Author: Pavel Petroshenko

Diff for: lib/util/TestHelper.js

@@ -74,6 +74,13 @@ class TestHelper {
         this._devices = null;
         this._success = true;
 
+        this._testFailures = [];
+        this._testMethod = null;
+        this._testFile = null;
+        this._tests = 0;
+        this._assertions = 0;
+        this._failures = 0;
+
         TestDebugMixin.call(this);
         this._init(options);
 
@@ -141,19 +148,30 @@ class TestHelper {
                 return this._runTestOnDeviceGroup(testFile);
             }),
             Promise.resolve())).then(() => {
-            if (this._stopCommand) {
-                this._debug(UserInteractor.MESSAGES.TEST_STOP);
-            }
-            return Promise.resolve();
-        }).then(() => {
-            this._blank();
-
-            if (this._success) {
-                this._info(c.green(UserInteractor.MESSAGES.TEST_SUCCEEDED));
-            } else {
-                this._info(c.red(UserInteractor.ERRORS.TEST_FAILED));
-            }
-        });
+                if (this._stopCommand) {
+                    this._debug(UserInteractor.MESSAGES.TEST_STOP);
+                }
+                return Promise.resolve();
+            }).then(() => {
+                this._blank();
+                this._info(UserInteractor.MESSAGES.TEST_SUMMARY_HEADER);
+                this._blank();
+                this._testFailures.forEach((item, index) => {
+                    this._info(Util.format(UserInteractor.MESSAGES.TEST_SUMMARY_FAILURE, index + 1, item.test));
+                    this._info(Util.format(UserInteractor.MESSAGES.TEST_SUMMARY_AT, item.file));
+                    this._info(Util.format(UserInteractor.MESSAGES.TEST_SUMMARY_ERROR, item.result));
+                    this._blank();
+                });
+                this._info(Util.format(UserInteractor.MESSAGES.TEST_SESSION_RESULT, this._tests, this._assertions, this._failures));
+                this._info(UserInteractor.MESSAGES.TEST_SUMMARY_FOOTER);
+                this._blank();
+
+                if (this._success) {
+                    this._info(c.green(UserInteractor.MESSAGES.TEST_SUCCEEDED));
+                } else {
+                    this._info(c.red(UserInteractor.ERRORS.TEST_FAILED));
+                }
+            });
     }
 
     _runTestOnDeviceGroup(testFile) {
@@ -201,7 +219,7 @@ class TestHelper {
             if (testIsAgentOnly) {
                 this._info(UserInteractor.MESSAGES.TEST_AGENT_ONLY);
             }
-            this._info(Util.format(UserInteractor.MESSAGES.TEST_USE_DEVICE, 
+            this._info(Util.format(UserInteractor.MESSAGES.TEST_USE_DEVICE,
                 device.name ? device.name : '', device.id, deviceIndex, this._devices.length));
 
             // check online state
@@ -219,7 +237,7 @@ class TestHelper {
             // run test session
             return this._runSession(device, testFile.type, this._deviceGroup)
 
-            // error
+                // error
                 .catch((error) => {
                     this._onError(error);
                 })
@@ -315,7 +333,7 @@ class TestHelper {
         }
 
         for (const searchPattern of searchPatterns) {
-            for (const file of glob.sync(searchPattern, {cwd: configCwd})) {
+            for (const file of glob.sync(searchPattern, { cwd: configCwd })) {
                 // TODO: would it better to add the testFileName to the searchPatterns?
                 if (testFileName != null && testFileName.length > 0 && file.search(testFileName) < 0) {
                     this._debug(Util.format(UserInteractor.MESSAGES.TEST_SKIP_TEST, file));
@@ -340,6 +358,9 @@ class TestHelper {
     _getSessionCode(testFile) {
         let agentCode, deviceCode;
 
+        // save current test file name
+        this._testFile = testFile.name;
+            
         // [info]
         this._info(Util.format(UserInteractor.MESSAGES.TEST_USE_FILE, testFile.type, testFile.name));
 
@@ -560,6 +581,7 @@ ${'partnerpath' in testFile ? '@include "' + backslashToSlash(testFile.partnerpa
 
             this._session.on('message', (e) => {
                 if ('test' === e.type) {
+                    this._testMethod = e.message;
                     this._testLine(e.message);
                 } else if ('externalCommandOutput' === e.type) {
                     this._print(e.message);
@@ -594,6 +616,9 @@ ${'partnerpath' in testFile ? '@include "' + backslashToSlash(testFile.partnerpa
             this._session.on('done', () => {
                 this._sessionStartWatchdog.stop();
                 this._sessionTestMessagesWatchdog.stop();
+                this._tests += this._session.tests;
+                this._failures += this._session.failures;
+                this._assertions += this._session.assertions;
                 resolve();
             });
 
@@ -613,10 +638,9 @@ ${'partnerpath' in testFile ? '@include "' + backslashToSlash(testFile.partnerpa
         this._debug(Util.format(UserInteractor.MESSAGES.TEST_ERROR_TYPE, error.constructor.name));
 
         if (error instanceof TestSession.Errors.TestMethodError) {
-
             this._testLine(c.red(Util.format(UserInteractor.MESSAGES.TEST_FAILURE, error.message)));
+            this._testFailures.push({ file: this._testFile, test: this._testMethod, result: error.message });
             this._stopSession = this._testConfig.stopOnFail;
-
         } else if (error instanceof TestSession.Errors.TestStateError) {
 
             this._error(error);

Diff for: lib/util/UserInteractor.js

@@ -191,6 +191,11 @@ const MESSAGES = {
     TEST_WATCHDOG_STARTED : 'Watchdog "%s" started',
     TEST_WATCHDOG_STOPPED : 'Watchdog "%s" stopped',
     TEST_WATCHDOG_TIME_OUT : 'Watchdog "%s" timed out',
+    TEST_SUMMARY_HEADER : '-------------TEST SUMMARY-------------',
+    TEST_SUMMARY_FAILURE : '%d) %s',
+    TEST_SUMMARY_AT: 'at %s',
+    TEST_SUMMARY_ERROR : 'Error: %s',
+    TEST_SUMMARY_FOOTER : '--------------------------------------',
     PROJECT_DEVICE_FILE : 'Device file',
     PROJECT_AGENT_FILE : 'Agent file',
     PROJECT_DEVICE_SOURCE_FILE : 'Device source file',

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "imp-central-impt",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "impt - command line tool for the Electric Imp impCentral API",
   "main": "bin/impt",
   "engines": {