| 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 #include <list> | 5 #include <list> |
| 6 #include <map> | 6 #include <map> |
| 7 | 7 |
| 8 #include "base/lock.h" | 8 #include "base/lock.h" |
| 9 #include "base/scoped_ptr.h" | 9 #include "base/scoped_ptr.h" |
| 10 #include "base/time.h" | 10 #include "base/time.h" |
| (...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 886 HttpResponse::SERVER_CONNECTION_OK, | 886 HttpResponse::SERVER_CONNECTION_OK, |
| 887 true}; | 887 true}; |
| 888 connection()->channel()->NotifyListeners(e); | 888 connection()->channel()->NotifyListeners(e); |
| 889 | 889 |
| 890 interceptor.WaitForSyncShare(1, TimeDelta::FromSeconds(10)); | 890 interceptor.WaitForSyncShare(1, TimeDelta::FromSeconds(10)); |
| 891 EXPECT_FALSE(interceptor.times_sync_occured().empty()); | 891 EXPECT_FALSE(interceptor.times_sync_occured().empty()); |
| 892 | 892 |
| 893 EXPECT_TRUE(syncer_thread()->Stop(2000)); | 893 EXPECT_TRUE(syncer_thread()->Stop(2000)); |
| 894 } | 894 } |
| 895 | 895 |
| 896 TEST_F(SyncerThreadWithSyncerTest, Pause) { | 896 // TODO(zea): Disabled, along with PauseWhenNotConnected, due to stalling on |
| 897 // windows, preventing further sync unit tests from running. See crbug/39070. |
| 898 TEST_F(SyncerThreadWithSyncerTest, DISABLED_Pause) { |
| 897 WaitableEvent sync_cycle_ended_event(false, false); | 899 WaitableEvent sync_cycle_ended_event(false, false); |
| 898 WaitableEvent paused_event(false, false); | 900 WaitableEvent paused_event(false, false); |
| 899 WaitableEvent resumed_event(false, false); | 901 WaitableEvent resumed_event(false, false); |
| 900 PreventThreadFromPolling(); | 902 PreventThreadFromPolling(); |
| 901 | 903 |
| 902 ListenerMock listener; | 904 ListenerMock listener; |
| 903 TestScopedSessionEventListener reg(context_, &listener); | 905 TestScopedSessionEventListener reg(context_, &listener); |
| 904 EXPECT_CALL(listener, OnSyncEngineEvent( | 906 EXPECT_CALL(listener, OnSyncEngineEvent( |
| 905 Field(&SyncEngineEvent::what_happened, | 907 Field(&SyncEngineEvent::what_happened, |
| 906 SyncEngineEvent::STATUS_CHANGED))). | 908 SyncEngineEvent::STATUS_CHANGED))). |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 991 EXPECT_CALL(listener, OnSyncEngineEvent( | 993 EXPECT_CALL(listener, OnSyncEngineEvent( |
| 992 Field(&SyncEngineEvent::what_happened, | 994 Field(&SyncEngineEvent::what_happened, |
| 993 SyncEngineEvent::SYNC_CYCLE_ENDED))). | 995 SyncEngineEvent::SYNC_CYCLE_ENDED))). |
| 994 WillOnce(SignalEvent(&sync_cycle_ended_event)); | 996 WillOnce(SignalEvent(&sync_cycle_ended_event)); |
| 995 syncer_thread()->NudgeSyncer(0, SyncerThread::kUnknown); | 997 syncer_thread()->NudgeSyncer(0, SyncerThread::kUnknown); |
| 996 ASSERT_TRUE(sync_cycle_ended_event.TimedWait(max_wait_time_)); | 998 ASSERT_TRUE(sync_cycle_ended_event.TimedWait(max_wait_time_)); |
| 997 | 999 |
| 998 EXPECT_TRUE(syncer_thread()->Stop(2000)); | 1000 EXPECT_TRUE(syncer_thread()->Stop(2000)); |
| 999 } | 1001 } |
| 1000 | 1002 |
| 1001 TEST_F(SyncerThreadWithSyncerTest, PauseWhenNotConnected) { | 1003 // See TODO comment on the "Pause" test above. |
| 1004 TEST_F(SyncerThreadWithSyncerTest, DISABLED_PauseWhenNotConnected) { |
| 1002 WaitableEvent sync_cycle_ended_event(false, false); | 1005 WaitableEvent sync_cycle_ended_event(false, false); |
| 1003 WaitableEvent event(false, false); | 1006 WaitableEvent event(false, false); |
| 1004 ListenerMock listener; | 1007 ListenerMock listener; |
| 1005 TestScopedSessionEventListener reg(context_, &listener); | 1008 TestScopedSessionEventListener reg(context_, &listener); |
| 1006 PreventThreadFromPolling(); | 1009 PreventThreadFromPolling(); |
| 1007 | 1010 |
| 1008 EXPECT_CALL(listener, OnSyncEngineEvent( | 1011 EXPECT_CALL(listener, OnSyncEngineEvent( |
| 1009 Field(&SyncEngineEvent::what_happened, | 1012 Field(&SyncEngineEvent::what_happened, |
| 1010 SyncEngineEvent::STATUS_CHANGED))). | 1013 SyncEngineEvent::STATUS_CHANGED))). |
| 1011 Times(AnyNumber()); | 1014 Times(AnyNumber()); |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1111 EXPECT_CALL(listener, OnSyncEngineEvent( | 1114 EXPECT_CALL(listener, OnSyncEngineEvent( |
| 1112 Field(&SyncEngineEvent::what_happened, | 1115 Field(&SyncEngineEvent::what_happened, |
| 1113 SyncEngineEvent::SYNCER_THREAD_EXITING))); | 1116 SyncEngineEvent::SYNCER_THREAD_EXITING))); |
| 1114 | 1117 |
| 1115 ASSERT_TRUE(Resume(&listener)); | 1118 ASSERT_TRUE(Resume(&listener)); |
| 1116 ASSERT_TRUE(sync_cycle_ended_event.TimedWait(max_wait_time_)); | 1119 ASSERT_TRUE(sync_cycle_ended_event.TimedWait(max_wait_time_)); |
| 1117 EXPECT_TRUE(syncer_thread()->Stop(2000)); | 1120 EXPECT_TRUE(syncer_thread()->Stop(2000)); |
| 1118 } | 1121 } |
| 1119 | 1122 |
| 1120 } // namespace browser_sync | 1123 } // namespace browser_sync |
| OLD | NEW |