| 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 "chrome/browser/chromeos/login/screens/network_screen.h" |
| 6 |
| 7 #include <memory> |
| 8 |
| 5 #include "base/macros.h" | 9 #include "base/macros.h" |
| 6 #include "base/memory/scoped_ptr.h" | |
| 7 #include "chrome/browser/chromeos/login/helper.h" | 10 #include "chrome/browser/chromeos/login/helper.h" |
| 8 #include "chrome/browser/chromeos/login/screens/base_screen.h" | 11 #include "chrome/browser/chromeos/login/screens/base_screen.h" |
| 9 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h" | 12 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h" |
| 10 #include "chrome/browser/chromeos/login/screens/network_screen.h" | |
| 11 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h" | 13 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h" |
| 12 #include "chrome/browser/chromeos/login/wizard_controller.h" | 14 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 13 #include "chromeos/dbus/dbus_thread_manager.h" | 15 #include "chromeos/dbus/dbus_thread_manager.h" |
| 14 #include "chromeos/dbus/fake_session_manager_client.h" | 16 #include "chromeos/dbus/fake_session_manager_client.h" |
| 15 #include "content/public/test/test_utils.h" | 17 #include "content/public/test/test_utils.h" |
| 16 #include "testing/gmock/include/gmock/gmock.h" | 18 #include "testing/gmock/include/gmock/gmock.h" |
| 17 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 18 #include "third_party/cros_system_api/dbus/service_constants.h" | 20 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 19 #include "ui/views/controls/button/button.h" | 21 #include "ui/views/controls/button/button.h" |
| 20 | 22 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 47 NetworkScreenTest(): WizardInProcessBrowserTest("network"), | 49 NetworkScreenTest(): WizardInProcessBrowserTest("network"), |
| 48 fake_session_manager_client_(NULL) { | 50 fake_session_manager_client_(NULL) { |
| 49 } | 51 } |
| 50 | 52 |
| 51 protected: | 53 protected: |
| 52 void SetUpInProcessBrowserTestFixture() override { | 54 void SetUpInProcessBrowserTestFixture() override { |
| 53 WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); | 55 WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); |
| 54 | 56 |
| 55 fake_session_manager_client_ = new FakeSessionManagerClient; | 57 fake_session_manager_client_ = new FakeSessionManagerClient; |
| 56 DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( | 58 DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( |
| 57 scoped_ptr<SessionManagerClient>(fake_session_manager_client_)); | 59 std::unique_ptr<SessionManagerClient>(fake_session_manager_client_)); |
| 58 } | 60 } |
| 59 | 61 |
| 60 void SetUpOnMainThread() override { | 62 void SetUpOnMainThread() override { |
| 61 WizardInProcessBrowserTest::SetUpOnMainThread(); | 63 WizardInProcessBrowserTest::SetUpOnMainThread(); |
| 62 mock_base_screen_delegate_.reset(new MockBaseScreenDelegate()); | 64 mock_base_screen_delegate_.reset(new MockBaseScreenDelegate()); |
| 63 ASSERT_TRUE(WizardController::default_controller() != NULL); | 65 ASSERT_TRUE(WizardController::default_controller() != NULL); |
| 64 network_screen_ = | 66 network_screen_ = |
| 65 NetworkScreen::Get(WizardController::default_controller()); | 67 NetworkScreen::Get(WizardController::default_controller()); |
| 66 ASSERT_TRUE(network_screen_ != NULL); | 68 ASSERT_TRUE(network_screen_ != NULL); |
| 67 ASSERT_EQ(WizardController::default_controller()->current_screen(), | 69 ASSERT_EQ(WizardController::default_controller()->current_screen(), |
| (...skipping 24 matching lines...) Expand all Loading... |
| 92 .Times(AnyNumber()) | 94 .Times(AnyNumber()) |
| 93 .WillRepeatedly((Return(base::string16()))); | 95 .WillRepeatedly((Return(base::string16()))); |
| 94 EXPECT_CALL(*mock_network_state_helper_, IsConnected()) | 96 EXPECT_CALL(*mock_network_state_helper_, IsConnected()) |
| 95 .Times(AnyNumber()) | 97 .Times(AnyNumber()) |
| 96 .WillRepeatedly((Return(false))); | 98 .WillRepeatedly((Return(false))); |
| 97 EXPECT_CALL(*mock_network_state_helper_, IsConnecting()) | 99 EXPECT_CALL(*mock_network_state_helper_, IsConnecting()) |
| 98 .Times(AnyNumber()) | 100 .Times(AnyNumber()) |
| 99 .WillRepeatedly((Return(false))); | 101 .WillRepeatedly((Return(false))); |
| 100 } | 102 } |
| 101 | 103 |
| 102 scoped_ptr<MockBaseScreenDelegate> mock_base_screen_delegate_; | 104 std::unique_ptr<MockBaseScreenDelegate> mock_base_screen_delegate_; |
| 103 login::MockNetworkStateHelper* mock_network_state_helper_; | 105 login::MockNetworkStateHelper* mock_network_state_helper_; |
| 104 NetworkScreen* network_screen_; | 106 NetworkScreen* network_screen_; |
| 105 FakeSessionManagerClient* fake_session_manager_client_; | 107 FakeSessionManagerClient* fake_session_manager_client_; |
| 106 | 108 |
| 107 private: | 109 private: |
| 108 DISALLOW_COPY_AND_ASSIGN(NetworkScreenTest); | 110 DISALLOW_COPY_AND_ASSIGN(NetworkScreenTest); |
| 109 }; | 111 }; |
| 110 | 112 |
| 111 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, CanConnect) { | 113 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, CanConnect) { |
| 112 EXPECT_CALL(*mock_network_state_helper_, IsConnecting()) | 114 EXPECT_CALL(*mock_network_state_helper_, IsConnecting()) |
| (...skipping 27 matching lines...) Expand all Loading... |
| 140 // EXPECT_FALSE(actor_->IsConnecting()); | 142 // EXPECT_FALSE(actor_->IsConnecting()); |
| 141 network_screen_->OnConnectionTimeout(); | 143 network_screen_->OnConnectionTimeout(); |
| 142 | 144 |
| 143 // Close infobubble with error message - it makes the test stable. | 145 // Close infobubble with error message - it makes the test stable. |
| 144 // EXPECT_FALSE(actor_->IsContinueEnabled()); | 146 // EXPECT_FALSE(actor_->IsContinueEnabled()); |
| 145 // EXPECT_FALSE(actor_->IsConnecting()); | 147 // EXPECT_FALSE(actor_->IsConnecting()); |
| 146 // actor_->ClearErrors(); | 148 // actor_->ClearErrors(); |
| 147 } | 149 } |
| 148 | 150 |
| 149 } // namespace chromeos | 151 } // namespace chromeos |
| OLD | NEW |