Issue 6669 - Remove unused ElemHide.NO_UNCONDITIONAL constant

test/elemHide.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 25 matching lines @@
 function normalizeSelectors(selectors)
 {
   // getSelectorsForDomain is currently allowed to return duplicate selectors
   // for performance reasons, so we need to remove duplicates here.
   return selectors.sort().filter((selector, index, sortedSelectors) =>
   {
     return index == 0 || selector != sortedSelectors[index - 1];
   });
 }
 
-function testResult(test, domain, expectedSelectors, criteria)
+function testResult(test, domain, expectedSelectors, specificOnly)
 {
   let normalizedExpectedSelectors = normalizeSelectors(expectedSelectors);
 
   test.deepEqual(
-    normalizeSelectors(ElemHide.getSelectorsForDomain(domain, criteria)),
+    normalizeSelectors(ElemHide.getSelectorsForDomain(domain, specificOnly)),
     normalizedExpectedSelectors
   );
 }
 
 exports.testGetSelectorsForDomain = function(test)
 {
   let addFilter = filterText => ElemHide.add(Filter.fromText(filterText));
   let removeFilter = filterText => ElemHide.remove(Filter.fromText(filterText));
 
   testResult(test, "", []);
@@ skipping 40 matching lines @@
   testResult(test, "foo.example.com", ["turnip", "bar"]);
   testResult(test, "example.com", ["foo", "bar"]);
   testResult(test, "com", ["bar"]);
   testResult(test, "", []);
 
   addFilter("##generic");
   testResult(test, "foo.example.com", ["turnip", "bar", "generic"]);
   testResult(test, "example.com", ["foo", "bar", "generic"]);
   testResult(test, "com", ["bar", "generic"]);
   testResult(test, "", ["generic"]);
-  testResult(test, "foo.example.com", ["turnip", "bar"], ElemHide.SPECIFIC_ONLY);
-  testResult(test, "example.com", ["foo", "bar"], ElemHide.SPECIFIC_ONLY);
-  testResult(test, "com", ["bar"], ElemHide.SPECIFIC_ONLY);
-  testResult(test, "", [], ElemHide.SPECIFIC_ONLY);
+  testResult(test, "foo.example.com", ["turnip", "bar"], true);
+  testResult(test, "example.com", ["foo", "bar"], true);
+  testResult(test, "com", ["bar"], true);
+  testResult(test, "", [], true);
   removeFilter("##generic");
 
   addFilter("~adblockplus.org##example");
   testResult(test, "adblockplus.org", []);
   testResult(test, "", ["example"]);
   testResult(test, "foo.example.com", ["turnip", "bar", "example"]);
-  testResult(test, "foo.example.com", ["turnip", "bar"], ElemHide.SPECIFIC_ONLY);
+  testResult(test, "foo.example.com", ["turnip", "bar"], true);
   removeFilter("~adblockplus.org##example");
 
   removeFilter("~foo.example.com,example.com##foo");
   testResult(test, "foo.example.com", ["turnip", "bar"]);
   testResult(test, "example.com", ["bar"]);
   testResult(test, "com", ["bar"]);
   testResult(test, "", []);
 
   removeFilter("com##bar");
   testResult(test, "foo.example.com", ["turnip"]);
@@ skipping 36 matching lines @@
   testResult(test, "com", ["foo"]);
   testResult(test, "", ["foo"]);
   removeFilter("~example.com##foo");
 
   removeFilter("~foo.example.com,example.com##foo");
 
   // Test criteria
   addFilter("##hello");
   addFilter("~example.com##world");
   addFilter("foo.com##specific");
-  testResult(test, "foo.com", ["specific"], ElemHide.SPECIFIC_ONLY);
-  testResult(test, "foo.com", ["specific", "world"], ElemHide.NO_UNCONDITIONAL);
-  testResult(test, "foo.com", ["hello", "specific", "world"], ElemHide.ALL_MATCHING);
+  testResult(test, "foo.com", ["specific"], true);
+  testResult(test, "foo.com", ["hello", "specific", "world"], false);
   testResult(test, "foo.com", ["hello", "specific", "world"]);
   removeFilter("foo.com##specific");
   removeFilter("~example.com##world");
   removeFilter("##hello");
   testResult(test, "foo.com", []);
 
   addFilter("##hello");
-  testResult(test, "foo.com", [], ElemHide.SPECIFIC_ONLY);
-  testResult(test, "foo.com", [], ElemHide.NO_UNCONDITIONAL);
-  testResult(test, "foo.com", ["hello"], ElemHide.ALL_MATCHING);
+  testResult(test, "foo.com", [], true);
+  testResult(test, "foo.com", ["hello"], false);
   testResult(test, "foo.com", ["hello"]);
-  testResult(test, "bar.com", [], ElemHide.SPECIFIC_ONLY);
-  testResult(test, "bar.com", [], ElemHide.NO_UNCONDITIONAL);
-  testResult(test, "bar.com", ["hello"], ElemHide.ALL_MATCHING);
+  testResult(test, "bar.com", [], true);
+  testResult(test, "bar.com", ["hello"], false);
   testResult(test, "bar.com", ["hello"]);
   addFilter("foo.com#@#hello");
-  testResult(test, "foo.com", [], ElemHide.SPECIFIC_ONLY);
-  testResult(test, "foo.com", [], ElemHide.NO_UNCONDITIONAL);
-  testResult(test, "foo.com", [], ElemHide.ALL_MATCHING);
+  testResult(test, "foo.com", [], true);
+  testResult(test, "foo.com", [], false);
   testResult(test, "foo.com", []);
-  testResult(test, "bar.com", [], ElemHide.SPECIFIC_ONLY);
-  testResult(test, "bar.com", ["hello"], ElemHide.NO_UNCONDITIONAL);
-  testResult(test, "bar.com", ["hello"], ElemHide.ALL_MATCHING);
+  testResult(test, "bar.com", [], true);
+  testResult(test, "bar.com", ["hello"], false);
   testResult(test, "bar.com", ["hello"]);
   removeFilter("foo.com#@#hello");
-  testResult(test, "foo.com", [], ElemHide.SPECIFIC_ONLY);
+  testResult(test, "foo.com", [], true);
   // Note: We don't take care to track conditional selectors which became
   //       unconditional when a filter was removed. This was too expensive.
-  // testResult(test, "foo.com", [], ElemHide.NO_UNCONDITIONAL);
-  testResult(test, "foo.com", ["hello"], ElemHide.ALL_MATCHING);
+  testResult(test, "foo.com", ["hello"], false);
   testResult(test, "foo.com", ["hello"]);
-  testResult(test, "bar.com", [], ElemHide.SPECIFIC_ONLY);
-  testResult(test, "bar.com", ["hello"], ElemHide.NO_UNCONDITIONAL);
-  testResult(test, "bar.com", ["hello"], ElemHide.ALL_MATCHING);
+  testResult(test, "bar.com", [], true);
+  testResult(test, "bar.com", ["hello"], false);
   testResult(test, "bar.com", ["hello"]);
   removeFilter("##hello");
   testResult(test, "foo.com", []);
   testResult(test, "bar.com", []);
 
   addFilter("##hello");
   addFilter("foo.com##hello");
   testResult(test, "foo.com", ["hello"]);
   removeFilter("foo.com##hello");
   testResult(test, "foo.com", ["hello"]);
@@ skipping 12 matching lines @@
 };
 
 exports.testZeroFilterKey = function(test)
 {
   ElemHide.add(Filter.fromText("##test"));
   ElemHide.add(Filter.fromText("foo.com#@#test"));
   testResult(test, "foo.com", []);
   testResult(test, "bar.com", ["test"]);
   test.done();
 };