Bug 474763: Enable xpinstall test suite and fix switching on/offline.…

… r=bsmedberg
mozilla-spidermonkey · Feb 24, 2009 · 6051623 · 6051623
1 parent 416fe38
commit 6051623
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/xpinstall/Makefile.in b/xpinstall/Makefile.in
@@ -50,8 +50,8 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xpinstall
 DIRS		= public src
 
-#ifdef ENABLE_TESTS
-#DIRS += tests
-#endif
+ifdef ENABLE_TESTS
+DIRS += tests
+endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/xpinstall/tests/Makefile.in b/xpinstall/tests/Makefile.in
@@ -80,6 +80,8 @@ _BROWSER_FILES = harness.js \
                  browser_offline.js \
                  browser_chrome.js \
                  browser_cancel.js \
+                 browser_navigateaway.js \
+                 browser_navigateaway2.js \
                  unsigned.xpi \
                  signed.xpi \
                  signed2.xpi \

diff --git a/xpinstall/tests/browser_offline.js b/xpinstall/tests/browser_offline.js
@@ -23,15 +23,33 @@ function test() {
 }
 
 function download_progress(addon, value, maxValue) {
-  BrowserOffline.toggleOfflineStatus();
+  var prefs = Components.classes["@mozilla.org/preferences;1"]
+                        .getService(Components.interfaces.nsIPrefBranch);
+  var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+                            .getService(Components.interfaces.nsIIOService2);
+
+  try {
+    ioService.manageOfflineStatus = false;
+    prefs.setBoolPref("browser.offline", true);
+    ioService.offline = true;
+  } catch (ex) {
+  }
 }
 
 function check_xpi_install(addon, status) {
   is(status, -210, "Install should be cancelled");
 }
 
 function finish_test() {
-  BrowserOffline.toggleOfflineStatus();
+  var prefs = Components.classes["@mozilla.org/preferences;1"]
+                        .getService(Components.interfaces.nsIPrefBranch);
+  var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+                            .getService(Components.interfaces.nsIIOService2);
+  try {
+    prefs.setBoolPref("browser.offline", false);
+    ioService.offline = false;
+  } catch (ex) {
+  }
 
   var pm = Components.classes["@mozilla.org/permissionmanager;1"]
                      .getService(Components.interfaces.nsIPermissionManager);