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 279 matching lines @@
       if (prevWnd == wnd && prevItem.location == item.location && prevItem.type == item.type && prevItem.docDomain == item.docDomain)
         policyHits.pop();
     }
     policyHits.push([wnd, node, item]);
   }
 
   function runTest([name, body, expectedURL, expectedType, expectedThirdParty, explicitEvent], stage)
   {
     defaultMatcher.clear();
 
-    if (stage > 1)
-      if (stage == 7)
-        defaultMatcher.add(Filter.fromText(expectedURL + "$domain=127.0.0.1"));
-      else
-        defaultMatcher.add(Filter.fromText(expectedURL));
+    if (stage == 7)
+      defaultMatcher.add(Filter.fromText(expectedURL + "$domain=127.0.0.1"));
+    else if (stage > 1)
+      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)
@@ skipping 49 matching lines @@
 
       // Work around weird Firefox behavior, where worker scripts succesfully load with empty 404 pages.
       var error = "<b>Not found...<b>";
       response.bodyOutputStream.write(error, error.length);
     });
 
     policyHits = [];
     var callback = function()
     {
       let expectedStatus = "allowed";
-      if (stage == 3 || stage == 6)
+      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 && stage != 8)
+      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 32 matching lines @@
     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));
     }
   }
 })();