Issue 616 - Add tests for $generichide and $genericblock

chrome/content/tests/elemhide.js

 (function()
 {
   let server = null;
   let frame = null;
 
   module("Element hiding", {
     setup: function()
     {
       prepareFilterComponents.call(this);
       preparePrefs.call(this);
@@ skipping 89 matching lines @@
     [["###test1", "foo#@##test1"], ["hidden", "visible"]],
     [["###test1", "~foo#@##test1"], ["visible", "visible"]],
     [["###test1", "~localhost#@##test1"], ["hidden", "visible"]],
     [["###test1", "#@##test1"], ["visible", "visible"]],
     [["localhost###test1", "#@##test1"], ["visible", "visible"]],
 
     [["localhost.###test1"], ["visible", "visible"]],
     [["localhost.,localhost###test1"], ["hidden", "visible"]],
     [["localhost.,foo.###test1"], ["visible", "visible"]],
 
-    [["#div(test1)", "@@localhost$generichide"], ["visible", "visible"]],
-    [["#div(test1)", "@@localhost$genericblock"], ["hidden", "visible"]],
-    [["localhost#div(test1)", "@@localhost$generichide"], ["hidden", "visible"]],
-    [["~example.com#div(test1)", "@@localhost$generichide"], ["visible", "visible"]],
-    [["~example.com#div(test1)", "@@localhost$genericblock"], ["hidden", "visible"]],
-    [["~example.com,localhost#div(test1)", "@@localhost$generichide"], ["hidden", "visible"]],
+    [["##div#test1", "@@localhost$generichide"], ["visible", "visible"]],
+    [["##div#test1", "@@localhost$genericblock"], ["hidden", "visible"]],
+    [["localhost##div#test1", "@@localhost$generichide"], ["hidden", "visible"]],
+    [["~example.com##div#test1", "@@localhost$generichide"], ["visible", "visible"]],
+    [["~example.com##div#test1", "@@localhost$genericblock"], ["hidden", "visible"]],
+    [["~example.com,localhost##div#test1", "@@localhost$generichide"], ["hidden", "visible"]],
   ];
 
   function runTest([filters, expected], stage)
   {
     let listener = function(action)
     {
       if (action != "elemhideupdate")
         return;
       FilterNotifier.removeListener(listener);
 
@@ skipping 13 matching lines @@
         {
           let doc = frame.contentDocument;
           equal(doc.getElementById("test1").offsetHeight > 0 ? "visible" : "hidden", expected[0], "First element visible");
           equal(doc.getElementById("test2").offsetHeight > 0 ? "visible" : "hidden", expected[1], "Second element visible");
 
           start();
         });
       }, false, true);
       frame.setAttribute("src", "http://localhost:1234/test");
     };
+    FilterNotifier.addListener(listener);
 
-    for (let filter of filters)
-      if (filter.substr(0, 2) == "@@")

[Sebastian Noack, 2015/03/19 11:58:49]

How about using two seperate lists istead this ugly switch?

[kzar, 2015/03/19 16:24:26]

You're right the switch is a little ugly but the alternative of modifying all
the existing test cases to add an empty array as an extra parameter seems worse.
I prefer how I've done it.

[Sebastian Noack, 2015/03/20 09:56:12]

You are right, this seems to be consistent with existing tests.

-        defaultMatcher.add(Filter.fromText(filter));//exception_filters.push(filter);

[Sebastian Noack, 2015/03/19 11:58:49]

I suppose you forgot to remove that comment?

[kzar, 2015/03/19 16:24:26]

Done.

+    for (let filter_text of filters)
+    {
+      let filter = Filter.fromText(filter_text);
+      if (filter instanceof WhitelistFilter)
+        defaultMatcher.add(filter);
       else
-        ElemHide.add(Filter.fromText(filter));
+        ElemHide.add(filter);
+    }
 
-    FilterNotifier.addListener(listener);
     ElemHide.isDirty = true;
     ElemHide.apply();
   }
 
   let stageDescriptions = {
     1: "running without exceptions",
     2: "running with whitelisted document",
     3: "running with exception not applying to documents",
     4: "running with element hiding exception",
   };
 
   for (let test = 0; test < tests.length; test++)
   {
     let [filters, expected] = tests[test];
     for (let stage = 1; stage in stageDescriptions; stage++)
       asyncTest(filters.join(", ") + " (" + stageDescriptions[stage] + ")", runTest.bind(null, tests[test], stage));
   }
 })();