Bug 1052937 - Default value for missing subtest in mochitest structur…

…ed logs. r=ahal
Brli · Aug 19, 2014 · 9ea1148 · 9ea1148
1 parent 3327c64
commit 9ea1148
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/testing/mochitest/tests/SimpleTest/SimpleTest.js b/testing/mochitest/tests/SimpleTest/SimpleTest.js
@@ -243,9 +243,6 @@ SimpleTest._cleanupFunctions = [];
  * Something like assert.
 **/
 SimpleTest.ok = function (condition, name, diag) {
-    if (name === null || name === undefined) {
-        name = "undefined assertion name";
-    }
     var test = {'result': !!condition, 'name': name, 'diag': diag};
     var successInfo = {status:"PASS", expected:"PASS", message:"TEST-PASS"};
     var failureInfo = {status:"FAIL", expected:"PASS", message:"TEST-UNEXPECTED-FAIL"};

diff --git a/testing/mochitest/tests/SimpleTest/TestRunner.js b/testing/mochitest/tests/SimpleTest/TestRunner.js
@@ -139,6 +139,11 @@ function StructuredLogger(name) {
     };
 
     this.testStatus = function(test, subtest, status, expected="PASS", message=null) {
+        // Bugfix for assertions not passing an assertion name
+        if (subtest === null || subtest === undefined) {
+            subtest = "undefined assertion name";
+        }
+
         var data = {test: test, subtest: subtest, status: status};
 
         if (message) {