| OLD | NEW |
| 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 2477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2488 EXPECT_FALSE(fred.Get(IS_UNAPPLIED_UPDATE)); | 2488 EXPECT_FALSE(fred.Get(IS_UNAPPLIED_UPDATE)); |
| 2489 } | 2489 } |
| 2490 syncer_events_.clear(); | 2490 syncer_events_.clear(); |
| 2491 } | 2491 } |
| 2492 | 2492 |
| 2493 // TODO(ncarter): This test is bogus, but it actually seems to hit an | 2493 // TODO(ncarter): This test is bogus, but it actually seems to hit an |
| 2494 // interesting case the 4th time SyncShare is called. | 2494 // interesting case the 4th time SyncShare is called. |
| 2495 // TODO(chron): The fourth time that SyncShare is called it crashes. | 2495 // TODO(chron): The fourth time that SyncShare is called it crashes. |
| 2496 // This seems to be due to a bug in the conflict set building logic. | 2496 // This seems to be due to a bug in the conflict set building logic. |
| 2497 // http://crbug.com/46621 | 2497 // http://crbug.com/46621 |
| 2498 TEST_F(SyncerTest, FAILS_ServerDeletingFolderWeHaveAnOpenEntryIn) { | 2498 TEST_F(SyncerTest, DISABLED_ServerDeletingFolderWeHaveAnOpenEntryIn) { |
| 2499 ScopedDirLookup dir(syncdb_.manager(), syncdb_.name()); | 2499 ScopedDirLookup dir(syncdb_.manager(), syncdb_.name()); |
| 2500 CHECK(dir.good()); | 2500 CHECK(dir.good()); |
| 2501 mock_server_->AddUpdateBookmark(1, 0, "bob", 1, 10); | 2501 mock_server_->AddUpdateBookmark(1, 0, "bob", 1, 10); |
| 2502 mock_server_->AddUpdateDirectory(2, 0, "fred", 1, 10); | 2502 mock_server_->AddUpdateDirectory(2, 0, "fred", 1, 10); |
| 2503 syncer_->SyncShare(this); | 2503 syncer_->SyncShare(this); |
| 2504 { | 2504 { |
| 2505 WriteTransaction trans(dir, UNITTEST, __FILE__, __LINE__); | 2505 WriteTransaction trans(dir, UNITTEST, __FILE__, __LINE__); |
| 2506 MutableEntry bob(&trans, GET_BY_ID, ids_.FromNumber(1)); | 2506 MutableEntry bob(&trans, GET_BY_ID, ids_.FromNumber(1)); |
| 2507 ASSERT_TRUE(bob.good()); | 2507 ASSERT_TRUE(bob.good()); |
| 2508 bob.Put(IS_UNSYNCED, true); | 2508 bob.Put(IS_UNSYNCED, true); |
| (...skipping 1843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4352 Add(low_id_); | 4352 Add(low_id_); |
| 4353 Add(high_id_); | 4353 Add(high_id_); |
| 4354 syncer_->SyncShare(this); | 4354 syncer_->SyncShare(this); |
| 4355 ExpectLocalOrderIsByServerId(); | 4355 ExpectLocalOrderIsByServerId(); |
| 4356 } | 4356 } |
| 4357 | 4357 |
| 4358 const SyncerTest::CommitOrderingTest | 4358 const SyncerTest::CommitOrderingTest |
| 4359 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()}; | 4359 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()}; |
| 4360 | 4360 |
| 4361 } // namespace browser_sync | 4361 } // namespace browser_sync |
| OLD | NEW |