Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/cros/mock_login_library.h" | 13 #include "chrome/browser/chromeos/cros/mock_login_library.h" |
| 14 #include "chrome/browser/chromeos/cros/mock_network_library.h" | 14 #include "chrome/browser/chromeos/cros/mock_network_library.h" |
| 15 #include "chrome/browser/chromeos/cros/network_library.h" | 15 #include "chrome/browser/chromeos/cros/network_library.h" |
| 16 #include "chrome/browser/chromeos/login/mock_screen_observer.h" | 16 #include "chrome/browser/chromeos/login/mock_screen_observer.h" |
| 17 #include "chrome/browser/chromeos/login/network_screen.h" | 17 #include "chrome/browser/chromeos/login/network_screen.h" |
| 18 #include "chrome/browser/chromeos/login/network_selection_view.h" | 18 #include "chrome/browser/chromeos/login/network_selection_view.h" |
| 19 #include "chrome/browser/chromeos/login/view_screen.h" | 19 #include "chrome/browser/chromeos/login/view_screen.h" |
| 20 #include "chrome/browser/chromeos/login/views_network_screen_actor.h" | |
| 20 #include "chrome/browser/chromeos/login/wizard_controller.h" | 21 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 21 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" | 22 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" |
| 22 #include "chrome/browser/chromeos/login/wizard_screen.h" | 23 #include "chrome/browser/chromeos/login/wizard_screen.h" |
| 23 #include "chrome/test/ui_test_utils.h" | 24 #include "chrome/test/ui_test_utils.h" |
| 24 #include "grit/generated_resources.h" | 25 #include "grit/generated_resources.h" |
| 25 #include "testing/gmock/include/gmock/gmock.h" | 26 #include "testing/gmock/include/gmock/gmock.h" |
| 26 #include "testing/gtest/include/gtest/gtest.h" | 27 #include "testing/gtest/include/gtest/gtest.h" |
| 27 #include "ui/base/l10n/l10n_util.h" | 28 #include "ui/base/l10n/l10n_util.h" |
| 28 #include "views/controls/button/text_button.h" | 29 #include "views/controls/button/text_button.h" |
| 29 | 30 |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 108 .WillRepeatedly((Return(cellular_.get()))); | 109 .WillRepeatedly((Return(cellular_.get()))); |
| 109 } | 110 } |
| 110 | 111 |
| 111 virtual void SetUpOnMainThread() { | 112 virtual void SetUpOnMainThread() { |
| 112 mock_screen_observer_.reset(new MockScreenObserver()); | 113 mock_screen_observer_.reset(new MockScreenObserver()); |
| 113 ASSERT_TRUE(controller() != NULL); | 114 ASSERT_TRUE(controller() != NULL); |
| 114 network_screen_ = controller()->GetNetworkScreen(); | 115 network_screen_ = controller()->GetNetworkScreen(); |
| 115 ASSERT_TRUE(network_screen_ != NULL); | 116 ASSERT_TRUE(network_screen_ != NULL); |
| 116 ASSERT_EQ(controller()->current_screen(), network_screen_); | 117 ASSERT_EQ(controller()->current_screen(), network_screen_); |
| 117 network_screen_->screen_observer_ = mock_screen_observer_.get(); | 118 network_screen_->screen_observer_ = mock_screen_observer_.get(); |
| 118 actor_ = network_screen_->actor(); | 119 actor_ = static_cast<ViewsNetworkScreenActor*>(network_screen_->actor()); |
|
altimofeev
2011/06/07 17:02:22
Comment on this please. Also consider adding TODO.
whywhat
2011/06/07 17:24:52
Done.
| |
| 119 ASSERT_TRUE(actor_ != NULL); | 120 ASSERT_TRUE(actor_ != NULL); |
| 120 } | 121 } |
| 121 | 122 |
| 122 virtual void TearDownInProcessBrowserTestFixture() { | 123 virtual void TearDownInProcessBrowserTestFixture() { |
| 123 network_screen_->screen_observer_ = controller(); | 124 network_screen_->screen_observer_ = controller(); |
| 124 CrosInProcessBrowserTest::TearDownInProcessBrowserTestFixture(); | 125 CrosInProcessBrowserTest::TearDownInProcessBrowserTestFixture(); |
| 125 cros_mock_->test_api()->SetLoginLibrary(NULL, false); | 126 cros_mock_->test_api()->SetLoginLibrary(NULL, false); |
| 126 } | 127 } |
| 127 | 128 |
| 128 void EmulateContinueButtonExit(NetworkScreen* network_screen) { | 129 void EmulateContinueButtonExit(NetworkScreen* network_screen) { |
| 129 EXPECT_CALL(*mock_screen_observer_, | 130 EXPECT_CALL(*mock_screen_observer_, |
| 130 OnExit(ScreenObserver::NETWORK_CONNECTED)) | 131 OnExit(ScreenObserver::NETWORK_CONNECTED)) |
| 131 .Times(1); | 132 .Times(1); |
| 132 EXPECT_CALL(*mock_network_library_, Connected()) | 133 EXPECT_CALL(*mock_network_library_, Connected()) |
| 133 .WillOnce(Return(true)); | 134 .WillOnce(Return(true)); |
| 134 network_screen->OnContinuePressed(); | 135 network_screen->OnContinuePressed(); |
| 135 ui_test_utils::RunAllPendingInMessageLoop(); | 136 ui_test_utils::RunAllPendingInMessageLoop(); |
| 136 } | 137 } |
| 137 | 138 |
| 138 scoped_ptr<MockScreenObserver> mock_screen_observer_; | 139 scoped_ptr<MockScreenObserver> mock_screen_observer_; |
| 139 MockLoginLibrary* mock_login_library_; | 140 MockLoginLibrary* mock_login_library_; |
| 140 MockNetworkLibrary* mock_network_library_; | 141 MockNetworkLibrary* mock_network_library_; |
| 141 scoped_ptr<NetworkDevice> cellular_; | 142 scoped_ptr<NetworkDevice> cellular_; |
| 142 NetworkScreen* network_screen_; | 143 NetworkScreen* network_screen_; |
| 143 NetworkScreenActor* actor_; | 144 ViewsNetworkScreenActor* actor_; |
| 144 | 145 |
| 145 private: | 146 private: |
| 146 DISALLOW_COPY_AND_ASSIGN(NetworkScreenTest); | 147 DISALLOW_COPY_AND_ASSIGN(NetworkScreenTest); |
| 147 }; | 148 }; |
| 148 | 149 |
| 149 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Ethernet) { | 150 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Ethernet) { |
| 150 EXPECT_CALL(*mock_network_library_, ethernet_connected()) | 151 EXPECT_CALL(*mock_network_library_, ethernet_connected()) |
| 151 .WillOnce((Return(false))); | 152 .WillOnce((Return(false))); |
| 152 EXPECT_CALL(*mock_network_library_, wifi_connected()) | 153 EXPECT_CALL(*mock_network_library_, wifi_connected()) |
| 153 .WillOnce((Return(false))); | 154 .WillOnce((Return(false))); |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 261 EXPECT_FALSE(actor_->IsConnecting()); | 262 EXPECT_FALSE(actor_->IsConnecting()); |
| 262 network_screen_->OnConnectionTimeout(); | 263 network_screen_->OnConnectionTimeout(); |
| 263 | 264 |
| 264 // Close infobubble with error message - it makes the test stable. | 265 // Close infobubble with error message - it makes the test stable. |
| 265 EXPECT_FALSE(actor_->IsContinueEnabled()); | 266 EXPECT_FALSE(actor_->IsContinueEnabled()); |
| 266 EXPECT_FALSE(actor_->IsConnecting()); | 267 EXPECT_FALSE(actor_->IsConnecting()); |
| 267 actor_->ClearErrors(); | 268 actor_->ClearErrors(); |
| 268 } | 269 } |
| 269 | 270 |
| 270 } // namespace chromeos | 271 } // namespace chromeos |
| OLD | NEW |