Bug 1421992 - Remove obsolete do_check_* implementations, r=Gijs.

testing/xpcshell/head.js

@@ -817,24 +817,6 @@ function do_note_exception(ex, text) {
                    });
 }
 
-function _do_check_neq(left, right, stack, todo) {
-  Assert.notEqual(left, right);
-}
-
-function do_check_neq(left, right, stack) {
-  if (!stack)
-    stack = Components.stack.caller;
-
-  _do_check_neq(left, right, stack, false);
-}
-
-function todo_check_neq(left, right, stack) {
-  if (!stack)
-      stack = Components.stack.caller;
-
-  _do_check_neq(left, right, stack, true);
-}
-
 function do_report_result(passed, text, stack, todo) {
   while (stack.filename.includes("head.js") && stack.caller) {
     stack = stack.caller;
@@ -890,10 +872,6 @@ function _do_check_eq(left, right, stack, todo) {
   do_report_result(left == right, text, stack, todo);
 }
 
-function do_check_eq(left, right, stack) {
-  Assert.equal(left, right);
-}
-
 function todo_check_eq(left, right, stack) {
   if (!stack)
       stack = Components.stack.caller;
@@ -901,10 +879,6 @@ function todo_check_eq(left, right, stack) {
   _do_check_eq(left, right, stack, true);
 }
 
-function do_check_true(condition, stack) {
-  Assert.ok(condition, stack);
-}
-
 function todo_check_true(condition, stack) {
   if (!stack)
     stack = Components.stack.caller;
@@ -912,10 +886,6 @@ function todo_check_true(condition, stack) {
   todo_check_eq(condition, true, stack);
 }
 
-function do_check_false(condition, stack) {
-  Assert.ok(!condition, stack);
-}
-
 function todo_check_false(condition, stack) {
   if (!stack)
     stack = Components.stack.caller;
@@ -923,16 +893,9 @@ function todo_check_false(condition, stack) {
   todo_check_eq(condition, false, stack);
 }
 
-function do_check_null(condition, stack) {
-  Assert.equal(condition, null);
-}
-
 function todo_check_null(condition, stack = Components.stack.caller) {
   todo_check_eq(condition, null, stack);
 }
-function do_check_matches(pattern, value) {
-  Assert.deepEqual(pattern, value);
-}
 
 // Check that |func| throws an nsIException that has
 // |Components.results[resultName]| as the value of its 'result' property.

testing/xpcshell/selftest.py

@@ -40,13 +40,13 @@ else:
 TEST_PASS_STRING = "TEST-PASS"
 TEST_FAIL_STRING = "TEST-UNEXPECTED-FAIL"
 
-SIMPLE_PASSING_TEST = "function run_test() { do_check_true(true); }"
-SIMPLE_FAILING_TEST = "function run_test() { do_check_true(false); }"
+SIMPLE_PASSING_TEST = "function run_test() { Assert.ok(true); }"
+SIMPLE_FAILING_TEST = "function run_test() { Assert.ok(false); }"
 
 SIMPLE_UNCAUGHT_REJECTION_TEST = '''
 function run_test() {
   Promise.reject(new Error("Test rejection."));
-  do_check_true(true);
+  Assert.ok(true);
 }
 '''
 
@@ -56,7 +56,7 @@ Components.utils.import("resource://gre/modules/Promise.jsm");
 Promise.reject(new Error("Test rejection."));
 
 function run_test() {
-  do_check_true(true);
+  Assert.ok(true);
 }
 '''
 
@@ -64,7 +64,7 @@ ADD_TEST_SIMPLE = '''
 function run_test() { run_next_test(); }
 
 add_test(function test_simple() {
-  do_check_true(true);
+  Assert.ok(true);
   run_next_test();
 });
 '''
@@ -73,7 +73,7 @@ ADD_TEST_FAILING = '''
 function run_test() { run_next_test(); }
 
 add_test(function test_failing() {
-  do_check_true(false);
+  Assert.ok(false);
   run_next_test();
 });
 '''
@@ -152,7 +152,7 @@ PASSING_TEST_UNICODE = '''
 function run_test () { run_next_test(); }
 
 add_test(function test_unicode_print () {
-  do_check_eq("\u201c\u201d", "\u201c\u201d");
+  Assert.equal("\u201c\u201d", "\u201c\u201d");
   run_next_test();
 });
 '''
@@ -200,7 +200,7 @@ function run_test() { run_next_test(); }
 add_task(function* test() {
   let result = yield Promise.resolve(false);
 
-  do_check_true(result);
+  Assert.ok(result);
 });
 '''
 
@@ -334,7 +334,7 @@ function run_test() {
 
   // Cleanup tasks, in reverse order
   do_register_cleanup(function cleanup_checkout() {
-    do_check_eq(checkpoints.join(""), "123456");
+    Assert.equal(checkpoints.join(""), "123456");
     do_print("At this stage, the test has succeeded");
     do_throw("Throwing an error to force displaying the log");
   });
@@ -379,7 +379,7 @@ function run_test() {
 # A test to check that add_test() tests run without run_test()
 NO_RUN_TEST_ADD_TEST = '''
 add_test(function no_run_test_add_test() {
-  do_check_true(true);
+  Assert.ok(true);
   run_next_test();
 });
 '''
@@ -387,19 +387,19 @@ add_test(function no_run_test_add_test() {
 # A test to check that add_task() tests run without run_test()
 NO_RUN_TEST_ADD_TASK = '''
 add_task(function no_run_test_add_task() {
-  do_check_true(true);
+  Assert.ok(true);
 });
 '''
 
 # A test to check that both add_task() and add_test() work without run_test()
 NO_RUN_TEST_ADD_TEST_ADD_TASK = '''
 add_test(function no_run_test_add_test() {
-  do_check_true(true);
+  Assert.ok(true);
   run_next_test();
 });
 
 add_task(function no_run_test_add_task() {
-  do_check_true(true);
+  Assert.ok(true);
 });
 '''
 
@@ -411,14 +411,14 @@ NO_RUN_TEST_EMPTY_TEST = '''
 
 NO_RUN_TEST_ADD_TEST_FAIL = '''
 add_test(function no_run_test_add_test_fail() {
-  do_check_true(false);
+  Assert.ok(false);
   run_next_test();
 });
 '''
 
 NO_RUN_TEST_ADD_TASK_FAIL = '''
 add_task(function no_run_test_add_task_fail() {
-  do_check_true(false);
+  Assert.ok(false);
 });
 '''
 
@@ -436,8 +436,8 @@ add_task(function* test_2() {
 
 LOAD_MOZINFO = '''
 function run_test() {
-  do_check_neq(typeof mozinfo, undefined);
-  do_check_neq(typeof mozinfo.os, undefined);
+  Assert.notEqual(typeof mozinfo, undefined);
+  Assert.notEqual(typeof mozinfo.os, undefined);
 }
 '''
 
@@ -685,7 +685,7 @@ tail =
 add_test({
   skip_if: () => true,
 }, function test_should_be_skipped() {
-  do_check_true(false);
+  Assert.ok(false);
   run_next_test();
 });
 """)
@@ -707,7 +707,7 @@ add_test({
 add_task({
   skip_if: () => false,
 }, function test_should_not_be_skipped() {
-  do_check_true(true);
+  Assert.ok(true);
 });
 """)
         self.writeManifest(["test_not_skip.js"])
@@ -728,7 +728,7 @@ add_task({
 add_task({
   skip_if: () => true,
 }, function test_should_be_skipped() {
-  do_check_true(false);
+  Assert.ok(false);
 });
 """)
         self.writeManifest(["test_skip.js"])
@@ -749,7 +749,7 @@ add_task({
 add_test({
   skip_if: () => false,
 }, function test_should_not_be_skipped() {
-  do_check_true(true);
+  Assert.ok(true);
   run_next_test();
 });
 """)
@@ -943,7 +943,7 @@ add_test({
 
         self.assertTestResult(True, verbose=True)
         self.assertInLog("true == true")
-        self.assertNotInLog("[do_check_true :")
+        self.assertNotInLog("[Assert.ok :")
         self.assertInLog("[test_simple : 5]")
 
     def testAddTestFailing(self):

tools/lint/eslint/eslint-plugin-mozilla/lib/configs/xpcshell-test.js

@@ -11,13 +11,7 @@ module.exports = {
     "add_test": false,
     "deepEqual": false,
     "do_await_remote_message": false,
-    "do_check_eq": false,
-    "do_check_false": false,
     "do_check_instanceof": false,
-    "do_check_matches": false,
-    "do_check_neq": false,
-    "do_check_null": false,
-    "do_check_true": false,
     "do_execute_soon": false,
     "do_get_cwd": false,
     "do_get_file": false,