Fix autoupdate_EndToEndTest on veyron_rialto

chrome/browser/chromeos/login/screens/network_screen_unittest.cc

Index: chrome/browser/chromeos/login/screens/network_screen_unittest.cc
diff --git a/chrome/browser/chromeos/login/screens/network_screen_unittest.cc b/chrome/browser/chromeos/login/screens/network_screen_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..43a54ef7428719b82a0b41acfbacfa38b86b4d80
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/network_screen_unittest.cc
@@ -0,0 +1,155 @@
+// Copyright (c) 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/command_line.h"
+#include "base/message_loop/message_loop.h"
+#include "base/strings/utf_string_conversions.h"

[xiyuan, 2017/04/27 19:34:21]

unused?

[kumarniranjan, 2017/04/27 22:58:59]

It is used on line 131 and line 146.

+#include "base/test/scoped_mock_time_message_loop_task_runner.h"
+#include "chrome/browser/chromeos/input_method/input_method_configuration.h"
+#include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h"
+#include "chrome/browser/chromeos/login/mock_network_state_helper.h"
+#include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
+#include "chrome/browser/chromeos/login/screens/mock_model_view_channel.h"
+#include "chrome/browser/chromeos/login/screens/mock_network_screen.h"

[xiyuan, 2017/04/27 19:34:21]

unused?

[kumarniranjan, 2017/04/27 22:58:59]

It is used to import MockNetworkView (see line 78)

+#include "chrome/browser/chromeos/settings/cros_settings.h"
+#include "chrome/browser/chromeos/settings/device_settings_service.h"
+#include "chrome/test/base/testing_browser_process.h"
+#include "chromeos/chromeos_switches.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/system/fake_statistics_provider.h"

[xiyuan, 2017/04/27 19:34:22]

unused?

[kumarniranjan, 2017/04/27 22:58:59]

It is needed for ScopedFakeStatisticsProvider (see line 90)

+#include "content/public/test/test_browser_thread_bundle.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/ime/chromeos/mock_component_extension_ime_manager.h"
+
+using testing::_;
+using testing::AnyNumber;
+using testing::Return;
+
+namespace chromeos {
+
+class NetworkScreenUnitTest : public testing::Test {
+ public:
+  NetworkScreenUnitTest() {}
+
+  void FastForwardTime(base::TimeDelta time) {
+    runner_.task_runner()->FastForwardBy(time);
+  }
+
+  // testing::Test:
+  void SetUp() override {
+    // Initialize the thread manager.
+    DBusThreadManager::Initialize();
+
+    // Configure the browser to use Hands-Off Enrollment.
+    base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+        switches::kEnterpriseEnableZeroTouchEnrollment, "hands-off");
+
+    // Replace the regular InputMethodManager with a mock.
+    input_method::MockInputMethodManagerImpl* mock_input_manager =
+        new input_method::MockInputMethodManagerImpl();
+    mock_input_manager->SetComponentExtensionIMEManager(
+        std::unique_ptr<MockComponentExtensionIMEManager>(
+            new MockComponentExtensionIMEManager()));
+    input_method::InitializeForTesting(mock_input_manager);
+
+    // Create the NetworkScreen we will use for testing.
+    network_screen_.reset(
+        new NetworkScreen(&mock_base_screen_delegate_, nullptr, &mock_view_));
+    network_screen_->set_model_view_channel(&mock_channel_);
+    mock_network_state_helper_ = new login::MockNetworkStateHelper();
+    network_screen_->SetNetworkStateHelperForTest(mock_network_state_helper_);
+  }
+
+  void TearDown() override {
+    TestingBrowserProcess::GetGlobal()->SetShuttingDown(true);
+    network_screen_.reset();
+    CrosSettings::Get()->ClearSettingsObservers(kSystemTimezone);

[xiyuan, 2017/04/27 19:34:21]

Why do we need to do this? Wouldn't network_screen_.reset() above be good
enough?

[kumarniranjan, 2017/04/27 22:58:59]

I needed to do it earlier during development, but now, with the
network_screen_.reset(), you are right; it is no longer needed. Removing it.

+    input_method::Shutdown();
+    DBusThreadManager::Shutdown();
+  }
+
+ protected:
+  // A pointer to the NetworkScreen.
+  std::unique_ptr<NetworkScreen> network_screen_;
+
+  // Accessory objects needed by NetworkScreen.
+  MockBaseScreenDelegate mock_base_screen_delegate_;
+  MockNetworkView mock_view_;
+  MockModelViewChannel mock_channel_;

[xiyuan, 2017/04/27 19:34:21]

nit: |mock_view_| and |mock_channel_| can be private.

[kumarniranjan, 2017/04/27 22:58:59]

Done.

+  login::MockNetworkStateHelper* mock_network_state_helper_;

[xiyuan, 2017/04/27 19:34:21]

nit: = nullptr;

[kumarniranjan, 2017/04/27 22:58:59]

Done.

+
+  // Test versions of core browser infrastructure.
+  content::TestBrowserThreadBundle threads_;
+  base::ScopedMockTimeMessageLoopTaskRunner runner_;

[xiyuan, 2017/04/27 19:34:22]

nit: prefer to make the two members private and add an accessor for |runner_|.

[kumarniranjan, 2017/04/27 22:58:59]

Done.

+
+ private:
+  // Scoped test versions of required global objects.
+  ScopedTestDeviceSettingsService device_settings_;
+  ScopedTestCrosSettings cros_settings_;
+  system::ScopedFakeStatisticsProvider provider_;
+
+  DISALLOW_COPY_AND_ASSIGN(NetworkScreenUnitTest);
+};
+
+TEST_F(NetworkScreenUnitTest, ContinuesAutomatically) {
+  // Verify that we are using the right TaskRunner.
+  EXPECT_EQ(runner_.task_runner(),
+            base::MessageLoop::current()->task_runner().get());
+
+  // Set expectation that NetworkScreen will finish.
+  EXPECT_CALL(mock_base_screen_delegate_,
+              OnExit(_, ScreenExitCode::NETWORK_CONNECTED, _))
+      .Times(1);
+
+  // Simulate a network connection.
+  EXPECT_CALL(*mock_network_state_helper_, IsConnected())
+      .Times(AnyNumber())
+      .WillRepeatedly((Return(true)));
+  network_screen_->UpdateStatus();
+
+  // Fast forward time by 3 minutes.
+  FastForwardTime(base::TimeDelta::FromMinutes(3));
+
+  // Check that we continued once
+  EXPECT_EQ(1, network_screen_->continue_attempts_);
+}
+
+TEST_F(NetworkScreenUnitTest, ContinuesOnlyOnce) {
+  // Verify that we are using the right TaskRunner.
+  EXPECT_EQ(runner_.task_runner(),
+            base::MessageLoop::current()->task_runner().get());
+
+  // Set expectation that NetworkScreen will finish.
+  EXPECT_CALL(mock_base_screen_delegate_,
+              OnExit(_, ScreenExitCode::NETWORK_CONNECTED, _))
+      .Times(1);
+
+  // Connect to network "net0".
+  EXPECT_CALL(*mock_network_state_helper_, GetCurrentNetworkName())
+      .Times(AnyNumber())
+      .WillRepeatedly(Return(base::ASCIIToUTF16("net0")));
+  EXPECT_CALL(*mock_network_state_helper_, IsConnected())
+      .Times(AnyNumber())
+      .WillRepeatedly(Return(true));
+
+  // Stop waiting for net0.
+  network_screen_->StopWaitingForConnection(base::ASCIIToUTF16("net0"));
+
+  // Fast forward time by 3 minutes.
+  FastForwardTime(base::TimeDelta::FromMinutes(3));
+
+  // Check that we have continued exactly once.
+  ASSERT_EQ(1, network_screen_->continue_attempts_);
+
+  // Stop waiting for another network, net1.
+  network_screen_->StopWaitingForConnection(base::ASCIIToUTF16("net1"));
+
+  // Fast forward time by 3 minutes.
+  FastForwardTime(base::TimeDelta::FromMinutes(3));
+
+  // Check that we have still continued only once.
+  EXPECT_EQ(1, network_screen_->continue_attempts_);
+}
+
+}  // namespace chromeos