Bug 892765 - part 2 - rewrite captivedetect tests in terms of run_captivedetect_test; r=schien

toolkit/components/captivedetect/test/unit/head_setprefs.js

@@ -22,6 +22,8 @@ const kPrefsCanonicalContent = 'captivedetect.canonicalContent';
 const kPrefsMaxWaitingTime = 'captivedetect.maxWaitingTime';
 const kPrefsPollingTime = 'captivedetect.pollingTime';
 
+var gServer;
+
 function setupPrefs() {
   let prefs = Components.classes["@mozilla.org/preferences-service;1"]
                 .getService(Components.interfaces.nsIPrefService)
@@ -32,4 +34,15 @@ function setupPrefs() {
   prefs.setIntPref(kPrefsPollingTime, 1);
 }
 
-setupPrefs();
+function run_captivedetect_test(xhr_handler, fakeUIResponse, testfun)
+{
+  gServer = new HttpServer();
+  gServer.registerPathHandler(kCanonicalSitePath, xhr_handler);
+  gServer.start(4444);
+
+  setupPrefs();
+
+  fakeUIResponse();
+
+  testfun();
+}

toolkit/components/captivedetect/test/unit/test_abort.js

@@ -45,15 +45,9 @@ function test_abort() {
 
   gCaptivePortalDetector.checkCaptivePortal(kInterfaceName, callback);
   gCaptivePortalDetector.abort(kInterfaceName);
-  server.stop(do_test_finished);
+  gServer.stop(do_test_finished);
 }
 
 function run_test() {
-  server = new HttpServer();
-  server.registerPathHandler(kCanonicalSitePath, xhr_handler);
-  server.start(4444);
-
-  fakeUIResponse();
-
-  test_abort();
+  run_captivedetect_test(xhr_handler, fakeUIResponse, test_abort);
 }

toolkit/components/captivedetect/test/unit/test_abort_during_user_login.js

@@ -39,7 +39,7 @@ function fakeUIResponse() {
     if (topic === 'captive-portal-login-abort') {
       do_check_eq(++step, 3);
       do_check_eq(JSON.parse(data).id, requestId);
-      server.stop(do_test_finished);
+      gServer.stop(do_test_finished);
     }
   }, 'captive-portal-login-abort', false);
 }
@@ -62,11 +62,5 @@ function test_abort() {
 }
 
 function run_test() {
-  server = new HttpServer();
-  server.registerPathHandler(kCanonicalSitePath, xhr_handler);
-  server.start(4444);
-
-  fakeUIResponse();
-
-  test_abort();
+  run_captivedetect_test(xhr_handler, fakeUIResponse, test_abort);
 }

toolkit/components/captivedetect/test/unit/test_abort_ongoing_request.js

@@ -58,7 +58,7 @@ function test_multiple_requests_abort() {
     complete: function complete(success) {
       do_check_eq(++step, 4);
       do_check_true(success);
-      server.stop(do_test_finished);
+      gServer.stop(do_test_finished);
     }
   };
 
@@ -68,11 +68,5 @@ function test_multiple_requests_abort() {
 }
 
 function run_test() {
-  server = new HttpServer();
-  server.registerPathHandler(kCanonicalSitePath, xhr_handler);
-  server.start(4444);
-
-  fakeUIResponse();
-
-  test_multiple_requests_abort();
+  run_captivedetect_test(xhr_handler, fakeUIResponse, test_multiple_requests_abort);
 }

toolkit/components/captivedetect/test/unit/test_abort_pending_request.js

@@ -47,7 +47,7 @@ function test_abort() {
     complete: function complete(success) {
       do_check_eq(++step, 3);
       do_check_true(success);
-      server.stop(do_test_finished);
+      gServer.stop(do_test_finished);
     },
   };
 
@@ -67,11 +67,5 @@ function test_abort() {
 }
 
 function run_test() {
-  server = new HttpServer();
-  server.registerPathHandler(kCanonicalSitePath, xhr_handler);
-  server.start(4444);
-
-  fakeUIResponse();
-
-  test_abort();
+  run_captivedetect_test(xhr_handler, fakeUIResponse, test_abort);
 }

toolkit/components/captivedetect/test/unit/test_captive_portal_found.js

@@ -46,7 +46,7 @@ function test_portal_found() {
     complete: function complete(success) {
       do_check_eq(++step, 3);
       do_check_true(success);
-      server.stop(do_test_finished);
+      gServer.stop(do_test_finished);
     },
   };
 
@@ -54,11 +54,5 @@ function test_portal_found() {
 }
 
 function run_test() {
-  server = new HttpServer();
-  server.registerPathHandler(kCanonicalSitePath, xhr_handler);
-  server.start(4444);
-
-  fakeUIResponse();
-
-  test_portal_found();
+  run_captivedetect_test(xhr_handler, fakeUIResponse, test_portal_found);
 }

toolkit/components/captivedetect/test/unit/test_captive_portal_found_303.js

@@ -48,7 +48,7 @@ function test_portal_found() {
     complete: function complete(success) {
       do_check_eq(++step, 3);
       do_check_true(success);
-      server.stop(do_test_finished);
+      gServer.stop(do_test_finished);
     },
   };
 
@@ -56,6 +56,8 @@ function test_portal_found() {
 }
 
 function run_test() {
+  run_captivedetect_test(xhr_handler, fakeUIResponse, test_portal_found);
+
   server = new HttpServer();
   server.registerPathHandler(kCanonicalSitePath, xhr_handler);
   server.start(4444);

toolkit/components/captivedetect/test/unit/test_captive_portal_not_found.js

@@ -40,7 +40,7 @@ function test_portal_not_found() {
       do_check_eq(++step, 2);
       do_check_true(success);
       do_check_eq(attempt, 1);
-      server.stop(function(){dump('server stop\n'); do_test_finished(); });
+      gServer.stop(function(){dump('server stop\n'); do_test_finished(); });
     }
   };
 
@@ -48,11 +48,5 @@ function test_portal_not_found() {
 }
 
 function run_test() {
-  server = new HttpServer();
-  server.registerPathHandler(kCanonicalSitePath, xhr_handler);
-  server.start(4444);
-
-  fakeUIResponse();
-
-  test_portal_not_found();
+  run_captivedetect_test(xhr_handler, fakeUIResponse, test_portal_not_found);
 }

toolkit/components/captivedetect/test/unit/test_captive_portal_not_found_404.js

@@ -37,7 +37,7 @@ function test_portal_not_found() {
       do_check_eq(++step, 2);
       do_check_true(success);
       do_check_eq(attempt, 6);
-      server.stop(do_test_finished);
+      gServer.stop(do_test_finished);
     },
   };
 
@@ -45,11 +45,5 @@ function test_portal_not_found() {
 }
 
 function run_test() {
-  server = new HttpServer();
-  server.registerPathHandler(kCanonicalSitePath, xhr_handler);
-  server.start(4444);
-
-  fakeUIResponse();
-
-  test_portal_not_found();
+  run_captivedetect_test(xhr_handler, fakeUIResponse, test_portal_not_found);
 }

toolkit/components/captivedetect/test/unit/test_multiple_requests.js

@@ -59,7 +59,7 @@ function test_multiple_requests() {
     complete: function complete(success) {
       do_check_eq(++step, 5);
       do_check_true(success);
-      server.stop(do_test_finished);
+      gServer.stop(do_test_finished);
     }
   };
 
@@ -68,11 +68,5 @@ function test_multiple_requests() {
 }
 
 function run_test() {
-  server = new HttpServer();
-  server.registerPathHandler(kCanonicalSitePath, xhr_handler);
-  server.start(4444);
-
-  fakeUIResponse();
-
-  test_multiple_requests();
+  run_captivedetect_test(xhr_handler, fakeUIResponse, test_multiple_requests);
 }

toolkit/components/captivedetect/test/unit/test_user_cancel.js

@@ -42,7 +42,7 @@ function test_cancel() {
     complete: function complete(success) {
       do_check_eq(++step, 3);
       do_check_false(success);
-      server.stop(do_test_finished);
+      gServer.stop(do_test_finished);
     },
   };
 
@@ -50,11 +50,5 @@ function test_cancel() {
 }
 
 function run_test() {
-  server = new HttpServer();
-  server.registerPathHandler(kCanonicalSitePath, xhr_handler);
-  server.start(4444);
-
-  fakeUIResponse();
-
-  test_cancel();
+  run_captivedetect_test(xhr_handler, fakeUIResponse, test_cancel);
 }