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

Side by Side Diff: chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc

Issue 11368160: Added combined test for Syncable File System to write file and then get that usage gets updated. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix after rebase Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/test/data/extensions/api_test/sync_file_system/delete_file_system/manifest.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
8 #include "chrome/browser/sync_file_system/local_change_processor.h" 8 #include "chrome/browser/sync_file_system/local_change_processor.h"
9 #include "chrome/browser/sync_file_system/mock_remote_file_sync_service.h" 9 #include "chrome/browser/sync_file_system/mock_remote_file_sync_service.h"
10 #include "chrome/browser/sync_file_system/sync_file_system_service.h" 10 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 } 50 }
51 51
52 private: 52 private:
53 extensions::Feature::ScopedCurrentChannel current_channel_; 53 extensions::Feature::ScopedCurrentChannel current_channel_;
54 ::testing::NiceMock<MockRemoteFileSyncService>* mock_remote_service_; 54 ::testing::NiceMock<MockRemoteFileSyncService>* mock_remote_service_;
55 int64 real_default_quota_; 55 int64 real_default_quota_;
56 }; 56 };
57 57
58 } // namespace 58 } // namespace
59 59
60 // TODO(calvinlo): Add Chrome OS support for syncable file system
61 #if !defined(OS_CHROMEOS)
62
60 // TODO(benwells): Re-enable this test. 63 // TODO(benwells): Re-enable this test.
61 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, DISABLED_DeleteFileSystem) { 64 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, DISABLED_DeleteFileSystem) {
62 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/delete_file_system")) 65 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/delete_file_system"))
63 << message_; 66 << message_;
64 } 67 }
65 68
66 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetUsageAndQuota) { 69 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetUsageAndQuota) {
67 ASSERT_TRUE(RunExtensionTest("sync_file_system/get_usage_and_quota")) 70 ASSERT_TRUE(RunExtensionTest("sync_file_system/get_usage_and_quota"))
68 << message_; 71 << message_;
69 } 72 }
70 73
71 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, RequestFileSystem) { 74 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, RequestFileSystem) {
72 EXPECT_CALL(*mock_remote_service(), 75 EXPECT_CALL(*mock_remote_service(),
73 RegisterOriginForTrackingChanges(_, _)).Times(1); 76 RegisterOriginForTrackingChanges(_, _)).Times(1);
74 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/request_file_system")) 77 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/request_file_system"))
75 << message_; 78 << message_;
76 } 79 }
77 80
81 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, WriteFileThenGetUsage) {
82 ASSERT_TRUE(RunPlatformAppTest("sync_file_system/write_file_then_get_usage"))
83 << message_;
84 }
85
86 #endif // !defined(OS_CHROMEOS)
87
78 } // namespace chrome 88 } // namespace chrome
89
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/extensions/api_test/sync_file_system/delete_file_system/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698