Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(197)

Unified Diff: webkit/dom_storage/dom_storage_area_unittest.cc

Issue 9389009: Hook up DomStorageArea with a DomStorageDatabase. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try and make the Windows try bot happy. Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/dom_storage/dom_storage_area_unittest.cc
diff --git a/webkit/dom_storage/dom_storage_area_unittest.cc b/webkit/dom_storage/dom_storage_area_unittest.cc
index 1d51fe3b70bf4c45b8949e1f09ab3ae2cfeccc3d..eaa87569d2e2143a104620e8cf0ea45e4e893833 100644
--- a/webkit/dom_storage/dom_storage_area_unittest.cc
+++ b/webkit/dom_storage/dom_storage_area_unittest.cc
@@ -2,9 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/file_util.h"
+#include "base/scoped_temp_dir.h"
#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/dom_storage/dom_storage_area.h"
+#include "webkit/dom_storage/dom_storage_types.h"
namespace dom_storage {
@@ -53,4 +56,73 @@ TEST(DomStorageAreaTest, DomStorageAreaBasics) {
EXPECT_NE(copy->map_.get(), area->map_.get());
}
+TEST(DomStorageAreaTest, BackingDatabaseOpened) {
+ const int64 kNonLocalStorageNamespaceId = kLocalStorageNamespaceId + 1;
+ const GURL origin("http://www.google.com");
+ ScopedTempDir temp_dir;
+ ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
+ // No directory, backing should be null.
+ {
+ scoped_refptr<DomStorageArea> area(
+ new DomStorageArea(kLocalStorageNamespaceId, origin, FilePath(),
+ NULL));
+ EXPECT_EQ(NULL, area->backing_.get());
+ EXPECT_TRUE(area->initial_import_done_);
+ EXPECT_FALSE(file_util::PathExists(
+ FilePath().AppendASCII("http_www.google.com_0.localstorage")));
+ }
+
+ // Valid directory and origin but non-local namespace id. Backing should
+ // be null.
+ {
+ scoped_refptr<DomStorageArea> area(
+ new DomStorageArea(kNonLocalStorageNamespaceId, origin,
+ temp_dir.path(), NULL));
+ EXPECT_EQ(NULL, area->backing_.get());
+ EXPECT_TRUE(area->initial_import_done_);
+
+ NullableString16 old_value;
+ area->SetItem(ASCIIToUTF16("test"), ASCIIToUTF16("value"), &old_value);
+ ASSERT_TRUE(old_value.is_null());
+
+ // Check that saving a value has still left us without a backing database.
+ EXPECT_EQ(NULL, area->backing_.get());
+ EXPECT_FALSE(file_util::PathExists(
+ temp_dir.path().AppendASCII("http_www.google.com_0.localstorage")));
+ }
+
+ // Valid directory and origin with local storage namespace id - backing
+ // should be open.
+ {
+ scoped_refptr<DomStorageArea> area(
+ new DomStorageArea(kLocalStorageNamespaceId, origin,
+ temp_dir.path(), NULL));
+ EXPECT_TRUE(area->backing_.get());
+ EXPECT_FALSE(area->initial_import_done_);
+ // Need to write something to ensure that the database is created.
+ NullableString16 old_value;
+ area->SetItem(ASCIIToUTF16("test"), ASCIIToUTF16("value"), &old_value);
+ ASSERT_TRUE(old_value.is_null());
+ EXPECT_TRUE(area->initial_import_done_);
+ EXPECT_TRUE(area->backing_->IsOpen());
+ EXPECT_TRUE(file_util::PathExists(
+ temp_dir.path().AppendASCII("http_www.google.com_0.localstorage")));
+ }
+}
+
+TEST(DomStorageAreaTest, TestDatabaseFilePath) {
+ EXPECT_EQ(FilePath().AppendASCII("file_path_to_0.localstorage"),
+ DomStorageArea::DatabaseFileNameFromOrigin(
+ GURL("file://path_to/index.html")));
+
+ EXPECT_EQ(FilePath().AppendASCII("https_www.google.com_0.localstorage"),
+ DomStorageArea::DatabaseFileNameFromOrigin(
+ GURL("https://www.google.com/")));
+
+ EXPECT_EQ(FilePath().AppendASCII("https_www.google.com_8080.localstorage"),
+ DomStorageArea::DatabaseFileNameFromOrigin(
+ GURL("https://www.google.com:8080")));
+}
+
} // namespace dom_storage

Powered by Google App Engine
This is Rietveld 408576698