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

Side by Side Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

Issue 398423002: Sync: Refactoring of DEVICE_INFO syncable type - Part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed wrong signin_scoped_device_id assert from LocalDeviceInfoProvider. Created 6 years, 5 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) 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/mac/scoped_nsobject.h" 6 #include "base/mac/scoped_nsobject.h"
7 #include "base/strings/sys_string_conversions.h" 7 #include "base/strings/sys_string_conversions.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/sync/glue/device_info.h" 10 #include "chrome/browser/sync/glue/device_info.h"
11 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h"
11 #include "chrome/browser/sync/profile_sync_service_factory.h" 12 #include "chrome/browser/sync/profile_sync_service_factory.h"
12 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" 13 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"
13 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 14 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
14 #include "chrome/browser/ui/cocoa/run_loop_testing.h" 15 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
15 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 16 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
16 #import "chrome/browser/ui/cocoa/view_resizer_pong.h" 17 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
17 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" 18 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
18 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h" 19 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h"
19 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" 20 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
20 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 21 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
(...skipping 29 matching lines...) Expand all
50 51
51 class DummyRouter : public browser_sync::LocalSessionEventRouter { 52 class DummyRouter : public browser_sync::LocalSessionEventRouter {
52 public: 53 public:
53 virtual ~DummyRouter() {} 54 virtual ~DummyRouter() {}
54 virtual void StartRoutingTo( 55 virtual void StartRoutingTo(
55 browser_sync::LocalSessionEventHandler* handler) OVERRIDE {} 56 browser_sync::LocalSessionEventHandler* handler) OVERRIDE {}
56 virtual void Stop() OVERRIDE {} 57 virtual void Stop() OVERRIDE {}
57 }; 58 };
58 59
59 class WrenchMenuControllerTest 60 class WrenchMenuControllerTest
60 : public CocoaProfileTest, 61 : public CocoaProfileTest {
61 public browser_sync::SessionsSyncManager::SyncInternalApiDelegate {
62 public: 62 public:
63 WrenchMenuControllerTest()
64 : local_device_(new browser_sync::LocalDeviceInfoProviderMock(
65 "WrenchMenuControllerTest",
66 "Test Machine",
67 "Chromium 10k",
68 "Chrome 10k",
69 sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
70 "device_id")) {
71 }
72
73 virtual ~WrenchMenuControllerTest() {}
74
63 virtual void SetUp() OVERRIDE { 75 virtual void SetUp() OVERRIDE {
64 CocoaProfileTest::SetUp(); 76 CocoaProfileTest::SetUp();
65 ASSERT_TRUE(browser()); 77 ASSERT_TRUE(browser());
66 78
67 controller_.reset([[WrenchMenuController alloc] initWithBrowser:browser()]); 79 controller_.reset([[WrenchMenuController alloc] initWithBrowser:browser()]);
68 fake_model_.reset(new MockWrenchMenuModel); 80 fake_model_.reset(new MockWrenchMenuModel);
69 81
70 manager_.reset(new browser_sync::SessionsSyncManager( 82 manager_.reset(new browser_sync::SessionsSyncManager(
71 profile(), 83 profile(),
72 this, 84 local_device_.get(),
73 scoped_ptr<browser_sync::LocalSessionEventRouter>( 85 scoped_ptr<browser_sync::LocalSessionEventRouter>(
74 new DummyRouter()))); 86 new DummyRouter())));
75 manager_->MergeDataAndStartSyncing( 87 manager_->MergeDataAndStartSyncing(
76 syncer::SESSIONS, 88 syncer::SESSIONS,
77 syncer::SyncDataList(), 89 syncer::SyncDataList(),
78 scoped_ptr<syncer::SyncChangeProcessor>( 90 scoped_ptr<syncer::SyncChangeProcessor>(
79 new syncer::FakeSyncChangeProcessor), 91 new syncer::FakeSyncChangeProcessor),
80 scoped_ptr<syncer::SyncErrorFactory>( 92 scoped_ptr<syncer::SyncErrorFactory>(
81 new syncer::SyncErrorFactoryMock)); 93 new syncer::SyncErrorFactoryMock));
82 } 94 }
83 95
84 virtual scoped_ptr<browser_sync::DeviceInfo> GetLocalDeviceInfo()
85 const OVERRIDE {
86 return scoped_ptr<browser_sync::DeviceInfo>(
87 new browser_sync::DeviceInfo(GetLocalSyncCacheGUID(),
88 "Test Machine",
89 "Chromium 10k",
90 "Chrome 10k",
91 sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
92 "device_id"));
93 }
94
95 virtual std::string GetLocalSyncCacheGUID() const OVERRIDE {
96 return "WrenchMenuControllerTest";
97 }
98
99 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) { 96 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) {
100 helper->ExportToSessionsSyncManager(manager_.get()); 97 helper->ExportToSessionsSyncManager(manager_.get());
101 } 98 }
102 99
103 browser_sync::OpenTabsUIDelegate* GetOpenTabsDelegate() { 100 browser_sync::OpenTabsUIDelegate* GetOpenTabsDelegate() {
104 return manager_.get(); 101 return manager_.get();
105 } 102 }
106 103
107 virtual void TearDown() OVERRIDE { 104 virtual void TearDown() OVERRIDE {
108 fake_model_.reset(); 105 fake_model_.reset();
109 controller_.reset(); 106 controller_.reset();
110 manager_.reset(); 107 manager_.reset();
111 CocoaProfileTest::TearDown(); 108 CocoaProfileTest::TearDown();
112 } 109 }
113 110
114 WrenchMenuController* controller() { 111 WrenchMenuController* controller() {
115 return controller_.get(); 112 return controller_.get();
116 } 113 }
117 114
118 base::scoped_nsobject<WrenchMenuController> controller_; 115 base::scoped_nsobject<WrenchMenuController> controller_;
119 116
120 scoped_ptr<MockWrenchMenuModel> fake_model_; 117 scoped_ptr<MockWrenchMenuModel> fake_model_;
121 118
122 private: 119 private:
123 scoped_ptr<browser_sync::SessionsSyncManager> manager_; 120 scoped_ptr<browser_sync::SessionsSyncManager> manager_;
121 scoped_ptr<browser_sync::LocalDeviceInfoProviderMock> local_device_;
124 }; 122 };
125 123
126 TEST_F(WrenchMenuControllerTest, Initialized) { 124 TEST_F(WrenchMenuControllerTest, Initialized) {
127 EXPECT_TRUE([controller() menu]); 125 EXPECT_TRUE([controller() menu]);
128 EXPECT_GE([[controller() menu] numberOfItems], 5); 126 EXPECT_GE([[controller() menu] numberOfItems], 5);
129 } 127 }
130 128
131 TEST_F(WrenchMenuControllerTest, DispatchSimple) { 129 TEST_F(WrenchMenuControllerTest, DispatchSimple) {
132 base::scoped_nsobject<NSButton> button([[NSButton alloc] init]); 130 base::scoped_nsobject<NSButton> button([[NSButton alloc] init]);
133 [button setTag:IDC_ZOOM_PLUS]; 131 [button setTag:IDC_ZOOM_PLUS];
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 } 233 }
236 234
237 // Verify that |RecentTabsMenuModelDelegate| is deleted before the model 235 // Verify that |RecentTabsMenuModelDelegate| is deleted before the model
238 // it's observing. 236 // it's observing.
239 TEST_F(WrenchMenuControllerTest, RecentTabDeleteOrder) { 237 TEST_F(WrenchMenuControllerTest, RecentTabDeleteOrder) {
240 [controller_ menuNeedsUpdate:[controller_ menu]]; 238 [controller_ menuNeedsUpdate:[controller_ menu]];
241 // If the delete order is wrong then the test will crash on exit. 239 // If the delete order is wrong then the test will crash on exit.
242 } 240 }
243 241
244 } // namespace 242 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/sync/test_profile_sync_service.cc ('k') | chrome/browser/ui/sync/one_click_signin_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698