Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Pavel Petroshenko committed Jan 2, 2019
2 parents 8b9fd0e + 3657c65 commit 3340dde
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
14 changes: 9 additions & 5 deletions src/ImpTestCase.nut
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down Expand Up @@ -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") {
Expand Down Expand Up @@ -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);
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/ImpUnit.nut
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
@include __PATH__+"/TestRunner.nut"

class ImpUnit {
static VERSION = "1.2.1";
static VERSION = "1.2.2";
}

0 comments on commit 3340dde

Please sign in to comment.