Index: content/browser/service_worker/service_worker_utils_unittest.cc |
diff --git a/content/browser/service_worker/service_worker_utils_unittest.cc b/content/browser/service_worker/service_worker_utils_unittest.cc |
index 67a74801d6cfb4318f5afb5c868424acabf3391c..30e26b49d43265af36f9e8e548699eb3f0712017 100644 |
--- a/content/browser/service_worker/service_worker_utils_unittest.cc |
+++ b/content/browser/service_worker/service_worker_utils_unittest.cc |
@@ -9,26 +9,42 @@ namespace content { |
TEST(ServiceWorkerUtilsTest, ScopeMatches) { |
ASSERT_TRUE(ServiceWorkerUtils::ScopeMatches( |
- GURL("http://www.example.com/*"), GURL("http://www.example.com/"))); |
+ GURL("http://www.example.com/"), GURL("http://www.example.com/"))); |
ASSERT_TRUE(ServiceWorkerUtils::ScopeMatches( |
- GURL("http://www.example.com/*"), |
+ GURL("http://www.example.com/"), |
GURL("http://www.example.com/page.html"))); |
ASSERT_FALSE(ServiceWorkerUtils::ScopeMatches( |
- GURL("http://www.example.com/*"), GURL("https://www.example.com/"))); |
+ GURL("http://www.example.com/"), GURL("https://www.example.com/"))); |
ASSERT_FALSE(ServiceWorkerUtils::ScopeMatches( |
- GURL("http://www.example.com/*"), |
+ GURL("http://www.example.com/"), |
GURL("https://www.example.com/page.html"))); |
ASSERT_FALSE(ServiceWorkerUtils::ScopeMatches( |
- GURL("http://www.example.com/*"), GURL("http://www.foo.com/"))); |
+ GURL("http://www.example.com/"), GURL("http://www.foo.com/"))); |
ASSERT_FALSE(ServiceWorkerUtils::ScopeMatches( |
- GURL("http://www.example.com/*"), GURL("https://www.foo.com/page.html"))); |
+ GURL("http://www.example.com/"), GURL("https://www.foo.com/page.html"))); |
+ // '*' is not a wildcard. |
+ ASSERT_FALSE(ServiceWorkerUtils::ScopeMatches( |
+ GURL("http://www.example.com/*"), GURL("http://www.example.com/x"))); |
+ ASSERT_FALSE(ServiceWorkerUtils::ScopeMatches( |
+ GURL("http://www.example.com/*"), GURL("http://www.example.com/"))); |
+ ASSERT_FALSE(ServiceWorkerUtils::ScopeMatches( |
+ GURL("http://www.example.com/*"), GURL("http://www.example.com/xx"))); |
ASSERT_TRUE(ServiceWorkerUtils::ScopeMatches( |
- GURL("http://www.example.com/"), GURL("http://www.example.com/"))); |
+ GURL("http://www.example.com/*"), GURL("http://www.example.com/*"))); |
+ |
+ ASSERT_TRUE(ServiceWorkerUtils::ScopeMatches( |
+ GURL("http://www.example.com/*/x"), GURL("http://www.example.com/*/x"))); |
ASSERT_FALSE(ServiceWorkerUtils::ScopeMatches( |
- GURL("http://www.example.com/"), GURL("http://www.example.com/x"))); |
+ GURL("http://www.example.com/*/x"), GURL("http://www.example.com/a/x"))); |
+ ASSERT_FALSE( |
+ ServiceWorkerUtils::ScopeMatches(GURL("http://www.example.com/*/x/*"), |
+ GURL("http://www.example.com/a/x/b"))); |
+ ASSERT_FALSE( |
+ ServiceWorkerUtils::ScopeMatches(GURL("http://www.example.com/*/x/*"), |
+ GURL("http://www.example.com/*/x/b"))); |
// '?' is not a wildcard. |
ASSERT_FALSE(ServiceWorkerUtils::ScopeMatches( |
@@ -45,59 +61,28 @@ TEST(ServiceWorkerUtilsTest, ScopeMatches) { |
ServiceWorkerUtils::ScopeMatches(GURL("http://www.example.com/?a=b"), |
GURL("http://www.example.com/?a=b"))); |
ASSERT_TRUE( |
- ServiceWorkerUtils::ScopeMatches(GURL("http://www.example.com/?a=*"), |
+ ServiceWorkerUtils::ScopeMatches(GURL("http://www.example.com/?a="), |
GURL("http://www.example.com/?a=b"))); |
ASSERT_TRUE(ServiceWorkerUtils::ScopeMatches( |
- GURL("http://www.example.com/*"), GURL("http://www.example.com/?a=b"))); |
- ASSERT_FALSE(ServiceWorkerUtils::ScopeMatches( |
GURL("http://www.example.com/"), GURL("http://www.example.com/?a=b"))); |
- // '*' only has special meaning in terminal position. |
+ // URLs canonicalize \ to / so this is equivalent to "...//x" |
ASSERT_TRUE(ServiceWorkerUtils::ScopeMatches( |
- GURL("http://www.example.com/*/x"), GURL("http://www.example.com/*/x"))); |
- ASSERT_FALSE(ServiceWorkerUtils::ScopeMatches( |
- GURL("http://www.example.com/*/x"), GURL("http://www.example.com/a/x"))); |
- ASSERT_FALSE( |
- ServiceWorkerUtils::ScopeMatches(GURL("http://www.example.com/*/x/*"), |
- GURL("http://www.example.com/a/x/b"))); |
- ASSERT_TRUE( |
- ServiceWorkerUtils::ScopeMatches(GURL("http://www.example.com/*/x/*"), |
- GURL("http://www.example.com/*/x/b"))); |
- |
- // URLs canonicalize \ to / so this is equivalent to "...//*" and "...//x" |
- ASSERT_TRUE(ServiceWorkerUtils::ScopeMatches( |
- GURL("http://www.example.com/\\*"), GURL("http://www.example.com/\\x"))); |
+ GURL("http://www.example.com/\\x"), GURL("http://www.example.com//x"))); |
} |
-TEST(ServiceWorkerUtilsTest, FindLongestScopeMatch_Basic) { |
+TEST(ServiceWorkerUtilsTest, FindLongestScopeMatch) { |
LongestScopeMatcher matcher(GURL("http://www.example.com/xxx")); |
- // "/xx*" should be matched longest. |
- ASSERT_TRUE(matcher.MatchLongest(GURL("http://www.example.com/x*"))); |
- ASSERT_FALSE(matcher.MatchLongest(GURL("http://www.example.com/*"))); |
- ASSERT_TRUE(matcher.MatchLongest(GURL("http://www.example.com/xx*"))); |
- |
- // "xxx*" should be matched longer than "/xx*". |
- ASSERT_TRUE(matcher.MatchLongest(GURL("http://www.example.com/xxx*"))); |
- |
- ASSERT_FALSE(matcher.MatchLongest(GURL("http://www.example.com/xxxx*"))); |
-} |
- |
-TEST(ServiceWorkerUtilsTest, FindLongestScopeMatch_SameLength) { |
- LongestScopeMatcher matcher1(GURL("http://www.example.com/xxx")); |
- |
- // "/xxx" has the same length with "/xx*", so they are compared as strings |
- // and "/xxx" should win. |
- // TODO(nhiroki): This isn't in the spec (see: service_worker_utils.cc) |
- ASSERT_TRUE(matcher1.MatchLongest(GURL("http://www.example.com/xxx"))); |
- ASSERT_FALSE(matcher1.MatchLongest(GURL("http://www.example.com/xx*"))); |
+ // "/xx" should be matched longest. |
+ ASSERT_TRUE(matcher.MatchLongest(GURL("http://www.example.com/x"))); |
+ ASSERT_FALSE(matcher.MatchLongest(GURL("http://www.example.com/"))); |
+ ASSERT_TRUE(matcher.MatchLongest(GURL("http://www.example.com/xx"))); |
- LongestScopeMatcher matcher2(GURL("http://www.example.com/x(1)")); |
+ // "/xxx" should be matched longer than "/xx". |
+ ASSERT_TRUE(matcher.MatchLongest(GURL("http://www.example.com/xxx"))); |
- // "/xx*" should be prioritized over "/x(1)". |
- // TODO(nhiroki): This isn't in the spec (see: service_worker_utils.cc) |
- ASSERT_TRUE(matcher2.MatchLongest(GURL("http://www.example.com/x(1)"))); |
- ASSERT_TRUE(matcher2.MatchLongest(GURL("http://www.example.com/x(1*"))); |
+ ASSERT_FALSE(matcher.MatchLongest(GURL("http://www.example.com/xxxx"))); |
} |
} // namespace content |