Hook up DomStorageArea with a DomStorageDatabase.

webkit/dom_storage/dom_storage_area_unittest.cc

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..ab30301a547d7c3c882ad7a8e49b454a20f789c7 100644
--- a/webkit/dom_storage/dom_storage_area_unittest.cc
+++ b/webkit/dom_storage/dom_storage_area_unittest.cc
@@ -2,9 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/bind.h"
+#include "base/file_util.h"
+#include "base/message_loop.h"
+#include "base/message_loop_proxy.h"
+#include "base/scoped_temp_dir.h"
+#include "base/threading/sequenced_worker_pool.h"
+#include "base/time.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_task_runner.h"
+#include "webkit/dom_storage/dom_storage_types.h"
 
 namespace dom_storage {
 
@@ -53,4 +62,86 @@ TEST(DomStorageAreaTest, DomStorageAreaBasics) {
   EXPECT_NE(copy->map_.get(), area->map_.get());
 }
 
+TEST(DomStorageAreaTest, BackingDatabaseOpened) {
+  const int64 kSessionStorageNamespaceId = kLocalStorageNamespaceId + 1;
+  const GURL kOrigin("http://www.google.com");
+
+  const string16 kKey = ASCIIToUTF16("test");
+  const string16 kKey2 = ASCIIToUTF16("test2");
+  const string16 kValue = ASCIIToUTF16("value");
+  ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
+  const FilePath kExpectedOriginFilePath = temp_dir.path().Append(
+      DomStorageArea::DatabaseFileNameFromOrigin(kOrigin));
+
+  // No directory, backing should be null.
+  {
+    scoped_refptr<DomStorageArea> area(
+        new DomStorageArea(kLocalStorageNamespaceId, kOrigin, FilePath(),
+                           NULL));
+    EXPECT_EQ(NULL, area->backing_.get());
+    EXPECT_TRUE(area->initial_import_done_);
+    EXPECT_FALSE(file_util::PathExists(kExpectedOriginFilePath));
+  }
+
+  // Valid directory and origin but non-local namespace id. Backing should
+  // be null.
+  {
+    scoped_refptr<DomStorageArea> area(
+        new DomStorageArea(kSessionStorageNamespaceId, kOrigin,
+                           temp_dir.path(), NULL));
+    EXPECT_EQ(NULL, area->backing_.get());
+    EXPECT_TRUE(area->initial_import_done_);
+
+    NullableString16 old_value;
+    EXPECT_TRUE(area->SetItem(kKey, kValue, &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(kExpectedOriginFilePath));
+  }
+
+  // This should set up a DomStorageArea that is correctly backed to disk.
+  {
+    scoped_refptr<DomStorageArea> area(
+        new DomStorageArea(kLocalStorageNamespaceId, kOrigin,
+            temp_dir.path(),
+            new MockDomStorageTaskRunner(base::MessageLoopProxy::current())));
+
+    EXPECT_TRUE(area->backing_.get());

[michaeln, 2012/02/24 19:29:52]

maybe EXPECT_FALSE(area->backing_->IsOpen()) here

[benm (inactive), 2012/02/27 10:39:27]

Done.

+    EXPECT_FALSE(area->initial_import_done_);

[michaeln, 2012/02/24 19:29:52]

Consider replacing the 'file' backed DomStorageDatabase with an in-memory
instance to avoid actual fileio in this test, we can confirm that something was
written to the db after RunAllPending() by querying db->ReadAllValues() and
looking at the size of the resulting ValuesMap.

i think you could inject the in-memory guy at this point
area->backing_.reset(new DomStorageDatabase);

[benm (inactive), 2012/02/27 10:39:27]

Good idea. I thought it was nice to assert that the file was actually created on
disk, but I guess that is taken care of by the DatabaseTests and all we need to
do here is make sure it's written to the db.

+
+    // Need to write something to ensure that the database is created.
+    NullableString16 old_value;
+    EXPECT_TRUE(area->SetItem(kKey, kValue, &old_value));
+    ASSERT_TRUE(old_value.is_null());
+    EXPECT_TRUE(area->SetItem(kKey2, kValue, &old_value));
+    ASSERT_TRUE(old_value.is_null());
+    EXPECT_TRUE(area->initial_import_done_);
+

[michaeln, 2012/02/24 19:29:52]

maybe EXPECT_TRUE(area->commit_in_flight_) before and FALSE after RunAllPending

[benm (inactive), 2012/02/27 10:39:27]

Done.

+    MessageLoop::current()->RunAllPending();
+
+    EXPECT_TRUE(area->backing_->IsOpen());
+    EXPECT_EQ(2u, area->Length());
+    EXPECT_TRUE(file_util::PathExists(kExpectedOriginFilePath));
+    EXPECT_EQ(kValue, area->GetItem(kKey).string());
+  }
+}
+
+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