Chromium Code Reviews| Index: chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc |
| diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc |
| index ef04e015ba74d4318e4a28ed5e36910cb7c1429d..01830dc4f56047b04869ae5e2b79d1d02e975b85 100644 |
| --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc |
| +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc |
| @@ -13,6 +13,7 @@ |
| #include "chrome/common/chrome_version_info.h" |
| #include "chrome/common/extensions/features/feature.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| +#include "webkit/fileapi/file_system_url.h" |
| #include "webkit/fileapi/syncable/sync_status_code.h" |
| #include "webkit/quota/quota_manager.h" |
| @@ -66,6 +67,32 @@ ACTION_P(NotifyOkStateAndCallback, mock_remote_service) { |
| FROM_HERE, base::Bind(arg1, fileapi::SYNC_STATUS_OK)); |
| } |
| +ACTION_P(CaptureRemoteSyncObserver, observer_list) { |
| + observer_list->AddObserver(arg0); |
| +} |
| + |
| +ACTION_P2(UpdateRemoteChangeQueue, origin, observer_list) { |
| + *origin = arg0; |
| + FOR_EACH_OBSERVER( |
| + RemoteFileSyncService::Observer, *observer_list, |
| + OnRemoteChangeQueueUpdated(1)); |
| +} |
| + |
| +ACTION_P3(ProcessRemoteChangeAndCallBack, |
| + origin, mock_remote_servicem, observer_list) { |
| + fileapi::FileSystemURL mockUrl(*origin, |
|
kinuko
2013/01/08 06:02:38
naming: mockUrl -> mock_url (we're in c++!)
calvinlo
2013/01/08 08:32:21
Done.
|
| + fileapi::kFileSystemTypeTest, |
| + FilePath(FILE_PATH_LITERAL("foo"))); |
| + FOR_EACH_OBSERVER( |
| + RemoteFileSyncService::Observer, *observer_list, |
| + OnRemoteChangeQueueUpdated(0)); |
| + base::MessageLoopProxy::current()->PostTask( |
| + FROM_HERE, base::Bind(arg1, |
| + fileapi::SYNC_STATUS_OK, |
| + mockUrl, |
| + fileapi::SYNC_OPERATION_ADDED)); |
| +} |
| + |
| } // namespace |
| // TODO(calvinlo): Add Chrome OS support for syncable file system |
| @@ -82,9 +109,23 @@ IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetUsageAndQuota) { |
| << message_; |
| } |
| +IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, OnFileSynced) { |
| + // Mock a pending remote change to be synced. |
| + ObserverList<RemoteFileSyncService::Observer> observer_list; |
| + EXPECT_CALL(*mock_remote_service(), AddObserver(_)) |
| + .WillOnce(CaptureRemoteSyncObserver(&observer_list)); |
|
kinuko
2013/01/08 06:02:38
I think you can omit this observer_list part but c
calvinlo
2013/01/08 08:32:21
Done. Sorry, I didn't know you could do that befor
|
| + GURL origin; |
| + EXPECT_CALL(*mock_remote_service(), RegisterOriginForTrackingChanges(_, _)) |
| + .WillOnce(UpdateRemoteChangeQueue(&origin, &observer_list)); |
| + EXPECT_CALL(*mock_remote_service(), ProcessRemoteChange(_, _)) |
| + .WillOnce(ProcessRemoteChangeAndCallBack(&origin, mock_remote_service(), |
| + &observer_list)); |
| + ASSERT_TRUE(RunPlatformAppTest("sync_file_system/on_file_synced")) |
| + << message_; |
| +} |
| + |
| IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, OnSyncStateChanged) { |
| - EXPECT_CALL(*mock_remote_service(), |
| - RegisterOriginForTrackingChanges(_, _)) |
| + EXPECT_CALL(*mock_remote_service(), RegisterOriginForTrackingChanges(_, _)) |
| .WillOnce(NotifyOkStateAndCallback(mock_remote_service())); |
| ASSERT_TRUE(RunPlatformAppTest("sync_file_system/on_sync_state_changed")) |
| << message_; |