Implemented port filter for URLMatcher

chrome/browser/extensions/api/declarative/url_matcher_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/declarative/url_matcher.h"
 
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 27 matching lines @@
   URLMatcherSchemeFilter filter2(filter2_content);
 
   GURL matching_url("https://www.foobar.com");
   GURL non_matching_url("http://www.foobar.com");
   EXPECT_TRUE(filter1.IsMatch(matching_url));
   EXPECT_FALSE(filter1.IsMatch(non_matching_url));
   EXPECT_TRUE(filter2.IsMatch(matching_url));
   EXPECT_TRUE(filter2.IsMatch(non_matching_url));
 }
 
+TEST(URLMatcherPortFilter, TestMatching) {
+  std::vector<URLMatcherPortFilter::Range> ranges;
+  ranges.push_back(URLMatcherPortFilter::CreateRange(80, 90));
+  ranges.push_back(URLMatcherPortFilter::CreateRange(8080));
+  URLMatcherPortFilter filter(ranges);
+  EXPECT_TRUE(filter.IsMatch(GURL("http://www.example.com")));
+  EXPECT_TRUE(filter.IsMatch(GURL("http://www.example.com:80")));
+  EXPECT_TRUE(filter.IsMatch(GURL("http://www.example.com:81")));
+  EXPECT_TRUE(filter.IsMatch(GURL("http://www.example.com:90")));
+  EXPECT_TRUE(filter.IsMatch(GURL("http://www.example.com:8080")));
+  EXPECT_FALSE(filter.IsMatch(GURL("http://www.example.com:79")));
+  EXPECT_FALSE(filter.IsMatch(GURL("http://www.example.com:91")));
+  EXPECT_FALSE(filter.IsMatch(GURL("https://www.example.com")));
+}
+
 TEST(URLMatcherConditionTest, IsFullURLCondition) {
   SubstringPattern pattern("example.com", 1);
   EXPECT_FALSE(URLMatcherCondition(URLMatcherCondition::HOST_SUFFIX,
       &pattern).IsFullURLCondition());
 
   EXPECT_TRUE(URLMatcherCondition(URLMatcherCondition::HOST_CONTAINS,
       &pattern).IsFullURLCondition());
   EXPECT_TRUE(URLMatcherCondition(URLMatcherCondition::PATH_CONTAINS,
       &pattern).IsFullURLCondition());
   EXPECT_TRUE(URLMatcherCondition(URLMatcherCondition::QUERY_CONTAINS,
@@ skipping 252 matching lines @@
 
   scoped_refptr<URLMatcherConditionSet> condition_set(
       new URLMatcherConditionSet(1, conditions));
   EXPECT_EQ(1, condition_set->id());
   EXPECT_EQ(2u, condition_set->conditions().size());
 }
 
 TEST(URLMatcherConditionSetTest, Matching) {
   GURL url1("http://www.example.com/foo?bar=1");
   GURL url2("http://foo.example.com/index.html");
+  GURL url3("http://www.example.com:80/foo?bar=1");
+  GURL url4("http://www.example.com:8080/foo?bar=1");
 
   URLMatcherConditionFactory factory;
   URLMatcherCondition m1 = factory.CreateHostSuffixCondition("example.com");
   URLMatcherCondition m2 = factory.CreatePathContainsCondition("foo");
 
   std::set<URLMatcherCondition> conditions;
   conditions.insert(m1);
   conditions.insert(m2);
 
   scoped_refptr<URLMatcherConditionSet> condition_set(
       new URLMatcherConditionSet(1, conditions));
   EXPECT_EQ(1, condition_set->id());
   EXPECT_EQ(2u, condition_set->conditions().size());
 
   std::set<SubstringPattern::ID> matching_substring_patterns;
   matching_substring_patterns.insert(m1.substring_pattern()->id());
   EXPECT_FALSE(condition_set->IsMatch(matching_substring_patterns, url1));
 
   matching_substring_patterns.insert(m2.substring_pattern()->id());
   EXPECT_TRUE(condition_set->IsMatch(matching_substring_patterns, url1));
   EXPECT_FALSE(condition_set->IsMatch(matching_substring_patterns, url2));
 
-
   // Test scheme filters.
   scoped_refptr<URLMatcherConditionSet> condition_set2(
       new URLMatcherConditionSet(1, conditions,
           scoped_ptr<URLMatcherSchemeFilter>(
-              new URLMatcherSchemeFilter("https"))));
+              new URLMatcherSchemeFilter("https")),
+          scoped_ptr<URLMatcherPortFilter>(NULL)));
   EXPECT_FALSE(condition_set2->IsMatch(matching_substring_patterns, url1));
   scoped_refptr<URLMatcherConditionSet> condition_set3(
       new URLMatcherConditionSet(1, conditions,
           scoped_ptr<URLMatcherSchemeFilter>(
-              new URLMatcherSchemeFilter("http"))));
+              new URLMatcherSchemeFilter("http")),
+          scoped_ptr<URLMatcherPortFilter>(NULL)));
   EXPECT_TRUE(condition_set3->IsMatch(matching_substring_patterns, url1));
+
+  // Test port filters.
+  std::vector<URLMatcherPortFilter::Range> ranges;
+  ranges.push_back(URLMatcherPortFilter::CreateRange(80));
+  scoped_ptr<URLMatcherPortFilter> filter(new URLMatcherPortFilter(ranges));
+  scoped_refptr<URLMatcherConditionSet> condition_set4(
+      new URLMatcherConditionSet(1, conditions,
+          scoped_ptr<URLMatcherSchemeFilter>(NULL), filter.Pass()));
+  EXPECT_TRUE(condition_set4->IsMatch(matching_substring_patterns, url1));
+  EXPECT_TRUE(condition_set4->IsMatch(matching_substring_patterns, url3));
+  EXPECT_FALSE(condition_set4->IsMatch(matching_substring_patterns, url4));
 }
 
 
 //
 // URLMatcher
 //
 
 TEST(URLMatcherTest, FullTest) {
   GURL url1("http://www.example.com/foo?bar=1");
   GURL url2("http://foo.example.com/index.html");
@@ skipping 49 matching lines @@
   // The cached singleton in matcher.condition_factory_ should be destroyed to
   // free memory.
   int patternId2 = factory->CreateHostSuffixCondition(
       "example.com").substring_pattern()->id();
   // If patternId1 and patternId2 are different that indicates that
   // matcher.condition_factory_ does not leak memory.
   EXPECT_NE(patternId1, patternId2);
 }
 
 }  // namespace extensions