Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/apps. r?RyanVM draft
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 05 Nov 2016 11:29:14 +0100
changeset 434248 61052115896bc181204c7bed3f6da480b4121a74
parent 434247 de123c27438cdd96d22d9689727ab93add2b8b82
child 434249 11770ee6e4ad2c617d3512cf9e13f3c98de3023f
push id34753
push userarchaeopteryx@coole-files.de
push dateSat, 05 Nov 2016 10:33:00 +0000
reviewersRyanVM
bugs1310297
milestone52.0a1
Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/apps. r?RyanVM MozReview-Commit-ID: 8zWsVJzL3tK
dom/apps/moz.build
dom/apps/tests/chrome.ini
dom/apps/tests/test_apps_service.xul
dom/apps/tests/test_manifest_helper.xul
--- a/dom/apps/moz.build
+++ b/dom/apps/moz.build
@@ -1,20 +1,16 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
-MOCHITEST_CHROME_MANIFESTS += [
-    'tests/chrome.ini'
-]
-
 EXTRA_COMPONENTS += [
     'AppsService.js',
     'AppsService.manifest',
 ]
 
 EXTRA_JS_MODULES += [
     'AppsServiceChild.jsm',
     'PermissionsInstaller.jsm',
deleted file mode 100644
--- a/dom/apps/tests/chrome.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-skip-if = buildapp != 'mulet'
-
-[test_apps_service.xul]
-[test_manifest_helper.xul]
deleted file mode 100644
--- a/dom/apps/tests/test_apps_service.xul
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
-<?xml-stylesheet type="text/css" href="/tests/SimpleTest/test.css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=754141
--->
-<window title="Mozilla Bug 754141"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-
-  <!-- test results are displayed in the html:body -->
-  <body xmlns="http://www.w3.org/1999/xhtml">
-  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=754141"
-     target="_blank">Mozilla Bug 754141</a>
-  </body>
-
-  <!-- test code goes here -->
-  <script type="application/javascript">
-  <![CDATA[
-
-  /** Test for Bug 754141 **/
-
-  var appsService = Components.classes['@mozilla.org/AppsService;1']
-                              .getService(Components.interfaces.nsIAppsService);
-  SimpleTest.ok(appsService, "Should be able to get the Apps Service");
-
-  SimpleTest.ok('getAppByManifestURL' in appsService,
-                "getAppByManifestURL() should be a method in nsIAppsService");
-
-  SimpleTest.is(appsService.getAppByManifestURL(''), null,
-                "getAppByManifestURL() should return null for an empty string manifest url");
-
-  ]]>
-  </script>
-</window>
deleted file mode 100644
--- a/dom/apps/tests/test_manifest_helper.xul
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
-<?xml-stylesheet type="text/css" href="/tests/SimpleTest/test.css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1042881
--->
-<window title="Mozilla Bug 1042881"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-
-  <!-- test results are displayed in the html:body -->
-  <body xmlns="http://www.w3.org/1999/xhtml">
-  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1042881"
-     target="_blank">Mozilla Bug 1042881</a>
-  </body>
-
-  <!-- test code goes here -->
-  <script type="application/javascript">
-  <![CDATA[
-
-  /** Test for Bug 1042881 **/
-
-  Components.utils.import("resource://gre/modules/AppsUtils.jsm");
-
-  // Test that we get the right launch path from manifests similar to
-  // twitter's one.
-  var manifest = {
-    "version":"1.0",
-    "name":"Twitter",
-    "installs_allowed_from":["*"],
-    "developer":{
-      "name":"Twitter",
-      "url":"http://twitter.com"
-    },
-    "icons":{
-      "30":"/images/larrybird-30.png",
-      "60":"/images/larrybird-60.png",
-      "128":"/images/larrybird-128.png"
-    }
-  }
-
-  var helper = new ManifestHelper(manifest, "https://mobile.twitter.com",
-                                  "https://mobile.twitter.com/cache/twitter.webapp");
-
-  SimpleTest.is(helper.fullLaunchPath(), "https://mobile.twitter.com/");
-  SimpleTest.is(helper.iconURLForSize(60),
-                "https://mobile.twitter.com/images/larrybird-60.png");
-
-  ]]>
-  </script>
-</window>