| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/combobox_model.h" | 7 #include "app/combobox_model.h" |
| 8 #include "app/l10n_util.h" | 8 #include "app/l10n_util.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/scoped_ptr.h" | 10 #include "base/scoped_ptr.h" |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 EXPECT_CALL(*mock_network_library_, cellular_connected()) | 151 EXPECT_CALL(*mock_network_library_, cellular_connected()) |
| 152 .WillOnce((Return(false))); | 152 .WillOnce((Return(false))); |
| 153 EXPECT_CALL(*mock_network_library_, ethernet_connecting()) | 153 EXPECT_CALL(*mock_network_library_, ethernet_connecting()) |
| 154 .WillOnce((Return(true))); | 154 .WillOnce((Return(true))); |
| 155 EXPECT_FALSE(network_view->IsContinueEnabled()); | 155 EXPECT_FALSE(network_view->IsContinueEnabled()); |
| 156 network_screen->OnNetworkManagerChanged(mock_network_library_); | 156 network_screen->OnNetworkManagerChanged(mock_network_library_); |
| 157 | 157 |
| 158 EXPECT_CALL(*mock_network_library_, ethernet_connected()) | 158 EXPECT_CALL(*mock_network_library_, ethernet_connected()) |
| 159 .WillOnce(Return(true)); | 159 .WillOnce(Return(true)); |
| 160 EXPECT_CALL(*mock_network_library_, Connected()) | 160 EXPECT_CALL(*mock_network_library_, Connected()) |
| 161 .WillOnce(Return(true)); | 161 .Times(2) |
| 162 .WillRepeatedly(Return(true)); |
| 162 EXPECT_FALSE(network_view->IsContinueEnabled()); | 163 EXPECT_FALSE(network_view->IsContinueEnabled()); |
| 163 EXPECT_FALSE(network_view->IsConnecting()); | 164 EXPECT_FALSE(network_view->IsConnecting()); |
| 164 network_screen->OnNetworkManagerChanged(mock_network_library_); | 165 network_screen->OnNetworkManagerChanged(mock_network_library_); |
| 165 | 166 |
| 166 EXPECT_TRUE(network_view->IsContinueEnabled()); | 167 EXPECT_TRUE(network_view->IsContinueEnabled()); |
| 167 EmulateContinueButtonExit(network_screen); | 168 EmulateContinueButtonExit(network_screen); |
| 168 } | 169 } |
| 169 | 170 |
| 170 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Wifi) { | 171 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Wifi) { |
| 171 ASSERT_TRUE(controller()); | 172 ASSERT_TRUE(controller()); |
| (...skipping 20 matching lines...) Expand all Loading... |
| 192 EXPECT_CALL(*mock_network_library_, wifi_network()) | 193 EXPECT_CALL(*mock_network_library_, wifi_network()) |
| 193 .WillRepeatedly(Return(&wifi)); | 194 .WillRepeatedly(Return(&wifi)); |
| 194 EXPECT_CALL(*mock_network_library_, wifi_networks()) | 195 EXPECT_CALL(*mock_network_library_, wifi_networks()) |
| 195 .WillRepeatedly(ReturnRef(wifi_networks)); | 196 .WillRepeatedly(ReturnRef(wifi_networks)); |
| 196 EXPECT_FALSE(network_view->IsContinueEnabled()); | 197 EXPECT_FALSE(network_view->IsContinueEnabled()); |
| 197 network_screen->OnNetworkManagerChanged(mock_network_library_); | 198 network_screen->OnNetworkManagerChanged(mock_network_library_); |
| 198 | 199 |
| 199 EXPECT_CALL(*mock_network_library_, ethernet_connected()) | 200 EXPECT_CALL(*mock_network_library_, ethernet_connected()) |
| 200 .WillOnce(Return(true)); | 201 .WillOnce(Return(true)); |
| 201 EXPECT_CALL(*mock_network_library_, Connected()) | 202 EXPECT_CALL(*mock_network_library_, Connected()) |
| 202 .WillOnce(Return(true)); | 203 .Times(2) |
| 204 .WillRepeatedly(Return(true)); |
| 203 EXPECT_FALSE(network_view->IsContinueEnabled()); | 205 EXPECT_FALSE(network_view->IsContinueEnabled()); |
| 204 EXPECT_FALSE(network_view->IsConnecting()); | 206 EXPECT_FALSE(network_view->IsConnecting()); |
| 205 network_screen->OnNetworkManagerChanged(mock_network_library_); | 207 network_screen->OnNetworkManagerChanged(mock_network_library_); |
| 206 | 208 |
| 207 EXPECT_TRUE(network_view->IsContinueEnabled()); | 209 EXPECT_TRUE(network_view->IsContinueEnabled()); |
| 208 EmulateContinueButtonExit(network_screen); | 210 EmulateContinueButtonExit(network_screen); |
| 209 } | 211 } |
| 210 | 212 |
| 211 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Cellular) { | 213 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Cellular) { |
| 212 ASSERT_TRUE(controller()); | 214 ASSERT_TRUE(controller()); |
| (...skipping 18 matching lines...) Expand all Loading... |
| 231 .WillOnce((Return(true))); | 233 .WillOnce((Return(true))); |
| 232 scoped_ptr<CellularNetwork> cellular(new CellularNetwork()); | 234 scoped_ptr<CellularNetwork> cellular(new CellularNetwork()); |
| 233 EXPECT_CALL(*mock_network_library_, cellular_network()) | 235 EXPECT_CALL(*mock_network_library_, cellular_network()) |
| 234 .WillOnce(Return(cellular.get())); | 236 .WillOnce(Return(cellular.get())); |
| 235 EXPECT_FALSE(network_view->IsContinueEnabled()); | 237 EXPECT_FALSE(network_view->IsContinueEnabled()); |
| 236 network_screen->OnNetworkManagerChanged(mock_network_library_); | 238 network_screen->OnNetworkManagerChanged(mock_network_library_); |
| 237 | 239 |
| 238 EXPECT_CALL(*mock_network_library_, ethernet_connected()) | 240 EXPECT_CALL(*mock_network_library_, ethernet_connected()) |
| 239 .WillOnce(Return(true)); | 241 .WillOnce(Return(true)); |
| 240 EXPECT_CALL(*mock_network_library_, Connected()) | 242 EXPECT_CALL(*mock_network_library_, Connected()) |
| 241 .WillOnce(Return(true)); | 243 .Times(2) |
| 244 .WillRepeatedly(Return(true)); |
| 242 EXPECT_FALSE(network_view->IsContinueEnabled()); | 245 EXPECT_FALSE(network_view->IsContinueEnabled()); |
| 243 EXPECT_FALSE(network_view->IsConnecting()); | 246 EXPECT_FALSE(network_view->IsConnecting()); |
| 244 network_screen->OnNetworkManagerChanged(mock_network_library_); | 247 network_screen->OnNetworkManagerChanged(mock_network_library_); |
| 245 | 248 |
| 246 EXPECT_TRUE(network_view->IsContinueEnabled()); | 249 EXPECT_TRUE(network_view->IsContinueEnabled()); |
| 247 EmulateContinueButtonExit(network_screen); | 250 EmulateContinueButtonExit(network_screen); |
| 248 } | 251 } |
| 249 | 252 |
| 250 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Timeout) { | 253 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Timeout) { |
| 251 ASSERT_TRUE(controller()); | 254 ASSERT_TRUE(controller()); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 266 .WillOnce((Return(false))); | 269 .WillOnce((Return(false))); |
| 267 EXPECT_CALL(*mock_network_library_, wifi_connecting()) | 270 EXPECT_CALL(*mock_network_library_, wifi_connecting()) |
| 268 .WillOnce((Return(true))); | 271 .WillOnce((Return(true))); |
| 269 scoped_ptr<WifiNetwork> wifi(new WifiNetwork()); | 272 scoped_ptr<WifiNetwork> wifi(new WifiNetwork()); |
| 270 EXPECT_CALL(*mock_network_library_, wifi_network()) | 273 EXPECT_CALL(*mock_network_library_, wifi_network()) |
| 271 .WillOnce(Return(wifi.get())); | 274 .WillOnce(Return(wifi.get())); |
| 272 EXPECT_FALSE(network_view->IsContinueEnabled()); | 275 EXPECT_FALSE(network_view->IsContinueEnabled()); |
| 273 network_screen->OnNetworkManagerChanged(mock_network_library_); | 276 network_screen->OnNetworkManagerChanged(mock_network_library_); |
| 274 | 277 |
| 275 EXPECT_CALL(*mock_network_library_, Connected()) | 278 EXPECT_CALL(*mock_network_library_, Connected()) |
| 276 .WillOnce(Return(false)); | 279 .Times(2) |
| 280 .WillRepeatedly(Return(false)); |
| 277 EXPECT_FALSE(network_view->IsContinueEnabled()); | 281 EXPECT_FALSE(network_view->IsContinueEnabled()); |
| 278 EXPECT_FALSE(network_view->IsConnecting()); | 282 EXPECT_FALSE(network_view->IsConnecting()); |
| 279 network_screen->OnConnectionTimeout(); | 283 network_screen->OnConnectionTimeout(); |
| 280 | 284 |
| 281 // Close infobubble with error message - it makes the test stable. | 285 // Close infobubble with error message - it makes the test stable. |
| 282 EXPECT_FALSE(network_view->IsContinueEnabled()); | 286 EXPECT_FALSE(network_view->IsContinueEnabled()); |
| 283 EXPECT_FALSE(network_view->IsConnecting()); | 287 EXPECT_FALSE(network_view->IsConnecting()); |
| 284 network_screen->ClearErrors(); | 288 network_screen->ClearErrors(); |
| 285 } | 289 } |
| 286 | 290 |
| 287 } // namespace chromeos | 291 } // namespace chromeos |
| OLD | NEW |