| OLD | NEW |
| 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/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
| 6 #include "chrome/browser/chromeos/login/helper.h" | 6 #include "chrome/browser/chromeos/login/helper.h" |
| 7 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" | 7 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" |
| 8 #include "chrome/browser/chromeos/login/screens/network_screen.h" | 8 #include "chrome/browser/chromeos/login/screens/network_screen.h" |
| 9 #include "chrome/browser/chromeos/login/screens/wizard_screen.h" | 9 #include "chrome/browser/chromeos/login/screens/wizard_screen.h" |
| 10 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h" | 10 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 using ::testing::AnyNumber; | 22 using ::testing::AnyNumber; |
| 23 using ::testing::Return; | 23 using ::testing::Return; |
| 24 using ::testing::ReturnRef; | 24 using ::testing::ReturnRef; |
| 25 using views::Button; | 25 using views::Button; |
| 26 | 26 |
| 27 namespace chromeos { | 27 namespace chromeos { |
| 28 | 28 |
| 29 class DummyButtonListener : public views::ButtonListener { | 29 class DummyButtonListener : public views::ButtonListener { |
| 30 public: | 30 public: |
| 31 virtual void ButtonPressed(views::Button* sender, | 31 virtual void ButtonPressed(views::Button* sender, |
| 32 const ui::Event& event) OVERRIDE {} | 32 const ui::Event& event) override {} |
| 33 }; | 33 }; |
| 34 | 34 |
| 35 namespace login { | 35 namespace login { |
| 36 | 36 |
| 37 class MockNetworkStateHelper : public NetworkStateHelper { | 37 class MockNetworkStateHelper : public NetworkStateHelper { |
| 38 public: | 38 public: |
| 39 MOCK_CONST_METHOD0(GetCurrentNetworkName, base::string16(void)); | 39 MOCK_CONST_METHOD0(GetCurrentNetworkName, base::string16(void)); |
| 40 MOCK_CONST_METHOD0(IsConnected, bool(void)); | 40 MOCK_CONST_METHOD0(IsConnected, bool(void)); |
| 41 MOCK_CONST_METHOD0(IsConnecting, bool(void)); | 41 MOCK_CONST_METHOD0(IsConnecting, bool(void)); |
| 42 }; | 42 }; |
| 43 | 43 |
| 44 } // namespace login | 44 } // namespace login |
| 45 | 45 |
| 46 class NetworkScreenTest : public WizardInProcessBrowserTest { | 46 class NetworkScreenTest : public WizardInProcessBrowserTest { |
| 47 public: | 47 public: |
| 48 NetworkScreenTest(): WizardInProcessBrowserTest("network"), | 48 NetworkScreenTest(): WizardInProcessBrowserTest("network"), |
| 49 fake_session_manager_client_(NULL) { | 49 fake_session_manager_client_(NULL) { |
| 50 } | 50 } |
| 51 | 51 |
| 52 protected: | 52 protected: |
| 53 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 53 virtual void SetUpInProcessBrowserTestFixture() override { |
| 54 WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); | 54 WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); |
| 55 | 55 |
| 56 fake_session_manager_client_ = new FakeSessionManagerClient; | 56 fake_session_manager_client_ = new FakeSessionManagerClient; |
| 57 DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( | 57 DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( |
| 58 scoped_ptr<SessionManagerClient>(fake_session_manager_client_)); | 58 scoped_ptr<SessionManagerClient>(fake_session_manager_client_)); |
| 59 } | 59 } |
| 60 | 60 |
| 61 virtual void SetUpOnMainThread() OVERRIDE { | 61 virtual void SetUpOnMainThread() override { |
| 62 WizardInProcessBrowserTest::SetUpOnMainThread(); | 62 WizardInProcessBrowserTest::SetUpOnMainThread(); |
| 63 mock_screen_observer_.reset(new MockScreenObserver()); | 63 mock_screen_observer_.reset(new MockScreenObserver()); |
| 64 ASSERT_TRUE(WizardController::default_controller() != NULL); | 64 ASSERT_TRUE(WizardController::default_controller() != NULL); |
| 65 network_screen_ = | 65 network_screen_ = |
| 66 NetworkScreen::Get(WizardController::default_controller()); | 66 NetworkScreen::Get(WizardController::default_controller()); |
| 67 ASSERT_TRUE(network_screen_ != NULL); | 67 ASSERT_TRUE(network_screen_ != NULL); |
| 68 ASSERT_EQ(WizardController::default_controller()->current_screen(), | 68 ASSERT_EQ(WizardController::default_controller()->current_screen(), |
| 69 network_screen_); | 69 network_screen_); |
| 70 network_screen_->screen_observer_ = mock_screen_observer_.get(); | 70 network_screen_->screen_observer_ = mock_screen_observer_.get(); |
| 71 ASSERT_TRUE(network_screen_->actor() != NULL); | 71 ASSERT_TRUE(network_screen_->actor() != NULL); |
| 72 | 72 |
| 73 mock_network_state_helper_ = new login::MockNetworkStateHelper; | 73 mock_network_state_helper_ = new login::MockNetworkStateHelper; |
| 74 SetDefaultNetworkStateHelperExpectations(); | 74 SetDefaultNetworkStateHelperExpectations(); |
| 75 network_screen_->SetNetworkStateHelperForTest(mock_network_state_helper_); | 75 network_screen_->SetNetworkStateHelperForTest(mock_network_state_helper_); |
| 76 } | 76 } |
| 77 | 77 |
| 78 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { | 78 virtual void TearDownInProcessBrowserTestFixture() override { |
| 79 InProcessBrowserTest::TearDownInProcessBrowserTestFixture(); | 79 InProcessBrowserTest::TearDownInProcessBrowserTestFixture(); |
| 80 } | 80 } |
| 81 | 81 |
| 82 void EmulateContinueButtonExit(NetworkScreen* network_screen) { | 82 void EmulateContinueButtonExit(NetworkScreen* network_screen) { |
| 83 EXPECT_CALL(*mock_screen_observer_, | 83 EXPECT_CALL(*mock_screen_observer_, |
| 84 OnExit(ScreenObserver::NETWORK_CONNECTED)) | 84 OnExit(ScreenObserver::NETWORK_CONNECTED)) |
| 85 .Times(1); | 85 .Times(1); |
| 86 EXPECT_CALL(*mock_network_state_helper_, IsConnected()) | 86 EXPECT_CALL(*mock_network_state_helper_, IsConnected()) |
| 87 .WillOnce(Return(true)); | 87 .WillOnce(Return(true)); |
| 88 network_screen->OnContinuePressed(); | 88 network_screen->OnContinuePressed(); |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 // EXPECT_FALSE(actor_->IsConnecting()); | 142 // EXPECT_FALSE(actor_->IsConnecting()); |
| 143 network_screen_->OnConnectionTimeout(); | 143 network_screen_->OnConnectionTimeout(); |
| 144 | 144 |
| 145 // Close infobubble with error message - it makes the test stable. | 145 // Close infobubble with error message - it makes the test stable. |
| 146 // EXPECT_FALSE(actor_->IsContinueEnabled()); | 146 // EXPECT_FALSE(actor_->IsContinueEnabled()); |
| 147 // EXPECT_FALSE(actor_->IsConnecting()); | 147 // EXPECT_FALSE(actor_->IsConnecting()); |
| 148 // actor_->ClearErrors(); | 148 // actor_->ClearErrors(); |
| 149 } | 149 } |
| 150 | 150 |
| 151 } // namespace chromeos | 151 } // namespace chromeos |
| OLD | NEW |