Persist sessionStorage on disk.

webkit/dom_storage/session_storage_database_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 "webkit/dom_storage/session_storage_database.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 447 matching lines @@
   ValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   data1[kKey3] = kValue3;
   ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data1));
   ValuesMap data2;
   data2[kKey1] = kValue2;
   data2[kKey3] = kValue1;
   ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin2, false, data2));
   // Make a shallow copy.
-  EXPECT_TRUE(db_->CloneNamespace(1, 5));
+  db_->CloneNamespace(1, 5);
   // Now both namespaces should have the same data.
   CheckDatabaseConsistency();
   CheckAreaData(1, kOrigin1, data1);
   CheckAreaData(1, kOrigin2, data2);
   CheckAreaData(5, kOrigin1, data1);
   CheckAreaData(5, kOrigin2, data2);
   // Both the namespaces refer to the same maps.
   EXPECT_EQ(GetMapForArea(1, kOrigin1), GetMapForArea(5, kOrigin1));
   EXPECT_EQ(GetMapForArea(1, kOrigin2), GetMapForArea(5, kOrigin2));
   EXPECT_EQ(2, GetMapRefCount(GetMapForArea(1, kOrigin1)));
   EXPECT_EQ(2, GetMapRefCount(GetMapForArea(1, kOrigin2)));
 }
 
 TEST_F(SessionStorageDatabaseTest, WriteIntoShallowCopy) {
   ValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data1));
-  EXPECT_TRUE(db_->CloneNamespace(1, 5));
+  db_->CloneNamespace(1, 5);
 
   // Write data into a shallow copy.
   ValuesMap changes;
   ValuesMap reference;
   changes[kKey1] = kValueNull;
   changes[kKey2] = kValue4;
   changes[kKey3] = kValue4;
   reference[kKey2] = kValue4;
   reference[kKey3] = kValue4;
   EXPECT_TRUE(db_->CommitAreaChanges(5, kOrigin1, false, changes));
@@ skipping 15 matching lines @@
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   data1[kKey3] = kValue3;
   ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data1));
   ValuesMap data2;
   data2[kKey1] = kValue2;
   data2[kKey3] = kValue1;
   ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin2, false, data2));
 
   // Make a two shallow copies.
-  EXPECT_TRUE(db_->CloneNamespace(1, 5));
-  EXPECT_TRUE(db_->CloneNamespace(1, 6));
+  db_->CloneNamespace(1, 5);
+  db_->CloneNamespace(1, 6);
 
   // Make a shallow copy of a shallow copy.
-  EXPECT_TRUE(db_->CloneNamespace(6, 7));
+  db_->CloneNamespace(6, 7);
 
   // Now all namespaces should have the same data.
   CheckDatabaseConsistency();
   CheckAreaData(1, kOrigin1, data1);
   CheckAreaData(5, kOrigin1, data1);
   CheckAreaData(6, kOrigin1, data1);
   CheckAreaData(7, kOrigin1, data1);
   CheckAreaData(1, kOrigin2, data2);
   CheckAreaData(5, kOrigin2, data2);
   CheckAreaData(6, kOrigin2, data2);
@@ skipping 10 matching lines @@
   // Check the ref counts.
   EXPECT_EQ(4, GetMapRefCount(GetMapForArea(1, kOrigin1)));
   EXPECT_EQ(4, GetMapRefCount(GetMapForArea(1, kOrigin2)));
 }
 
 TEST_F(SessionStorageDatabaseTest, DisassociateShallowCopy) {
   ValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data1));
-  EXPECT_TRUE(db_->CloneNamespace(1, 5));
+  db_->CloneNamespace(1, 5);
 
   // Disassoaciate the shallow copy.
-  EXPECT_TRUE(db_->DeleteArea(5, kOrigin1));
+  db_->DeleteArea(5, kOrigin1);
   CheckDatabaseConsistency();
 
   // Now new data can be written to that map.
   ValuesMap reference;
   ValuesMap changes;
   changes[kKey1] = kValueNull;
   changes[kKey2] = kValue4;
   changes[kKey3] = kValue4;
   reference[kKey2] = kValue4;
   reference[kKey3] = kValue4;
@@ skipping 27 matching lines @@
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   data1[kKey3] = kValue3;
   ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data1));
   ValuesMap data2;
   data2[kKey1] = kValue2;
   data2[kKey3] = kValue1;
   ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin2, false, data2));
 
   // Make a shallow copy and delete the original namespace.
-  EXPECT_TRUE(db_->CloneNamespace(1, 5));;
+  db_->CloneNamespace(1, 5);
   EXPECT_TRUE(db_->DeleteNamespace(1));
 
   // The original namespace has no data.
   CheckDatabaseConsistency();
   CheckAreaData(1, kOrigin1, ValuesMap());
   CheckAreaData(1, kOrigin2, ValuesMap());
   // But the copy persists.
   CheckAreaData(5, kOrigin1, data1);
   CheckAreaData(5, kOrigin2, data2);
 }
 
 TEST_F(SessionStorageDatabaseTest, DeleteArea) {
   // Write data for a namespace, for 2 origins.
   ValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   data1[kKey3] = kValue3;
   ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data1));
   ValuesMap data2;
   data2[kKey1] = kValue2;
   data2[kKey3] = kValue1;
   ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin2, false, data2));
 
-  EXPECT_TRUE(db_->DeleteArea(1, kOrigin2));
+  db_->DeleteArea(1, kOrigin2);
   CheckDatabaseConsistency();
   // The data for the non-deleted origin persists.
   CheckAreaData(1, kOrigin1, data1);
   // The data for the deleted origin is gone.
   CheckAreaData(1, kOrigin2, ValuesMap());
 }
 
 TEST_F(SessionStorageDatabaseTest, DeleteAreaWithShallowCopy) {
   // Write data for a namespace, for 2 origins.
   ValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   data1[kKey3] = kValue3;
   ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data1));
   ValuesMap data2;
   data2[kKey1] = kValue2;
   data2[kKey3] = kValue1;
   ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin2, false, data2));
 
   // Make a shallow copy and delete an origin from the original namespace.
-  EXPECT_TRUE(db_->CloneNamespace(1, 5));
-  EXPECT_TRUE(db_->DeleteArea(1, kOrigin1));
+  db_->CloneNamespace(1, 5);
+  db_->DeleteArea(1, kOrigin1);
   CheckDatabaseConsistency();
 
   // The original namespace has data for only the non-deleted origin.
   CheckAreaData(1, kOrigin1, ValuesMap());
   CheckAreaData(1, kOrigin2, data2);
   // But the copy persists.
   CheckAreaData(5, kOrigin1, data1);
   CheckAreaData(5, kOrigin2, data2);
 }
 
@@ skipping 71 matching lines @@
 
   // Close the database and recreate it.
   ResetDatabase();
 
   // Create another namespace with id 1.
   ValuesMap data2;
   data2[kKey1] = kValue3;
   EXPECT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data2));
 
   // Make a shallow copy of the newly created namespace.
-  EXPECT_TRUE(db_->CloneNamespace(1, 20));
+  db_->CloneNamespace(1, 20);
 
   // The clone contains values from the newly created namespace.
   CheckAreaData(20, kOrigin1, data2);
   CheckAreaData(1, kOrigin1, data2);
 
   // The values for the old namespace 1 are still accessible via id -1.
   CheckAreaData(-1, kOrigin1, data1);
 
   // Close the database and recreate it.
   ResetDatabase();
@@ skipping 13 matching lines @@
 
   // Close the database and recreate it.
   ResetDatabase();
 
   // Create another namespace with id 1.
   ValuesMap data2;
   data2[kKey1] = kValue3;
   EXPECT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data2));
 
   // Make a shallow copy of the newly created namespace.
-  EXPECT_TRUE(db_->CloneNamespace(1, 20));
+  db_->CloneNamespace(1, 20);
 
   // Now the values can be altered and a deep copy will be made.
   ValuesMap data3;
   data3[kKey1] = kValue2;
   EXPECT_TRUE(db_->CommitAreaChanges(20, kOrigin1, false, data3));
 
   CheckAreaData(20, kOrigin1, data3);
   CheckAreaData(1, kOrigin1, data2);
 
   // The values for the old namespace 1 are still accessible via id -1.
@@ skipping 17 matching lines @@
 
   // Close the database and recreate it.
   ResetDatabase();
 
   // Create another namespace with id 1.
   ValuesMap data2;
   data2[kKey1] = kValue3;
   EXPECT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data2));
 
   // Delete kOrigin1 from the newly created namespace.
-  EXPECT_TRUE(db_->DeleteArea(1, kOrigin1));
+  db_->DeleteArea(1, kOrigin1);
 
   // Namespace 1 is empty.
   CheckAreaData(1, kOrigin1, ValuesMap());
 
   // The values for the old namespace 1 are still accessible via id -1.
   CheckAreaData(-1, kOrigin1, data1);
 }
 
 TEST_F(SessionStorageDatabaseTest, NamespaceOffsetDeleteNamespace) {
   // Create a namespace with id 1.
@@ skipping 14 matching lines @@
   EXPECT_TRUE(db_->DeleteNamespace(1));
 
   // Namespace 1 is empty.
   CheckAreaData(1, kOrigin1, ValuesMap());
 
   // The values for the old namespace 1 are still accessible via id -1.
   CheckAreaData(-1, kOrigin1, data1);
 }
 
 }  // namespace dom_storage