578301 - Clearly identify expected and actual results when tests fail

Status: RESOLVED FIXED

(Testing :: Mochitest, defect)

Description

[Dão Gottwald [:dao]]

"foo should equal bar" continues to confuse me...

Comment 1

[Dão Gottwald [:dao]]

Attachment: patch

Comment 2

[Dão Gottwald [:dao]]

Comment on attachment 457035 [details] [diff] [review]
patch

>diff --git a/testing/mochitest/tests/SimpleTest/SimpleTest.js b/testing/mochitest/tests/SimpleTest/SimpleTest.js
>--- a/testing/mochitest/tests/SimpleTest/SimpleTest.js
>+++ b/testing/mochitest/tests/SimpleTest/SimpleTest.js
>@@ -50,22 +50,28 @@ SimpleTest.ok = function (condition, nam
>     SimpleTest._tests.push(test);
> };
> 
> /**
>  * Roughly equivalent to ok(a==b, name)
> **/
> SimpleTest.is = function (a, b, name) {
>     var repr = MochiKit.Base.repr;
>-    SimpleTest.ok(a == b, name, repr(a) + " should equal " + repr(b));
>+    var pass = (a == b);
>+    var diag = pass ? repr(a) + " should equal " + repr(b)
>+                    : "got " + repr(a) + ", expected " + repr(b)
>+    SimpleTest.ok(pass, name, diag);
> };
> 
> SimpleTest.isnot = function (a, b, name) {
>     var repr = MochiKit.Base.repr;
>-    SimpleTest.ok(a != b, name, repr(a) + " should not equal " + repr(b));
>+    var pass = (a != b);
>+    var diag = pass ? repr(a) + " should not equal " + repr(b)
>+                    : "didn't expect " + repr(a) + ", but got it";
>+    SimpleTest.ok(pass, name, diag);
> };
> 
> //  --------------- Test.Builder/Test.More todo() -----------------
> 
> SimpleTest.todo = function(condition, name, diag) {
>   var test = {'result': !!condition, 'name': name, 'diag': diag, todo: true};
>   if (SimpleTest._logEnabled)
>       SimpleTest._logResult(test, "TEST-UNEXPECTED-PASS", "TEST-KNOWN-FAIL");
>@@ -94,22 +100,28 @@ SimpleTest._logResult = function(test, p
> };
> 
> /**
>  * Copies of is and isnot with the call to ok replaced by a call to todo.
> **/
> 
> SimpleTest.todo_is = function (a, b, name) {
>     var repr = MochiKit.Base.repr;
>-    SimpleTest.todo(a == b, name, repr(a) + " should equal " + repr(b));
>+    var pass = (a == b);
>+    var diag = pass ? repr(a) + " should equal " + repr(b)
>+                    : "got " + repr(a) + ", expected " + repr(b);
>+    SimpleTest.todo(pass, name, diag);
> };
> 
> SimpleTest.todo_isnot = function (a, b, name) {
>     var repr = MochiKit.Base.repr;
>-    SimpleTest.todo(a != b, name, repr(a) + " should not equal " + repr(b));
>+    var pass = (a != b);
>+    var diag = pass ? repr(a) + " should not equal " + repr(b)
>+                    : "didn't expect " + repr(a) + ", but got it";
>+    SimpleTest.todo(pass, name, diag);
> };
> 
> 
> /**
>  * Makes a test report, returns it as a DIV element.
> **/
> SimpleTest.report = function () {
>     var DIV = MochiKit.DOM.DIV;

Comment 3

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Comment on attachment 457035 [details] [diff] [review]
patch

r=dbaron (a little reluctantly, though)

Comment 4

[Dão Gottwald [:dao]]

http://hg.mozilla.org/mozilla-central/rev/23fa36d6133a