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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/live_sync/performance_bookmarks_sync_test.cc

Issue 7259005: Allow sync integration tests to operate on multiple datatypes: Preferences + Bookmarks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add BookmarksHelper class. (TODO: Trim lines to 80 chars) Created 9 years, 5 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
« no previous file with comments | « chrome/test/live_sync/multiple_client_preferences_sync_test.cc ('k') | chrome/test/live_sync/performance_live_bookmarks_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/live_sync/performance_bookmarks_sync_test.cc
diff --git a/chrome/test/live_sync/performance_live_bookmarks_sync_test.cc b/chrome/test/live_sync/performance_bookmarks_sync_test.cc
similarity index 66%
rename from chrome/test/live_sync/performance_live_bookmarks_sync_test.cc
rename to chrome/test/live_sync/performance_bookmarks_sync_test.cc
index bc206088d52f1b3bdf98e53529f0ada0b5451e3a..031d365e6dafb17f37d058300000225269f1a566 100644
--- a/chrome/test/live_sync/performance_live_bookmarks_sync_test.cc
+++ b/chrome/test/live_sync/performance_bookmarks_sync_test.cc
@@ -3,7 +3,8 @@
// found in the LICENSE file.
#include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/test/live_sync/live_bookmarks_sync_test.h"
+#include "chrome/test/live_sync/bookmarks_helper.h"
+#include "chrome/test/live_sync/live_sync_test.h"
#include "chrome/test/live_sync/live_sync_timing_helper.h"
static const int kNumBookmarks = 150;
@@ -16,10 +17,12 @@ static const int kBenchmarkPoints[] = {1, 10, 20, 30, 40, 50, 75, 100, 125,
// TODO(braffert): Move this class into its own .h/.cc files. What should the
// class files be named as opposed to the file containing the tests themselves?
-class PerformanceLiveBookmarksSyncTest
- : public TwoClientLiveBookmarksSyncTest {
+class PerformanceLiveBookmarksSyncTest : public LiveSyncTest {
public:
- PerformanceLiveBookmarksSyncTest() : url_number(0), url_title_number(0) {}
+ PerformanceLiveBookmarksSyncTest()
+ : LiveSyncTest(TWO_CLIENT),
+ url_number(0),
+ url_title_number(0) {}
// Adds |num_urls| new unique bookmarks to the bookmark bar for |profile|.
void AddURLs(int profile, int num_urls);
@@ -48,21 +51,21 @@ class PerformanceLiveBookmarksSyncTest
void PerformanceLiveBookmarksSyncTest::AddURLs(int profile, int num_urls) {
for (int i = 0; i < num_urls; ++i) {
- ASSERT_TRUE(AddURL(
+ ASSERT_TRUE(BookmarksHelper::AddURL(
profile, 0, NextIndexedURLTitle(), GURL(NextIndexedURL())) != NULL);
}
}
void PerformanceLiveBookmarksSyncTest::UpdateURLs(int profile) {
- for (int i = 0; i < GetBookmarkBarNode(profile)->child_count(); ++i) {
- ASSERT_TRUE(SetURL(profile, GetBookmarkBarNode(profile)->GetChild(i),
+ for (int i = 0; i < BookmarksHelper::GetBookmarkBarNode(profile)->child_count(); ++i) {
+ ASSERT_TRUE(BookmarksHelper::SetURL(profile, BookmarksHelper::GetBookmarkBarNode(profile)->GetChild(i),
GURL(NextIndexedURL())));
}
}
void PerformanceLiveBookmarksSyncTest::RemoveURLs(int profile) {
- while (GetBookmarkBarNode(profile)->child_count()) {
- Remove(profile, GetBookmarkBarNode(profile), 0);
+ while (BookmarksHelper::GetBookmarkBarNode(profile)->child_count()) {
+ BookmarksHelper::Remove(profile, BookmarksHelper::GetBookmarkBarNode(profile), 0);
}
}
@@ -71,16 +74,16 @@ void PerformanceLiveBookmarksSyncTest::Cleanup() {
RemoveURLs(i);
}
ASSERT_TRUE(AwaitQuiescence());
- ASSERT_EQ(0, GetBookmarkBarNode(0)->child_count());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_EQ(0, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+ ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
}
std::string PerformanceLiveBookmarksSyncTest::NextIndexedURL() {
- return IndexedURL(url_number++);
+ return BookmarksHelper::IndexedURL(url_number++);
}
std::wstring PerformanceLiveBookmarksSyncTest::NextIndexedURLTitle() {
- return IndexedURLTitle(url_title_number++);
+ return BookmarksHelper::IndexedURLTitle(url_title_number++);
}
// TODO(braffert): Possibly split each of these into separate up / down test
@@ -93,14 +96,14 @@ IN_PROC_BROWSER_TEST_F(PerformanceLiveBookmarksSyncTest, Add) {
DisableNetwork(GetProfile(1));
AddURLs(0, kNumBookmarks);
base::TimeDelta dt_up = LiveSyncTimingHelper::TimeSyncCycle(GetClient(0));
- ASSERT_EQ(kNumBookmarks, GetBookmarkBarNode(0)->child_count());
- ASSERT_EQ(0, GetBookmarkBarNode(1)->child_count());
+ ASSERT_EQ(kNumBookmarks, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+ ASSERT_EQ(0, BookmarksHelper::GetBookmarkBarNode(1)->child_count());
EnableNetwork(GetProfile(1));
base::TimeDelta dt_down =
LiveSyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
- ASSERT_EQ(kNumBookmarks, GetBookmarkBarNode(0)->child_count());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_EQ(kNumBookmarks, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+ ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
// TODO(braffert): Compare timings against some target value.
}
@@ -112,20 +115,20 @@ IN_PROC_BROWSER_TEST_F(PerformanceLiveBookmarksSyncTest, Update) {
AddURLs(0, kNumBookmarks);
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
DisableNetwork(GetProfile(1));
UpdateURLs(0);
base::TimeDelta dt_up = LiveSyncTimingHelper::TimeSyncCycle(GetClient(0));
- ASSERT_EQ(kNumBookmarks, GetBookmarkBarNode(0)->child_count());
- ASSERT_EQ(kNumBookmarks, GetBookmarkBarNode(1)->child_count());
- ASSERT_FALSE(AllModelsMatch());
+ ASSERT_EQ(kNumBookmarks, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+ ASSERT_EQ(kNumBookmarks, BookmarksHelper::GetBookmarkBarNode(1)->child_count());
+ ASSERT_FALSE(BookmarksHelper::AllModelsMatch());
EnableNetwork(GetProfile(1));
base::TimeDelta dt_down =
LiveSyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
- ASSERT_EQ(kNumBookmarks, GetBookmarkBarNode(0)->child_count());
- ASSERT_EQ(kNumBookmarks, GetBookmarkBarNode(1)->child_count());
+ ASSERT_EQ(kNumBookmarks, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+ ASSERT_EQ(kNumBookmarks, BookmarksHelper::GetBookmarkBarNode(1)->child_count());
// TODO(braffert): Compare timings against some target value.
}
@@ -137,19 +140,19 @@ IN_PROC_BROWSER_TEST_F(PerformanceLiveBookmarksSyncTest, Delete) {
AddURLs(0, kNumBookmarks);
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
DisableNetwork(GetProfile(1));
RemoveURLs(0);
base::TimeDelta dt_up = LiveSyncTimingHelper::TimeSyncCycle(GetClient(0));
- ASSERT_EQ(0, GetBookmarkBarNode(0)->child_count());
- ASSERT_EQ(kNumBookmarks, GetBookmarkBarNode(1)->child_count());
+ ASSERT_EQ(0, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+ ASSERT_EQ(kNumBookmarks, BookmarksHelper::GetBookmarkBarNode(1)->child_count());
EnableNetwork(GetProfile(1));
base::TimeDelta dt_down =
LiveSyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
- ASSERT_EQ(0, GetBookmarkBarNode(0)->child_count());
- ASSERT_EQ(0, GetBookmarkBarNode(1)->child_count());
+ ASSERT_EQ(0, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+ ASSERT_EQ(0, BookmarksHelper::GetBookmarkBarNode(1)->child_count());
// TODO(braffert): Compare timings against some target value.
}
@@ -165,15 +168,15 @@ IN_PROC_BROWSER_TEST_F(PerformanceLiveBookmarksSyncTest, DISABLED_Benchmark) {
DisableNetwork(GetProfile(1));
AddURLs(0, num_bookmarks);
base::TimeDelta dt_up = LiveSyncTimingHelper::TimeSyncCycle(GetClient(0));
- ASSERT_EQ(num_bookmarks, GetBookmarkBarNode(0)->child_count());
- ASSERT_EQ(0, GetBookmarkBarNode(1)->child_count());
+ ASSERT_EQ(num_bookmarks, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+ ASSERT_EQ(0, BookmarksHelper::GetBookmarkBarNode(1)->child_count());
// Enable client 1 and time update (new bookmarks).
EnableNetwork(GetProfile(1));
base::TimeDelta dt_down =
LiveSyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
- ASSERT_EQ(num_bookmarks, GetBookmarkBarNode(0)->child_count());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_EQ(num_bookmarks, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+ ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
VLOG(0) << std::endl << "Add: " << num_bookmarks << " "
<< dt_up.InSecondsF() << " " << dt_down.InSecondsF();
@@ -182,16 +185,16 @@ IN_PROC_BROWSER_TEST_F(PerformanceLiveBookmarksSyncTest, DISABLED_Benchmark) {
DisableNetwork(GetProfile(1));
UpdateURLs(0);
dt_up = LiveSyncTimingHelper::TimeSyncCycle(GetClient(0));
- ASSERT_EQ(num_bookmarks, GetBookmarkBarNode(0)->child_count());
- ASSERT_EQ(num_bookmarks, GetBookmarkBarNode(1)->child_count());
- ASSERT_FALSE(AllModelsMatch());
+ ASSERT_EQ(num_bookmarks, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+ ASSERT_EQ(num_bookmarks, BookmarksHelper::GetBookmarkBarNode(1)->child_count());
+ ASSERT_FALSE(BookmarksHelper::AllModelsMatch());
// Enable client 1 and time update (changed bookmarks).
EnableNetwork(GetProfile(1));
dt_down =
LiveSyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
- ASSERT_EQ(num_bookmarks, GetBookmarkBarNode(0)->child_count());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_EQ(num_bookmarks, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+ ASSERT_TRUE(BookmarksHelper::AllModelsMatch());
VLOG(0) << std::endl << "Update: " << num_bookmarks << " "
<< dt_up.InSecondsF() << " " << dt_down.InSecondsF();
@@ -200,15 +203,15 @@ IN_PROC_BROWSER_TEST_F(PerformanceLiveBookmarksSyncTest, DISABLED_Benchmark) {
DisableNetwork(GetProfile(1));
RemoveURLs(0);
dt_up = LiveSyncTimingHelper::TimeSyncCycle(GetClient(0));
- ASSERT_EQ(0, GetBookmarkBarNode(0)->child_count());
- ASSERT_EQ(num_bookmarks, GetBookmarkBarNode(1)->child_count());
+ ASSERT_EQ(0, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+ ASSERT_EQ(num_bookmarks, BookmarksHelper::GetBookmarkBarNode(1)->child_count());
// Enable client 1 and time update (deleted bookmarks).
EnableNetwork(GetProfile(1));
dt_down =
LiveSyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
- ASSERT_EQ(0, GetBookmarkBarNode(0)->child_count());
- ASSERT_EQ(0, GetBookmarkBarNode(1)->child_count());
+ ASSERT_EQ(0, BookmarksHelper::GetBookmarkBarNode(0)->child_count());
+ ASSERT_EQ(0, BookmarksHelper::GetBookmarkBarNode(1)->child_count());
VLOG(0) << std::endl << "Delete: " << num_bookmarks << " "
<< dt_up.InSecondsF() << " " << dt_down.InSecondsF();
« no previous file with comments | « chrome/test/live_sync/multiple_client_preferences_sync_test.cc ('k') | chrome/test/live_sync/performance_live_bookmarks_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698