Issue 4167 - getSelectorsForDomain criteria + keys

test/elemHide.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 23 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, selectors) =>
     {
       return index == 0 || selector != selectors[index -  1];
     });
   }
-  function selectorsEqual(domain, expectedSelectors, specificOnly)
+  function selectorsEqual(domain, expectedSelectors, specificOnly,
+                          noUnconditional, provideFilterKeys)
   {
     test.deepEqual(
-      normalizeSelectors(ElemHide.getSelectorsForDomain(domain, specificOnly)),
+      normalizeSelectors(ElemHide.getSelectorsForDomain(
+        domain, specificOnly, noUnconditional, provideFilterKeys
+      )),
       normalizeSelectors(expectedSelectors)
     );
   }
 
   selectorsEqual("", []);
 
   addFilter("~foo.example.com,example.com##foo");
   selectorsEqual("barfoo.example.com", ["foo"]);
   selectorsEqual("bar.foo.example.com", []);
   selectorsEqual("foo.example.com", []);
@@ skipping 94 matching lines @@
   selectorsEqual("example.com", ["foo"]);
   selectorsEqual("com", []);
   selectorsEqual("", []);
   removeFilter("example.org##foo");
 
   addFilter("~example.com##foo");
   selectorsEqual("foo.example.com", []);
   selectorsEqual("example.com", ["foo"]);
   selectorsEqual("com", ["foo"]);
   selectorsEqual("", ["foo"]);
-  removeFilter("example.org##foo");
+  removeFilter("~example.org##foo");
+
+  // Test specificOnly and noUnconditional
+  addFilter("~example.com##foo");
+  selectorsEqual("foo.com", [], true, false);
+  selectorsEqual("foo.com", ["foo"], false, true);
+  addFilter("foo.com##foo");
+  selectorsEqual("foo.com", ["foo"], true, false);
+  selectorsEqual("foo.com", ["foo"], false, true);
+  removeFilter("foo.com##foo");
+  removeFilter("~example.org##foo");
+
+  // Test provideFilterKeys
+  addFilter("~foo.com##nope");
+  addFilter("##foo");
+  addFilter("##bar");
+  addFilter("##hello");
+  addFilter("##world");
+  let selectorsWithKeys = ElemHide.getSelectorsForDomain("foo.com", false,
+                                                         false, true);
+  let selectors = selectorsWithKeys[0];
+  let filterKeys = selectorsWithKeys[1];
+  test.deepEqual(filterKeys.map(k => ElemHide.getFilterByKey(k).selector),
+                 selectors);
+  test.deepEqual(normalizeSelectors(selectors),
+                 normalizeSelectors(["bar", "foo", "hello", "world"]));
+  removeFilter("##world");
+  removeFilter("##hello");
+  removeFilter("##bar");
+  removeFilter("##foo");
+  removeFilter("~foo.com##nope");
 
   test.done();
 };