AppCache: Alter the relative priorities of online vs fallback namespaces.

webkit/appcache/appcache_unittest.cc

 // Copyright (c) 2009 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 "testing/gtest/include/gtest/gtest.h"
 #include "webkit/appcache/appcache.h"
 #include "webkit/appcache/appcache_frontend_impl.h"
 #include "webkit/appcache/appcache_host.h"
 #include "webkit/appcache/mock_appcache_service.h"
 
@@ skipping 111 matching lines @@
   const GURL kFallbackEntryUrl2("http://blah/fallback_entry2");
   const GURL kFallbackNamespaceUrl2("http://blah/fallback_namespace/longer");
   const GURL kManifestUrl("http://blah/manifest");
   const GURL kForeignExplicitEntryUrl("http://blah/foreign");
   const GURL kInOnlineNamespaceUrl(
       "http://blah/online_namespace/network");
   const GURL kExplicitInOnlineNamespaceUrl(
       "http://blah/online_namespace/explicit");
   const GURL kFallbackTestUrl1("http://blah/fallback_namespace/1");
   const GURL kFallbackTestUrl2("http://blah/fallback_namespace/longer2");
+  const GURL kOnlineNamespaceWithinFallback(
+      "http://blah/fallback_namespace/1/online");
 
   const int64 kFallbackResponseId1 = 1;
   const int64 kFallbackResponseId2 = 2;
   const int64 kManifestResponseId = 3;
   const int64 kForeignExplicitResponseId = 4;
   const int64 kExplicitInOnlineNamespaceResponseId = 5;
 
   Manifest manifest;
   manifest.online_whitelist_namespaces.push_back(kOnlineNamespaceUrl);
+  manifest.online_whitelist_namespaces.push_back(
+      kOnlineNamespaceWithinFallback);
   manifest.fallback_namespaces.push_back(
       FallbackNamespace(kFallbackNamespaceUrl1, kFallbackEntryUrl1));
   manifest.fallback_namespaces.push_back(
       FallbackNamespace(kFallbackNamespaceUrl2, kFallbackEntryUrl2));
 
   // Create a cache with some namespaces and entries.
   scoped_refptr<AppCache> cache(new AppCache(&service, 1234));
   cache->InitializeWithManifest(&manifest);
   cache->AddEntry(
       kFallbackEntryUrl1,
@@ skipping 74 matching lines @@
   fallback_entry = AppCacheEntry();  // reset
 
   found = cache->FindResponseForRequest(kFallbackTestUrl2,
       &entry, &fallback_entry, &fallback_namespace, &network_namespace);
   EXPECT_TRUE(found);
   EXPECT_FALSE(entry.has_response_id());
   EXPECT_EQ(kFallbackResponseId2, fallback_entry.response_id());
   EXPECT_EQ(kFallbackEntryUrl2,
             cache->GetFallbackEntryUrl(fallback_namespace));
   EXPECT_FALSE(network_namespace);
+
+  fallback_entry = AppCacheEntry();  // reset
+
+  found = cache->FindResponseForRequest(kOnlineNamespaceWithinFallback,
+      &entry, &fallback_entry, &fallback_namespace, &network_namespace);
+  EXPECT_TRUE(found);
+  EXPECT_FALSE(entry.has_response_id());
+  EXPECT_FALSE(fallback_entry.has_response_id());
+  EXPECT_TRUE(network_namespace);
+
+  fallback_entry = AppCacheEntry();  // reset
+
+  found = cache->FindResponseForRequest(
+      kOnlineNamespaceWithinFallback.Resolve("online_resource"),
+      &entry, &fallback_entry, &fallback_namespace, &network_namespace);
+  EXPECT_TRUE(found);
+  EXPECT_FALSE(entry.has_response_id());
+  EXPECT_FALSE(fallback_entry.has_response_id());
+  EXPECT_TRUE(network_namespace);
 }
 
 }  // namespace appacache