Issue 616 - Add tests for $generichide and $genericblock

chrome/content/tests/policy.js

 (function()
 {
   let server = null;
   let frame = null;
   let requestNotifier = null;
   let httpProtocol = null;
 
   module("Content policy", {
     setup: function()
     {
@@ skipping 280 matching lines @@
         policyHits.pop();
     }
     policyHits.push([wnd, node, item]);
   }
 
   function runTest([name, body, expectedURL, expectedType, expectedThirdParty, explicitEvent], stage)
   {
     defaultMatcher.clear();
 
     if (stage > 1)
-      defaultMatcher.add(Filter.fromText(expectedURL));
+      if (stage == 7)

[Felix Dahlke, 2015/09/28 18:24:07]

I think this block can be simplified:

if (stage == 7)
  defaultMatcher.add(Filter.fromText(expectedURL + "$domain=127.0.0.1"));
else if (stage > 1)
  defaultMatcher.add(Filter.fromText(expectedURL));

[kzar, 2015/09/29 11:07:02]

Done.

+        defaultMatcher.add(Filter.fromText(expectedURL + "$domain=127.0.0.1"));
+      else
+        defaultMatcher.add(Filter.fromText(expectedURL));
+
     if (stage == 3)
       defaultMatcher.add(Filter.fromText("@@||127.0.0.1:1234/test|$document"));
     if (stage == 4)
       defaultMatcher.add(Filter.fromText("@@||127.0.0.1:1234/test|$~document"));
     if (stage == 5)
       defaultMatcher.add(Filter.fromText("@@||127.0.0.1:1234/test|$document,sitekey=" + publickey));
+    if (stage == 6 || stage == 7)
+      defaultMatcher.add(Filter.fromText("@@||127.0.0.1:1234/test|$genericblock"));
+    if (stage == 8)
+      defaultMatcher.add(Filter.fromText("@@||127.0.0.1:1234/test|$genericblock,sitekey=" + publickey));
 
     if (!explicitEvent)
     {
       if (body.indexOf("2000/svg") >= 0)
       {
         // SVG image: add an onload attribute to the document element and keep
         // polling until the document is really loaded.
         body = body.replace(/(<svg\b)/, '$1 onload="if (document.readyState != \'complete\') setTimeout(arguments.callee.bind(this), 0); else ' + dispatchReadyEvent + '"');
       }
       else
@@ skipping 42 matching lines @@
     });
 
     policyHits = [];
     var callback = function()
     {
       let expectedStatus = "allowed";
       if (stage == 3)
         equal(policyHits.length, 0, "Number of policy hits");
       // We cannot rely on the correctness of policy hits for sitekey filters due to blocking
       // filter hits being counted even if the resource doesn't end up getting blocked
-      else if (stage != 5)
+      else if (stage != 5 && stage != 6 && stage != 8)
       {
         equal(policyHits.length, 1, "Number of policy hits");
         if (policyHits.length == 1)
         {
           let [wnd, node, item] = policyHits[0];
 
           equal(item.location, expectedURL, "Request URL");
 
           expectedStatus = (stage == 1 ? "allowed" : "blocked");
           let actualStatus = (item.filter ? "blocked" : "allowed");
@@ skipping 13 matching lines @@
     };
     frame.addEventListener("abp:frameready", callback, false, true);
     frame.setAttribute("src", "http://127.0.0.1:1234/test");
   }
 
   let stageDescriptions = {
     1: "running without filters",
     2: "running with filter %S",
     3: "running with filter %S and site exception",
     4: "running with filter %S and exception not applicable to sites",
-    5: "running with filter %S and sitekey exception"
+    5: "running with filter %S and sitekey exception",
+    6: "running with filter %S and $genericblock exception",
+    7: "running with filter %S$domain=127.0.0.1 and $genericblock exception",
+    8: "running with filter %S and $genericblock,sitekey exception"
   };
 
   for (let test = 0; test < tests.length; test++)
   {
     let [name, body, expectedURL, expectedType, expectedDomain, expectedThirdParty] = tests[test];
     for (let stage = 1; stage in stageDescriptions; stage++)
     {
       let stageDescription = stageDescriptions[stage];
       if (stageDescription.indexOf("%S") >= 0)
         stageDescription = stageDescription.replace("%S", expectedURL);
 
       asyncTest(name + " (" + stageDescription + ")", runTest.bind(null, tests[test], stage));
     }
   }
 })();