From a6752b162a83c86f47161b1d1860258db8b13752 Mon Sep 17 00:00:00 2001 From: David Clarke Date: Thu, 7 Mar 2013 12:48:34 -0800 Subject: [PATCH] Bug 843893 - Fix alarm and power tests to work with current gaia, r=gene.lian --- .../test/test_alarm_non_permitted_app.html | 41 +++++++++++++------ dom/power/test/Makefile.in | 1 + dom/power/test/test_power_basics.html | 41 ++++--------------- .../test/test_power_non_permitted_app.html | 39 ++++++++++++++++++ 4 files changed, 76 insertions(+), 46 deletions(-) create mode 100644 dom/power/test/test_power_non_permitted_app.html diff --git a/dom/alarm/test/test_alarm_non_permitted_app.html b/dom/alarm/test/test_alarm_non_permitted_app.html index 1d6409e5f14..d7650db53ee 100644 --- a/dom/alarm/test/test_alarm_non_permitted_app.html +++ b/dom/alarm/test/test_alarm_non_permitted_app.html @@ -2,7 +2,6 @@ Test Non-Permitted Application for Alarm API - @@ -13,21 +12,37 @@ "use strict"; -SimpleTest.waitForExplicitFinish(); +function alarmtests() { + SimpleTest.waitForExplicitFinish(); -SpecialPowers.pushPrefEnv({"set": [["dom.mozAlarms.enabled", true]]}, function() { + SpecialPowers.pushPrefEnv({"set": [["dom.mozAlarms.enabled", true]]}, function() { + + // mozAlarms is intalled on all platforms except Android for the moment. + if (navigator.appVersion.indexOf("Android") != -1) { + ok(!('mozAlarms' in navigator), "navigator.mozAlarms should not exist"); + } else { + ok('mozAlarms' in navigator, "navigator.mozAlarms should exist"); + is(navigator.mozAlarms, null, "navigator.mozAlarms should return null"); + } + SpecialPowers.addPermission("alarms", true, document); + SimpleTest.finish(); + }); + +} + +if(!SpecialPowers.hasPermission("alarms", document)) { + var head = document.getElementsByTagName('head')[0]; + var js = document.createElement("script"); + js.type = "application/javascript"; + js.src = "/tests/SimpleTest/SimpleTest.js"; + js.onload = alarmtests; + head.appendChild(js); + +} else { SpecialPowers.removePermission("alarms", document); + window.location = window.location; +} - // mozAlarms is intalled on all platforms except Android for the moment. - if (navigator.appVersion.indexOf("Android") != -1) { - ok(!('mozAlarms' in navigator), "navigator.mozAlarms should not exist"); - } else { - ok('mozAlarms' in navigator, "navigator.mozAlarms should exist"); - is(navigator.mozAlarms, null, "navigator.mozAlarms should return null"); - } - - SimpleTest.finish(); -}); diff --git a/dom/power/test/Makefile.in b/dom/power/test/Makefile.in index 4cd16154092..665c876162d 100644 --- a/dom/power/test/Makefile.in +++ b/dom/power/test/Makefile.in @@ -13,6 +13,7 @@ include $(DEPTH)/config/autoconf.mk MOCHITEST_FILES = \ test_power_basics.html \ + test_power_non_permitted_app.html \ $(NULL) MOCHITEST_BROWSER_FILES = \ diff --git a/dom/power/test/test_power_basics.html b/dom/power/test/test_power_basics.html index 01edb0a8ed8..ca2bcc303da 100644 --- a/dom/power/test/test_power_basics.html +++ b/dom/power/test/test_power_basics.html @@ -4,6 +4,12 @@ Test for Power API + + +

+ +
 
-
-
-

-
-
-
 

 
 
diff --git a/dom/power/test/test_power_non_permitted_app.html b/dom/power/test/test_power_non_permitted_app.html
new file mode 100644
index 00000000000..9f4251df8e1
--- /dev/null
+++ b/dom/power/test/test_power_non_permitted_app.html
@@ -0,0 +1,39 @@
+
+
+
+  Test for Power API
+  
+
+
+

+
+
+
+

+
+