From fb7e710309ce7c81f6df7cd159bf594023eac249 Mon Sep 17 00:00:00 2001 From: "L. David Baron" Date: Wed, 27 Feb 2013 13:20:28 -0800 Subject: [PATCH] Bug 404077: Enable checking of assertions in mochitests. --- testing/mochitest/tests/SimpleTest/TestRunner.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/testing/mochitest/tests/SimpleTest/TestRunner.js b/testing/mochitest/tests/SimpleTest/TestRunner.js index a624aceaa8dd..dea0d3a7fa24 100644 --- a/testing/mochitest/tests/SimpleTest/TestRunner.js +++ b/testing/mochitest/tests/SimpleTest/TestRunner.js @@ -425,6 +425,7 @@ TestRunner.testFinished = function(tests) { TestRunner.error("TEST-UNEXPECTED-FAIL | " + TestRunner.currentTestURL + " | called finish() multiple times"); + TestRunner.updateUI([{ result: false }]); return; } TestRunner._lastTestFinished = TestRunner._currentTest; @@ -494,13 +495,11 @@ TestRunner.testUnloaded = function() { var max = TestRunner._expectedMaxAsserts; var min = TestRunner._expectedMinAsserts; if (numAsserts > max) { - // WHEN ENABLING, change "log" to "error" and "DETCEPXENU" - // to "UNEXPECTED". - TestRunner.log("TEST-DETCEPXENU-FAIL | " + url + " | Assertion count " + numAsserts + " is greater than expected range " + min + "-" + max + " assertions."); + TestRunner.error("TEST-UNEXPECTED-FAIL | " + url + " | Assertion count " + numAsserts + " is greater than expected range " + min + "-" + max + " assertions."); + TestRunner.updateUI([{ result: false }]); } else if (numAsserts < min) { - // WHEN ENABLING, change "log" to "error" and "DETCEPXENU" - // to "UNEXPECTED". - TestRunner.log("TEST-DETCEPXENU-PASS | " + url + " | Assertion count " + numAsserts + " is less than expected range " + min + "-" + max + " assertions."); + TestRunner.error("TEST-UNEXPECTED-PASS | " + url + " | Assertion count " + numAsserts + " is less than expected range " + min + "-" + max + " assertions."); + TestRunner.updateUI([{ result: false }]); } else if (numAsserts > 0) { TestRunner.log("TEST-KNOWN-FAIL | " + url + " | Assertion count " + numAsserts + " within expected range " + min + "-" + max + " assertions."); }