From 57e7d5db0c65396ba4abeffaf00db15a330cfcfa Mon Sep 17 00:00:00 2001
From: Alberto Crespell Perez <acperez@tid.es>
Date: Mon, 7 Jan 2013 15:26:42 -0800
Subject: [PATCH] Bug 814222 - NetworkStats tests. r=philikon

---
 dom/network/tests/Makefile.in                 |  3 ++
 .../tests/test_networkstats_basics.html       | 15 +++-----
 .../tests/test_networkstats_disabled.html     | 31 ++++++++++++++++
 .../test_networkstats_enabled_no_perm.html    | 35 +++++++++++++++++++
 .../tests/test_networkstats_enabled_perm.html | 34 ++++++++++++++++++
 5 files changed, 108 insertions(+), 10 deletions(-)
 create mode 100644 dom/network/tests/test_networkstats_disabled.html
 create mode 100644 dom/network/tests/test_networkstats_enabled_no_perm.html
 create mode 100644 dom/network/tests/test_networkstats_enabled_perm.html
diff --git a/dom/network/tests/Makefile.in b/dom/network/tests/Makefile.in
index 3583ac0bfebb..9107eb6051ce 100644
--- a/dom/network/tests/Makefile.in
+++ b/dom/network/tests/Makefile.in
@@ -24,6 +24,9 @@ MOCHITEST_FILES = \
 ifdef MOZ_B2G_RIL
 MOCHITEST_FILES = \
   test_networkstats_basics.html \
+  test_networkstats_disabled.html \
+  test_networkstats_enabled_no_perm.html \
+  test_networkstats_enabled_perm.html \
   $(NULL)
 endif
 
diff --git a/dom/network/tests/test_networkstats_basics.html b/dom/network/tests/test_networkstats_basics.html
index d4103f20f7ae..bac487c290a7 100644
--- a/dom/network/tests/test_networkstats_basics.html
+++ b/dom/network/tests/test_networkstats_basics.html
@@ -12,20 +12,13 @@
 <pre id="test">
 <script type="application/javascript">
 
-/** Test for NetworkStats **/
+// Test for NetworkStats
 function checkInterface(aInterface) {
   ok(!(aInterface in window), aInterface + " should be prefixed");
   ok(("Moz" + aInterface) in window, aInterface + " should be prefixed");
 }
 
 function test() {
-  var gNetworkStatsEnabled = SpecialPowers.getBoolPref("dom.mozNetworkStats.enabled");
-
-  if (!gNetworkStatsEnabled) {
-    is(navigator.mozNetworkStats, null, "mozNetworkStats is null when not enabled.");
-    SimpleTest.finish();
-  }
-
   // Test interfaces
   checkInterface("NetworkStatsManager");
   checkInterface("NetworkStats");
@@ -34,7 +27,6 @@ function test() {
   ok('mozNetworkStats' in navigator, "navigator.mozMozNetworkStats should exist");
   ok(navigator.mozNetworkStats, "navigator.mozNetworkStats returns an object");
 
-  SpecialPowers.addPermission("networkstats-manage", true, document);
   netStats = navigator.mozNetworkStats;
 
   // Test IDL attributes
@@ -279,6 +271,7 @@ var steps = [
   },
   function () {
     ok(true, "all done!\n");
+    SpecialPowers.removePermission("networkstats-manage", document);
     SimpleTest.finish();
     return;
   }
@@ -298,7 +291,9 @@ function next() {
 }
 
 SimpleTest.waitForExplicitFinish();
-addLoadEvent(test);
+
+SpecialPowers.addPermission("networkstats-manage", true, document);
+SpecialPowers.pushPrefEnv({'set': [["dom.mozNetworkStats.enabled", true]]}, test);
 
 </script>
 </pre>
diff --git a/dom/network/tests/test_networkstats_disabled.html b/dom/network/tests/test_networkstats_disabled.html
new file mode 100644
index 000000000000..6cd05c315d3c
--- /dev/null
+++ b/dom/network/tests/test_networkstats_disabled.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test to ensure NetworkStats is not accessible when it is disabled</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<p id="display"></p>
+<div id="content" style="display: none">
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+"use strict";
+
+SimpleTest.waitForExplicitFinish();
+
+// Test to ensure NetworkStats is not accessible when it is disabled
+SpecialPowers.pushPrefEnv({'set': [["dom.mozNetworkStats.enabled", false]]}, function(){
+
+  ok('mozNetworkStats' in navigator, "navigator.mozNetworkStats should exist");
+  is(navigator.mozNetworkStats, null, "mozNetworkStats should be null when not enabled.");
+
+  SimpleTest.finish();
+});
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/network/tests/test_networkstats_enabled_no_perm.html b/dom/network/tests/test_networkstats_enabled_no_perm.html
new file mode 100644
index 000000000000..dd911c506a24
--- /dev/null
+++ b/dom/network/tests/test_networkstats_enabled_no_perm.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test to ensure NetworkStats enabled and no networkstats-manage perm does not allow open</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<p id="display"></p>
+<div id="content" style="display: none">
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+// Test to ensure NetworkStats is enabled but mozNetworkStats.connectionTypes
+// does not work in content.
+
+SpecialPowers.setBoolPref("dom.mozNetworkStats.enabled", true);
+SpecialPowers.removePermission("networkstats-manage", document);
+
+ok('mozNetworkStats' in navigator, "navigator.mozNetworkStats should be accessible if dom.mozNetworkStats.enabled is true");
+
+var error;
+try {
+  navigator.mozNetworkStats.connectionTypes;
+  ok(false, "Accessing navigator.mozNetworkStats.connectionTypes should have thrown!");
+} catch (ex) {
+  error = ex;
+}
+ok(error, "Got an exception accessing navigator.mozNetworkStats.connectionTypes");
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/network/tests/test_networkstats_enabled_perm.html b/dom/network/tests/test_networkstats_enabled_perm.html
new file mode 100644
index 000000000000..7e24905d99bc
--- /dev/null
+++ b/dom/network/tests/test_networkstats_enabled_perm.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test to ensure NetworkStats is not accessible when it is disabled</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<p id="display"></p>
+<div id="content" style="display: none">
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+"use strict";
+
+SimpleTest.waitForExplicitFinish();
+
+// Test to ensure NetworkStats is not accessible when it is disabled
+SpecialPowers.addPermission("networkstats-manage", true, document);
+SpecialPowers.pushPrefEnv({'set': [["dom.mozNetworkStats.enabled", true]]}, function(){
+
+  ok('mozNetworkStats' in navigator, "navigator.mozNetworkStats should exist");
+  ok(navigator.mozNetworkStats instanceof SpecialPowers.Ci.nsIDOMMozNetworkStatsManager,
+      "navigator.mozNetworkStats should be a nsIDOMMozNetworkStatsManager object");
+
+  SpecialPowers.removePermission("networkstats-manage", document);
+  SimpleTest.finish();
+});
+
+</script>
+</pre>
+</body>
+</html>
