webkit/database/database_connections_unittest.cc - Issue 10540042: Move remaining webkit storage unit tests to content_unittests

Side by Side Diff: webkit/database/database_connections_unittest.cc

Issue 10540042: Move remaining webkit storage unit tests to content_unittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « webkit/blob/shareable_file_reference_unittest.cc ('k') | webkit/database/database_quota_client_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/bind.h"	5 #include "base/bind.h"

6 #include "base/message_loop.h"	6 #include "base/message_loop.h"

7 #include "base/threading/thread.h"	7 #include "base/threading/thread.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

9 #include "testing/gtest/include/gtest/gtest.h"	9 #include "testing/gtest/include/gtest/gtest.h"

10 #include "webkit/database/database_connections.h"	10 #include "webkit/database/database_connections.h"

(...skipping 82 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
93 EXPECT_FALSE(connections.AddConnection(kOriginId, kName));	93 EXPECT_FALSE(connections.AddConnection(kOriginId, kName));

94 EXPECT_FALSE(connections.RemoveConnection(kOriginId, kName));	94 EXPECT_FALSE(connections.RemoveConnection(kOriginId, kName));

95 EXPECT_FALSE(connections.RemoveConnection(kOriginId, kName));	95 EXPECT_FALSE(connections.RemoveConnection(kOriginId, kName));

96 EXPECT_TRUE(connections.RemoveConnection(kOriginId, kName));	96 EXPECT_TRUE(connections.RemoveConnection(kOriginId, kName));

97 }	97 }

98	98

99 TEST(DatabaseConnectionsTest, DatabaseConnectionsWrapperTest) {	99 TEST(DatabaseConnectionsTest, DatabaseConnectionsWrapperTest) {

100 const string16 kOriginId(ASCIIToUTF16("origin_id"));	100 const string16 kOriginId(ASCIIToUTF16("origin_id"));

101 const string16 kName(ASCIIToUTF16("database_name"));	101 const string16 kName(ASCIIToUTF16("database_name"));

102	102

	103 MessageLoop message_loop;

103 scoped_refptr<DatabaseConnectionsWrapper> obj(	104 scoped_refptr<DatabaseConnectionsWrapper> obj(

104 new DatabaseConnectionsWrapper);	105 new DatabaseConnectionsWrapper);

105 EXPECT_FALSE(obj->HasOpenConnections());	106 EXPECT_FALSE(obj->HasOpenConnections());

106 obj->AddOpenConnection(kOriginId, kName);	107 obj->AddOpenConnection(kOriginId, kName);

107 EXPECT_TRUE(obj->HasOpenConnections());	108 EXPECT_TRUE(obj->HasOpenConnections());

108 obj->AddOpenConnection(kOriginId, kName);	109 obj->AddOpenConnection(kOriginId, kName);

109 EXPECT_TRUE(obj->HasOpenConnections());	110 EXPECT_TRUE(obj->HasOpenConnections());

110 obj->RemoveOpenConnection(kOriginId, kName);	111 obj->RemoveOpenConnection(kOriginId, kName);

111 EXPECT_TRUE(obj->HasOpenConnections());	112 EXPECT_TRUE(obj->HasOpenConnections());

112 obj->RemoveOpenConnection(kOriginId, kName);	113 obj->RemoveOpenConnection(kOriginId, kName);

(...skipping 21 matching lines...) Expand all Loading...
134 MessageLoop::current()->PostTask(	135 MessageLoop::current()->PostTask(

135 FROM_HERE,	136 FROM_HERE,

136 base::Bind(&ScheduleRemoveConnectionTask, &thread, kOriginId, kName, obj,	137 base::Bind(&ScheduleRemoveConnectionTask, &thread, kOriginId, kName, obj,

137 &did_task_execute));	138 &did_task_execute));

138 obj->WaitForAllDatabasesToClose(); // should return after the task executes	139 obj->WaitForAllDatabasesToClose(); // should return after the task executes

139 EXPECT_TRUE(did_task_execute);	140 EXPECT_TRUE(did_task_execute);

140 EXPECT_FALSE(obj->HasOpenConnections());	141 EXPECT_FALSE(obj->HasOpenConnections());

141 }	142 }

142	143

143 } // namespace webkit_database	144 } // namespace webkit_database

OLD	NEW