Modified: trunk/Source/WebKit/chromium/ChangeLog (129169 => 129170)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-20 21:36:08 UTC (rev 129169)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-20 21:45:57 UTC (rev 129170)
@@ -1,3 +1,14 @@
+2012-09-20 David Grogan <[email protected]>
+
+ Fix IndexedDB unit tests
+ https://bugs.webkit.org/show_bug.cgi?id=97149
+
+ Reviewed by Tony Chang.
+
+ * tests/IDBDatabaseBackendTest.cpp:
+ Specify a desired version of -1 so that no version change transaction
+ is run.
+
2012-09-20 Dirk Pranke <[email protected]>
roll Chromium to r157829.
Modified: trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp (129169 => 129170)
--- trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp 2012-09-20 21:36:08 UTC (rev 129169)
+++ trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp 2012-09-20 21:45:57 UTC (rev 129170)
@@ -113,7 +113,7 @@
FakeIDBDatabaseCallbacks() { }
};
-TEST(IDBDatabaseBackendTest, DISABLED_ConnectionLifecycle)
+TEST(IDBDatabaseBackendTest, ConnectionLifecycle)
{
RefPtr<IDBFakeBackingStore> backingStore = adoptRef(new IDBFakeBackingStore());
EXPECT_TRUE(backingStore->hasOneRef());
@@ -125,11 +125,11 @@
RefPtr<MockIDBCallbacks> request1 = MockIDBCallbacks::create();
RefPtr<FakeIDBDatabaseCallbacks> connection1 = FakeIDBDatabaseCallbacks::create();
- db->openConnection(request1, connection1);
+ db->openConnectionWithVersion(request1, connection1, IDBDatabaseMetadata::NoIntVersion);
RefPtr<MockIDBCallbacks> request2 = MockIDBCallbacks::create();
RefPtr<FakeIDBDatabaseCallbacks> connection2 = FakeIDBDatabaseCallbacks::create();
- db->openConnection(request2, connection2);
+ db->openConnectionWithVersion(request2, connection2, IDBDatabaseMetadata::NoIntVersion);
db->close(connection1);
EXPECT_GT(backingStore->refCount(), 1);
@@ -172,7 +172,7 @@
WebIDBDatabaseImpl& m_webDatabase;
};
-TEST(IDBDatabaseBackendTest, DISABLED_ForcedClose)
+TEST(IDBDatabaseBackendTest, ForcedClose)
{
RefPtr<IDBFakeBackingStore> backingStore = adoptRef(new IDBFakeBackingStore());
EXPECT_TRUE(backingStore->hasOneRef());
@@ -188,7 +188,7 @@
RefPtr<MockIDBDatabaseBackendProxy> proxy = MockIDBDatabaseBackendProxy::create(webDatabase);
RefPtr<MockIDBCallbacks> request = MockIDBCallbacks::create();
- backend->openConnection(request, connectionProxy);
+ backend->openConnectionWithVersion(request, connectionProxy, IDBDatabaseMetadata::NoIntVersion);
ScriptExecutionContext* context = 0;
RefPtr<IDBDatabase> idbDatabase = IDBDatabase::create(context, proxy, connection);
