Bug 1449255: Part 21 - Remove test_bug569138.js, which is covered by other tests. r?aswan draft
authorKris Maglione <maglione.k@gmail.com>
Tue, 27 Mar 2018 16:34:48 -0700
changeset 773490 6bc320dce58e032ab3b8e44a8767e3fc6e054d5c
parent 773489 3293e5badce0f4b7df5ff8c29ac90423dc860513
child 773491 88ee0ab7d6d8db3954a5c42b5ff0839e7ff258b0
push id104243
push usermaglione.k@gmail.com
push dateWed, 28 Mar 2018 00:15:32 +0000
reviewersaswan
bugs1449255, 569138
milestone61.0a1
Bug 1449255: Part 21 - Remove test_bug569138.js, which is covered by other tests. r?aswan MozReview-Commit-ID: JP8siEbMwS7
toolkit/mozapps/extensions/test/xpcshell/test_bug569138.js
toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug569138.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// This verifies that add-ons with invalid target application entries show
-// up in the API but are correctly appDisabled
-
-// A working add-on
-var addon1 = {
-  id: "addon1@tests.mozilla.org",
-  version: "1.0",
-  name: "Test 1",
-  bootstrap: true,
-  targetApplications: [{
-    id: "xpcshell@tests.mozilla.org",
-    minVersion: "1",
-    maxVersion: "1"
-  }]
-};
-
-// Missing id
-var addon2 = {
-  id: "addon2@tests.mozilla.org",
-  version: "1.0",
-  name: "Test 2",
-  bootstrap: true,
-  targetApplications: [{
-    minVersion: "1",
-    maxVersion: "2"
-  }]
-};
-
-// Missing minVersion
-var addon3 = {
-  id: "addon3@tests.mozilla.org",
-  version: "1.0",
-  name: "Test 3",
-  bootstrap: true,
-  targetApplications: [{
-    id: "xpcshell@tests.mozilla.org",
-    maxVersion: "1"
-  }]
-};
-
-// Missing maxVersion
-var addon4 = {
-  id: "addon4@tests.mozilla.org",
-  version: "1.0",
-  name: "Test 4",
-  bootstrap: true,
-  targetApplications: [{
-    id: "xpcshell@tests.mozilla.org",
-    minVersion: "1"
-  }]
-};
-
-// Blank id
-var addon5 = {
-  id: "addon5@tests.mozilla.org",
-  version: "1.0",
-  name: "Test 5",
-  bootstrap: true,
-  targetApplications: [{
-    id: "",
-    minVersion: "1",
-    maxVersion: "2"
-  }]
-};
-
-// Blank minVersion
-var addon6 = {
-  id: "addon6@tests.mozilla.org",
-  version: "1.0",
-  name: "Test 6",
-  bootstrap: true,
-  targetApplications: [{
-    id: "xpcshell@tests.mozilla.org",
-    minVersion: "",
-    maxVersion: "1"
-  }]
-};
-
-// Blank maxVersion
-var addon7 = {
-  id: "addon7@tests.mozilla.org",
-  version: "1.0",
-  name: "Test 7",
-  bootstrap: true,
-  targetApplications: [{
-    id: "xpcshell@tests.mozilla.org",
-    minVersion: "1",
-    maxVersion: ""
-  }]
-};
-
-createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-
-const profileDir = gProfD.clone();
-profileDir.append("extensions");
-
-// Set up the profile
-function run_test() {
-  do_test_pending();
-
-  writeInstallRDFForExtension(addon1, profileDir);
-  writeInstallRDFForExtension(addon2, profileDir);
-  writeInstallRDFForExtension(addon3, profileDir);
-  writeInstallRDFForExtension(addon4, profileDir);
-  writeInstallRDFForExtension(addon5, profileDir);
-  writeInstallRDFForExtension(addon6, profileDir);
-  writeInstallRDFForExtension(addon7, profileDir);
-
-  startupManager();
-
-  AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                               "addon2@tests.mozilla.org",
-                               "addon3@tests.mozilla.org",
-                               "addon4@tests.mozilla.org",
-                               "addon5@tests.mozilla.org",
-                               "addon6@tests.mozilla.org",
-                               "addon7@tests.mozilla.org"],
-                               function([a1, a2, a3, a4, a5, a6, a7]) {
-    Assert.notEqual(a1, null);
-    Assert.ok(!a1.appDisabled);
-    Assert.ok(a1.isActive);
-
-    Assert.notEqual(a2, null);
-    Assert.ok(a2.appDisabled);
-    Assert.ok(!a2.isActive);
-
-    Assert.notEqual(a3, null);
-    Assert.ok(a3.appDisabled);
-    Assert.ok(!a3.isActive);
-
-    Assert.notEqual(a4, null);
-    Assert.ok(a4.appDisabled);
-    Assert.ok(!a4.isActive);
-
-    Assert.notEqual(a5, null);
-    Assert.ok(a5.appDisabled);
-    Assert.ok(!a5.isActive);
-
-    Assert.notEqual(a6, null);
-    Assert.ok(a6.appDisabled);
-    Assert.ok(!a6.isActive);
-
-    Assert.notEqual(a6, null);
-    Assert.ok(a6.appDisabled);
-    Assert.ok(!a6.isActive);
-
-    executeSoon(do_test_finished);
-
-  });
-}
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -75,17 +75,16 @@ skip-if = true # Bug 1358846 Bug 1365021
 [test_bug1180901_2.js]
 skip-if = os != "win"
 [test_bug514327_2.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
 tags = blocklist
 [test_bug521905.js]
 [test_bug566626.js]
-[test_bug569138.js]
 [test_bug570173.js]
 [test_bug587088.js]
 skip-if = os == "win" # Bug 1358846
 [test_bug595081.js]
 [test_bug596607.js]
 [test_cache_certdb.js]
 run-if = addon_signing
 [test_cacheflush.js]