Merge branch 'develop'

Author: Pavel Petroshenko

Diff for: src/ImpTestCase.nut

@@ -70,7 +70,8 @@ local ImpTestCase = class {
 
   /**
    * Assert that two values are equal
-   * @param {bool} condition
+   * @param {number|*} expected
+   * @param {number|*} actual
    * @param {string} message
    */
    function assertEqual(expected, actual, message = "Expected value: %s, got: %s") {
@@ -108,7 +109,9 @@ local ImpTestCase = class {
 
   /**
    * Assert that two values are within a certain range
-   * @param {bool} condition
+   * @param {number|*} expected
+   * @param {number|*} actual
+   * @param {number|*} maxDiff
    * @param {string} message
    */
   function assertClose(expected, actual, maxDiff, message = "Expected value: %s±%s, got: %s") {
@@ -144,8 +147,9 @@ local ImpTestCase = class {
           path += "." + k;
 
           if (!(k in value2)) {
-            throw format("%s slot [%s] in actual value",
-              isForwardPass ? "Missing" : "Extra", cleanPath(path));
+            throw format(message, cleanPath(path),
+              isForwardPass ? v + "" : "none",
+              isForwardPass ? "none" : v + "");
           }
 
           this._assertDeepEqual(value1[k], value2[k], message, isForwardPass, path, level + 1);
@@ -172,7 +176,7 @@ local ImpTestCase = class {
    * @param {*} actual
    * @param {string} message
    */
-  function assertDeepEqual(expected, actual, message = "At [%s]: expected \"%s\", got \"%s\"") {
+  function assertDeepEqual(expected, actual, message = "Comparison failed on '%s': expected %s, got %s") {
     this.assertions++;
     this._assertDeepEqual(expected, actual, message, true); // forward pass
     this._assertDeepEqual(actual, expected, message, false); // backwards pass

Diff for: src/ImpUnit.nut

@@ -27,6 +27,6 @@
 @include __PATH__+"/TestRunner.nut"
 
 class ImpUnit {
-  static VERSION = "1.2.1";
+  static VERSION = "1.2.2";
 }