Issue 301 - adblockplustests: Use for (.. of ..)

chrome/content/tests/matcher.js

 (function()
 {
   module("Filter matcher", {setup: prepareFilterComponents, teardown: restoreFilterComponents});
 
   function compareKeywords(text, expected)
   {
-    for each (let filter in [Filter.fromText(text), Filter.fromText("@@" + text)])
+    for (let filter of [Filter.fromText(text), Filter.fromText("@@" + text)])
     {
       let matcher = new Matcher();
       let result = [];
-      for each (let dummy in expected)
+      for (let dummy of expected)
       {
         keyword = matcher.findKeyword(filter);
         result.push(keyword);
         if (keyword)
         {
           let dummyFilter = Filter.fromText('^' + keyword + '^');
           dummyFilter.filterCount = Infinity;
           matcher.add(dummyFilter);
         }
       }
 
       equal(result.join(", "), expected.join(", "), "Keyword candidates for " + filter.text);
     }
   }
 
   function checkMatch(filters, location, contentType, docDomain, thirdParty, expected)
   {
     let matcher = new Matcher();
-    for each (let filter in filters)
+    for (let filter of filters)
       matcher.add(Filter.fromText(filter));
 
     let result = matcher.matchesAny(location, contentType, docDomain, thirdParty);
     if (result)
       result = result.text;
 
     equal(result, expected, "match(" + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ") with:\n" + filters.join("\n"));
 
     let combinedMatcher = new CombinedMatcher();
     for (let i = 0; i < 2; i++)
     {
-      for each (let filter in filters)
+      for (let filter of filters)
         combinedMatcher.add(Filter.fromText(filter));
 
       let result = combinedMatcher.matchesAny(location, contentType, docDomain, thirdParty);
       if (result)
         result = result.text;
 
       equal(result, expected, "combinedMatch(" + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ") with:\n" + filters.join("\n"));
 
       // For next run: add whitelisting filters
       filters = filters.map(function(text) "@@" + text);
@@ skipping 126 matching lines @@
     cacheCheck(matcher, "http://fed", "IMAGE", null, false, "http://fed$~third-party,~script");
     cacheCheck(matcher, "http://fed", "IMAGE", null, true, "http://fed$third-party");
     cacheCheck(matcher, "http://abc_cba", "DOCUMENT", null, false, "cba$~third-party,~script");
     cacheCheck(matcher, "http://abc_cba", "DOCUMENT", null, true, "cba$third-party");
     cacheCheck(matcher, "http://abc_cba", "SCRIPT", null, false, "abc$script");
     cacheCheck(matcher, "http://def?http://fed", "DOCUMENT", null, false, "http://fed$~third-party,~script");
     cacheCheck(matcher, "http://def?http://fed", "DOCUMENT", null, true, "http://fed$third-party");
     cacheCheck(matcher, "http://def?http://fed", "SCRIPT", null, false, "http://def$script");
   });
 })();