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

Side by Side Diff: chrome/browser/chromeos/login/network_screen_browsertest.cc

Issue 8436002: [cros] Remove Views implementation for login/OOBE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <string> 5 #include <string>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/string16.h" 9 #include "base/string16.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "chrome/browser/chromeos/cros/cros_library.h" 12 #include "chrome/browser/chromeos/cros/cros_library.h"
13 #include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h" 13 #include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"
14 #include "chrome/browser/chromeos/dbus/mock_session_manager_client.h" 14 #include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"
15 #include "chrome/browser/chromeos/cros/mock_network_library.h" 15 #include "chrome/browser/chromeos/cros/mock_network_library.h"
16 #include "chrome/browser/chromeos/cros/network_library.h" 16 #include "chrome/browser/chromeos/cros/network_library.h"
17 #include "chrome/browser/chromeos/login/mock_screen_observer.h" 17 #include "chrome/browser/chromeos/login/mock_screen_observer.h"
18 #include "chrome/browser/chromeos/login/network_screen.h" 18 #include "chrome/browser/chromeos/login/network_screen.h"
19 #include "chrome/browser/chromeos/login/network_selection_view.h"
20 #include "chrome/browser/chromeos/login/view_screen.h" 19 #include "chrome/browser/chromeos/login/view_screen.h"
21 #include "chrome/browser/chromeos/login/views_network_screen_actor.h"
22 #include "chrome/browser/chromeos/login/wizard_controller.h" 20 #include "chrome/browser/chromeos/login/wizard_controller.h"
23 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" 21 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"
24 #include "chrome/browser/chromeos/login/wizard_screen.h" 22 #include "chrome/browser/chromeos/login/wizard_screen.h"
25 #include "chrome/test/base/ui_test_utils.h" 23 #include "chrome/test/base/ui_test_utils.h"
26 #include "grit/generated_resources.h" 24 #include "grit/generated_resources.h"
27 #include "testing/gmock/include/gmock/gmock.h" 25 #include "testing/gmock/include/gmock/gmock.h"
28 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
29 #include "ui/base/l10n/l10n_util.h" 27 #include "ui/base/l10n/l10n_util.h"
30 #include "views/controls/button/text_button.h" 28 #include "views/controls/button/text_button.h"
31 29
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 118
121 virtual void SetUpOnMainThread() { 119 virtual void SetUpOnMainThread() {
122 mock_screen_observer_.reset(new MockScreenObserver()); 120 mock_screen_observer_.reset(new MockScreenObserver());
123 ASSERT_TRUE(controller() != NULL); 121 ASSERT_TRUE(controller() != NULL);
124 network_screen_ = controller()->GetNetworkScreen(); 122 network_screen_ = controller()->GetNetworkScreen();
125 ASSERT_TRUE(network_screen_ != NULL); 123 ASSERT_TRUE(network_screen_ != NULL);
126 ASSERT_EQ(controller()->current_screen(), network_screen_); 124 ASSERT_EQ(controller()->current_screen(), network_screen_);
127 network_screen_->screen_observer_ = mock_screen_observer_.get(); 125 network_screen_->screen_observer_ = mock_screen_observer_.get();
128 // We need a couple of methods defined only in views version. 126 // We need a couple of methods defined only in views version.
129 // TODO(avayvod): Refactor this when WebUI implementation is finished. 127 // TODO(avayvod): Refactor this when WebUI implementation is finished.
130 actor_ = static_cast<ViewsNetworkScreenActor*>(network_screen_->actor()); 128 //actor_ = static_cast<ViewsNetworkScreenActor*>(network_screen_->actor());
131 ASSERT_TRUE(actor_ != NULL); 129 //ASSERT_TRUE(actor_ != NULL);
132 } 130 }
133 131
134 virtual void TearDownInProcessBrowserTestFixture() { 132 virtual void TearDownInProcessBrowserTestFixture() {
135 network_screen_->screen_observer_ = controller(); 133 network_screen_->screen_observer_ = controller();
136 CrosInProcessBrowserTest::TearDownInProcessBrowserTestFixture(); 134 CrosInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
137 DBusThreadManager::Shutdown(); 135 DBusThreadManager::Shutdown();
138 } 136 }
139 137
140 void EmulateContinueButtonExit(NetworkScreen* network_screen) { 138 void EmulateContinueButtonExit(NetworkScreen* network_screen) {
141 EXPECT_CALL(*mock_screen_observer_, 139 EXPECT_CALL(*mock_screen_observer_,
142 OnExit(ScreenObserver::NETWORK_CONNECTED)) 140 OnExit(ScreenObserver::NETWORK_CONNECTED))
143 .Times(1); 141 .Times(1);
144 EXPECT_CALL(*mock_network_library_, Connected()) 142 EXPECT_CALL(*mock_network_library_, Connected())
145 .WillOnce(Return(true)); 143 .WillOnce(Return(true));
146 network_screen->OnContinuePressed(); 144 network_screen->OnContinuePressed();
147 ui_test_utils::RunAllPendingInMessageLoop(); 145 ui_test_utils::RunAllPendingInMessageLoop();
148 } 146 }
149 147
150 scoped_ptr<MockScreenObserver> mock_screen_observer_; 148 scoped_ptr<MockScreenObserver> mock_screen_observer_;
151 MockNetworkLibrary* mock_network_library_; 149 MockNetworkLibrary* mock_network_library_;
152 scoped_ptr<NetworkDevice> cellular_; 150 scoped_ptr<NetworkDevice> cellular_;
153 NetworkScreen* network_screen_; 151 NetworkScreen* network_screen_;
154 ViewsNetworkScreenActor* actor_; 152 //ViewsNetworkScreenActor* actor_;
155 153
156 private: 154 private:
157 DISALLOW_COPY_AND_ASSIGN(NetworkScreenTest); 155 DISALLOW_COPY_AND_ASSIGN(NetworkScreenTest);
158 }; 156 };
159 157
160 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Ethernet) { 158 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Ethernet) {
161 EXPECT_CALL(*mock_network_library_, ethernet_connected()) 159 EXPECT_CALL(*mock_network_library_, ethernet_connected())
162 .WillOnce((Return(false))); 160 .WillOnce((Return(false)));
163 EXPECT_CALL(*mock_network_library_, wifi_connected()) 161 EXPECT_CALL(*mock_network_library_, wifi_connected())
164 .WillOnce((Return(false))); 162 .WillOnce((Return(false)));
165 EXPECT_CALL(*mock_network_library_, cellular_connected()) 163 EXPECT_CALL(*mock_network_library_, cellular_connected())
166 .WillOnce((Return(false))); 164 .WillOnce((Return(false)));
167 EXPECT_CALL(*mock_network_library_, ethernet_connecting()) 165 EXPECT_CALL(*mock_network_library_, ethernet_connecting())
168 .WillOnce((Return(true))); 166 .WillOnce((Return(true)));
169 EXPECT_FALSE(actor_->IsContinueEnabled()); 167 //EXPECT_FALSE(actor_->IsContinueEnabled());
170 network_screen_->OnNetworkManagerChanged(mock_network_library_); 168 network_screen_->OnNetworkManagerChanged(mock_network_library_);
171 169
172 EXPECT_CALL(*mock_network_library_, ethernet_connected()) 170 EXPECT_CALL(*mock_network_library_, ethernet_connected())
173 .WillOnce(Return(true)); 171 .WillOnce(Return(true));
174 EXPECT_CALL(*mock_network_library_, Connected()) 172 EXPECT_CALL(*mock_network_library_, Connected())
175 .Times(3) 173 .Times(3)
176 .WillRepeatedly(Return(true)); 174 .WillRepeatedly(Return(true));
177 EXPECT_FALSE(actor_->IsContinueEnabled()); 175 //EXPECT_FALSE(actor_->IsContinueEnabled());
178 EXPECT_FALSE(actor_->IsConnecting()); 176 //EXPECT_FALSE(actor_->IsConnecting());
179 network_screen_->OnNetworkManagerChanged(mock_network_library_); 177 network_screen_->OnNetworkManagerChanged(mock_network_library_);
180 178
181 EXPECT_TRUE(actor_->IsContinueEnabled()); 179 //EXPECT_TRUE(actor_->IsContinueEnabled());
182 EmulateContinueButtonExit(network_screen_); 180 EmulateContinueButtonExit(network_screen_);
183 } 181 }
184 182
185 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Wifi) { 183 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Wifi) {
186 EXPECT_CALL(*mock_network_library_, ethernet_connected()) 184 EXPECT_CALL(*mock_network_library_, ethernet_connected())
187 .WillOnce((Return(false))); 185 .WillOnce((Return(false)));
188 EXPECT_CALL(*mock_network_library_, wifi_connected()) 186 EXPECT_CALL(*mock_network_library_, wifi_connected())
189 .WillOnce((Return(false))); 187 .WillOnce((Return(false)));
190 EXPECT_CALL(*mock_network_library_, cellular_connected()) 188 EXPECT_CALL(*mock_network_library_, cellular_connected())
191 .WillOnce((Return(false))); 189 .WillOnce((Return(false)));
192 EXPECT_CALL(*mock_network_library_, ethernet_connecting()) 190 EXPECT_CALL(*mock_network_library_, ethernet_connecting())
193 .WillOnce((Return(false))); 191 .WillOnce((Return(false)));
194 EXPECT_CALL(*mock_network_library_, wifi_connecting()) 192 EXPECT_CALL(*mock_network_library_, wifi_connecting())
195 .WillOnce((Return(true))); 193 .WillOnce((Return(true)));
196 scoped_ptr<WifiNetwork> wifi(new WifiNetwork("wifi")); 194 scoped_ptr<WifiNetwork> wifi(new WifiNetwork("wifi"));
197 WifiNetworkVector wifi_networks; 195 WifiNetworkVector wifi_networks;
198 wifi_networks.push_back(wifi.get()); 196 wifi_networks.push_back(wifi.get());
199 EXPECT_CALL(*mock_network_library_, wifi_network()) 197 EXPECT_CALL(*mock_network_library_, wifi_network())
200 .WillRepeatedly(Return(wifi.get())); 198 .WillRepeatedly(Return(wifi.get()));
201 EXPECT_CALL(*mock_network_library_, wifi_networks()) 199 EXPECT_CALL(*mock_network_library_, wifi_networks())
202 .WillRepeatedly(ReturnRef(wifi_networks)); 200 .WillRepeatedly(ReturnRef(wifi_networks));
203 EXPECT_FALSE(actor_->IsContinueEnabled()); 201 //EXPECT_FALSE(actor_->IsContinueEnabled());
204 network_screen_->OnNetworkManagerChanged(mock_network_library_); 202 network_screen_->OnNetworkManagerChanged(mock_network_library_);
205 203
206 EXPECT_CALL(*mock_network_library_, ethernet_connected()) 204 EXPECT_CALL(*mock_network_library_, ethernet_connected())
207 .WillOnce(Return(true)); 205 .WillOnce(Return(true));
208 EXPECT_CALL(*mock_network_library_, Connected()) 206 EXPECT_CALL(*mock_network_library_, Connected())
209 .Times(3) 207 .Times(3)
210 .WillRepeatedly(Return(true)); 208 .WillRepeatedly(Return(true));
211 EXPECT_FALSE(actor_->IsContinueEnabled()); 209 //EXPECT_FALSE(actor_->IsContinueEnabled());
212 EXPECT_FALSE(actor_->IsConnecting()); 210 //EXPECT_FALSE(actor_->IsConnecting());
213 network_screen_->OnNetworkManagerChanged(mock_network_library_); 211 network_screen_->OnNetworkManagerChanged(mock_network_library_);
214 212
215 EXPECT_TRUE(actor_->IsContinueEnabled()); 213 //EXPECT_TRUE(actor_->IsContinueEnabled());
216 EmulateContinueButtonExit(network_screen_); 214 EmulateContinueButtonExit(network_screen_);
217 } 215 }
218 216
219 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Cellular) { 217 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Cellular) {
220 EXPECT_CALL(*mock_network_library_, ethernet_connected()) 218 EXPECT_CALL(*mock_network_library_, ethernet_connected())
221 .WillOnce((Return(false))); 219 .WillOnce((Return(false)));
222 EXPECT_CALL(*mock_network_library_, wifi_connected()) 220 EXPECT_CALL(*mock_network_library_, wifi_connected())
223 .WillOnce((Return(false))); 221 .WillOnce((Return(false)));
224 EXPECT_CALL(*mock_network_library_, cellular_connected()) 222 EXPECT_CALL(*mock_network_library_, cellular_connected())
225 .WillOnce((Return(false))); 223 .WillOnce((Return(false)));
226 EXPECT_CALL(*mock_network_library_, ethernet_connecting()) 224 EXPECT_CALL(*mock_network_library_, ethernet_connecting())
227 .WillOnce((Return(false))); 225 .WillOnce((Return(false)));
228 EXPECT_CALL(*mock_network_library_, wifi_connecting()) 226 EXPECT_CALL(*mock_network_library_, wifi_connecting())
229 .WillOnce((Return(false))); 227 .WillOnce((Return(false)));
230 EXPECT_CALL(*mock_network_library_, cellular_connecting()) 228 EXPECT_CALL(*mock_network_library_, cellular_connecting())
231 .WillOnce((Return(true))); 229 .WillOnce((Return(true)));
232 scoped_ptr<CellularNetwork> cellular(new CellularNetwork("cellular")); 230 scoped_ptr<CellularNetwork> cellular(new CellularNetwork("cellular"));
233 EXPECT_CALL(*mock_network_library_, cellular_network()) 231 EXPECT_CALL(*mock_network_library_, cellular_network())
234 .WillOnce(Return(cellular.get())); 232 .WillOnce(Return(cellular.get()));
235 EXPECT_FALSE(actor_->IsContinueEnabled()); 233 //EXPECT_FALSE(actor_->IsContinueEnabled());
236 network_screen_->OnNetworkManagerChanged(mock_network_library_); 234 network_screen_->OnNetworkManagerChanged(mock_network_library_);
237 235
238 EXPECT_CALL(*mock_network_library_, ethernet_connected()) 236 EXPECT_CALL(*mock_network_library_, ethernet_connected())
239 .WillOnce(Return(true)); 237 .WillOnce(Return(true));
240 EXPECT_CALL(*mock_network_library_, Connected()) 238 EXPECT_CALL(*mock_network_library_, Connected())
241 .Times(3) 239 .Times(3)
242 .WillRepeatedly(Return(true)); 240 .WillRepeatedly(Return(true));
243 EXPECT_FALSE(actor_->IsContinueEnabled()); 241 //EXPECT_FALSE(actor_->IsContinueEnabled());
244 EXPECT_FALSE(actor_->IsConnecting()); 242 //EXPECT_FALSE(actor_->IsConnecting());
245 network_screen_->OnNetworkManagerChanged(mock_network_library_); 243 network_screen_->OnNetworkManagerChanged(mock_network_library_);
246 244
247 EXPECT_TRUE(actor_->IsContinueEnabled()); 245 //EXPECT_TRUE(actor_->IsContinueEnabled());
248 EmulateContinueButtonExit(network_screen_); 246 EmulateContinueButtonExit(network_screen_);
249 } 247 }
250 248
251 // See crbug.com/89392 249 // See crbug.com/89392
252 #if defined(OS_LINUX) 250 #if defined(OS_LINUX)
253 #define MAYBE_Timeout DISABLED_Timeout 251 #define MAYBE_Timeout DISABLED_Timeout
254 #else 252 #else
255 #define MAYBE_Timeout Timeout 253 #define MAYBE_Timeout Timeout
256 #endif 254 #endif
257 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, MAYBE_Timeout) { 255 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, MAYBE_Timeout) {
258 EXPECT_CALL(*mock_network_library_, ethernet_connected()) 256 EXPECT_CALL(*mock_network_library_, ethernet_connected())
259 .WillOnce((Return(false))); 257 .WillOnce((Return(false)));
260 EXPECT_CALL(*mock_network_library_, wifi_connected()) 258 EXPECT_CALL(*mock_network_library_, wifi_connected())
261 .WillOnce((Return(false))); 259 .WillOnce((Return(false)));
262 EXPECT_CALL(*mock_network_library_, cellular_connected()) 260 EXPECT_CALL(*mock_network_library_, cellular_connected())
263 .WillOnce((Return(false))); 261 .WillOnce((Return(false)));
264 EXPECT_CALL(*mock_network_library_, ethernet_connecting()) 262 EXPECT_CALL(*mock_network_library_, ethernet_connecting())
265 .WillOnce((Return(false))); 263 .WillOnce((Return(false)));
266 EXPECT_CALL(*mock_network_library_, wifi_connecting()) 264 EXPECT_CALL(*mock_network_library_, wifi_connecting())
267 .WillOnce((Return(true))); 265 .WillOnce((Return(true)));
268 scoped_ptr<WifiNetwork> wifi(new WifiNetwork("wifi")); 266 scoped_ptr<WifiNetwork> wifi(new WifiNetwork("wifi"));
269 EXPECT_CALL(*mock_network_library_, wifi_network()) 267 EXPECT_CALL(*mock_network_library_, wifi_network())
270 .WillOnce(Return(wifi.get())); 268 .WillOnce(Return(wifi.get()));
271 EXPECT_FALSE(actor_->IsContinueEnabled()); 269 //EXPECT_FALSE(actor_->IsContinueEnabled());
272 network_screen_->OnNetworkManagerChanged(mock_network_library_); 270 network_screen_->OnNetworkManagerChanged(mock_network_library_);
273 271
274 EXPECT_CALL(*mock_network_library_, Connected()) 272 EXPECT_CALL(*mock_network_library_, Connected())
275 .Times(2) 273 .Times(2)
276 .WillRepeatedly(Return(false)); 274 .WillRepeatedly(Return(false));
277 EXPECT_FALSE(actor_->IsContinueEnabled()); 275 //EXPECT_FALSE(actor_->IsContinueEnabled());
278 EXPECT_FALSE(actor_->IsConnecting()); 276 //EXPECT_FALSE(actor_->IsConnecting());
279 network_screen_->OnConnectionTimeout(); 277 network_screen_->OnConnectionTimeout();
280 278
281 // Close infobubble with error message - it makes the test stable. 279 // Close infobubble with error message - it makes the test stable.
282 EXPECT_FALSE(actor_->IsContinueEnabled()); 280 //EXPECT_FALSE(actor_->IsContinueEnabled());
283 EXPECT_FALSE(actor_->IsConnecting()); 281 //EXPECT_FALSE(actor_->IsConnecting());
284 actor_->ClearErrors(); 282 //actor_->ClearErrors();
285 } 283 }
286 284
287 } // namespace chromeos 285 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698