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

Side by Side Diff: chrome/browser/sync/engine/syncer_unittest.cc

Issue 2819011: TTF: Reenable some disabled tests. (Closed)
Patch Set: Created 10 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 // Syncer unit tests. Unfortunately a lot of these tests 5 // Syncer unit tests. Unfortunately a lot of these tests
6 // are outdated and need to be reworked and updated. 6 // are outdated and need to be reworked and updated.
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 2540 matching lines...) Expand 10 before | Expand all | Expand 10 after
2551 EXPECT_TRUE(fred.Get(IS_UNSYNCED)); 2551 EXPECT_TRUE(fred.Get(IS_UNSYNCED));
2552 EXPECT_FALSE(fred.Get(IS_UNAPPLIED_UPDATE)); 2552 EXPECT_FALSE(fred.Get(IS_UNAPPLIED_UPDATE));
2553 } 2553 }
2554 syncer_events_.clear(); 2554 syncer_events_.clear();
2555 } 2555 }
2556 2556
2557 // TODO(ncarter): This test is bogus, but it actually seems to hit an 2557 // TODO(ncarter): This test is bogus, but it actually seems to hit an
2558 // interesting case the 4th time SyncShare is called. 2558 // interesting case the 4th time SyncShare is called.
2559 // TODO(chron): The fourth time that SyncShare is called it crashes. 2559 // TODO(chron): The fourth time that SyncShare is called it crashes.
2560 // This seems to be due to a bug in the conflict set building logic. 2560 // This seems to be due to a bug in the conflict set building logic.
2561 // http://crbug.com/46621
2561 TEST_F(SyncerTest, DISABLED_ServerDeletingFolderWeHaveAnOpenEntryIn) { 2562 TEST_F(SyncerTest, DISABLED_ServerDeletingFolderWeHaveAnOpenEntryIn) {
2562 ScopedDirLookup dir(syncdb_.manager(), syncdb_.name()); 2563 ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
2563 CHECK(dir.good()); 2564 CHECK(dir.good());
2564 mock_server_->AddUpdateBookmark(1, 0, "bob", 1, 10); 2565 mock_server_->AddUpdateBookmark(1, 0, "bob", 1, 10);
2565 mock_server_->AddUpdateDirectory(2, 0, "fred", 1, 10); 2566 mock_server_->AddUpdateDirectory(2, 0, "fred", 1, 10);
2566 syncer_->SyncShare(this); 2567 syncer_->SyncShare(this);
2567 { 2568 {
2568 WriteTransaction trans(dir, UNITTEST, __FILE__, __LINE__); 2569 WriteTransaction trans(dir, UNITTEST, __FILE__, __LINE__);
2569 MutableEntry bob(&trans, GET_BY_ID, ids_.FromNumber(1)); 2570 MutableEntry bob(&trans, GET_BY_ID, ids_.FromNumber(1));
2570 ASSERT_TRUE(bob.good()); 2571 ASSERT_TRUE(bob.good());
(...skipping 1842 matching lines...) Expand 10 before | Expand all | Expand 10 after
4413 Add(low_id_); 4414 Add(low_id_);
4414 Add(high_id_); 4415 Add(high_id_);
4415 syncer_->SyncShare(this); 4416 syncer_->SyncShare(this);
4416 ExpectLocalOrderIsByServerId(); 4417 ExpectLocalOrderIsByServerId();
4417 } 4418 }
4418 4419
4419 const SyncerTest::CommitOrderingTest 4420 const SyncerTest::CommitOrderingTest
4420 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()}; 4421 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()};
4421 4422
4422 } // namespace browser_sync 4423 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698