[Media Router] Use DialMediaSinkService in MediaRouterMojoImpl

chrome/browser/media/router/discovery/dial/dial_media_sink_service_unittest.cc

 // Copyright 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 "chrome/browser/media/router/discovery/dial/dial_media_sink_service.h"
+#include "base/run_loop.h"
 #include "base/test/mock_callback.h"
 #include "chrome/browser/media/router/discovery/dial/dial_device_data.h"
 #include "chrome/browser/media/router/discovery/dial/dial_registry.h"
 #include "chrome/browser/media/router/test_helper.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
@@ skipping 33 matching lines @@
 
 namespace media_router {
 
 class TestDialRegistry : public DialRegistry {
  public:
   TestDialRegistry() {}
   ~TestDialRegistry() {}
 
   MOCK_METHOD1(RegisterObserver, void(DialRegistry::Observer* observer));
   MOCK_METHOD1(UnregisterObserver, void(DialRegistry::Observer* observer));
+
+  MOCK_METHOD0(StartPeriodicDiscovery, void());
+  MOCK_METHOD0(StopPeriodicDiscovery, void());
 };
 
 class MockDeviceDescriptionService : public DeviceDescriptionService {
  public:
   MockDeviceDescriptionService(DeviceDescriptionParseSuccessCallback success_cb,
                                DeviceDescriptionParseErrorCallback error_cb)
       : DeviceDescriptionService(success_cb, error_cb) {}
   ~MockDeviceDescriptionService() override {}
 
   MOCK_METHOD2(GetDeviceDescriptions,
@@ skipping 12 matching lines @@
         test_dial_registry_(test_dial_registry),
         mock_description_service_(mock_description_service) {}
 
   DialRegistry* dial_registry() override { return test_dial_registry_; }
 
   DeviceDescriptionService* GetDescriptionService() override {
     return mock_description_service_;
   }
 
  private:
+  ~TestDialMediaSinkService() override {}

[Kevin M, 2017/05/03 21:07:27]

Is this necessary? The object will be deleted from inside a scoped_refptr.

[zhaobin, 2017/05/04 23:52:36]

Code removed.

+
   TestDialRegistry* test_dial_registry_;
   MockDeviceDescriptionService* mock_description_service_;
 };
 
 class DialMediaSinkServiceTest : public ::testing::Test {
  public:
   DialMediaSinkServiceTest()
-      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
-        mock_description_service_(mock_success_cb_.Get(), mock_error_cb_.Get()),
-        media_sink_service_(mock_sink_discovered_cb_.Get(),
-                            profile_.GetRequestContext(),
-                            &test_dial_registry_,
-                            &mock_description_service_) {}
+      : mock_description_service_(mock_success_cb_.Get(), mock_error_cb_.Get()),
+        media_sink_service_(
+            new TestDialMediaSinkService(mock_sink_discovered_cb_.Get(),
+                                         profile_.GetRequestContext(),
+                                         &test_dial_registry_,
+                                         &mock_description_service_)) {}
 
-  DialMediaSinkService* media_sink_service() { return &media_sink_service_; }
+  DialMediaSinkService* media_sink_service() {

[Kevin M, 2017/05/03 21:07:27]

Getter method isn't necessary? Can just use arrow operator on
media_sink_service_ directly

[zhaobin, 2017/05/04 23:52:36]

Done.

+    return media_sink_service_.get();
+  }
 
   void TestFetchCompleted(const std::vector<MediaSinkInternal>& old_sinks,
                           const std::vector<MediaSinkInternal>& new_sinks) {
+    base::RunLoop run_loop;

[Kevin M, 2017/05/03 21:07:27]

Nit..

*The runloop doesn't have to be in scope when tasks are posted.
*You can call RunUntilIdle on a RunLoop rvalue at the end of the function, e.g.

base::RunLoop().RunUntilIdle()


here and elsewhere

[zhaobin, 2017/05/04 23:52:36]

Done.

     media_sink_service()->mrp_sinks_ =
         std::set<MediaSinkInternal>(old_sinks.begin(), old_sinks.end());
     media_sink_service()->current_sinks_ =
         std::set<MediaSinkInternal>(new_sinks.begin(), new_sinks.end());
     EXPECT_CALL(mock_sink_discovered_cb_, Run(new_sinks));
     media_sink_service()->OnFetchCompleted();

[Kevin M, 2017/05/03 21:07:27]

Also, see my previous comment about Timer dependency injection. Working with the
timer is a higher fidelity test than spoofing calls to
media_sink_service::OnFetchCompleted().

[zhaobin, 2017/05/04 23:52:36]

This aims to test OnFetchCompleted() function only. Will create a new function
to test timer.

+    run_loop.RunUntilIdle();
   }
 
  protected:
   const content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
 
   base::MockCallback<MediaSinkService::OnSinksDiscoveredCallback>
       mock_sink_discovered_cb_;
   base::MockCallback<
       MockDeviceDescriptionService::DeviceDescriptionParseSuccessCallback>
       mock_success_cb_;
   base::MockCallback<
       MockDeviceDescriptionService::DeviceDescriptionParseErrorCallback>
       mock_error_cb_;
 
   TestDialRegistry test_dial_registry_;
   MockDeviceDescriptionService mock_description_service_;
 
-  TestDialMediaSinkService media_sink_service_;
+  scoped_refptr<TestDialMediaSinkService> media_sink_service_;

[Kevin M, 2017/05/03 21:07:27]

DISALLOW_COPY_AND_ASSIGN(DialMediaSinkServiceTest);

[zhaobin, 2017/05/04 23:52:36]

Done.

 };
 
 TEST_F(DialMediaSinkServiceTest, TestStart) {
-  EXPECT_CALL(test_dial_registry_, RegisterObserver(&media_sink_service_));
+  base::RunLoop run_loop;
+  EXPECT_CALL(test_dial_registry_, RegisterObserver(media_sink_service()));
+  EXPECT_CALL(test_dial_registry_, StartPeriodicDiscovery());
   media_sink_service()->Start();
 
   DialRegistry::DeviceList deviceList;
   DialDeviceData first_device("first", GURL("http://127.0.0.1/dd.xml"),
                               base::Time::Now());
   DialDeviceData second_device("second", GURL("http://127.0.0.2/dd.xml"),
                                base::Time::Now());
   DialDeviceData third_device("third", GURL("http://127.0.0.3/dd.xml"),
                               base::Time::Now());
   deviceList.push_back(first_device);
   deviceList.push_back(second_device);
   deviceList.push_back(third_device);
 
   EXPECT_CALL(mock_description_service_, GetDeviceDescriptions(deviceList, _));
 
   media_sink_service()->OnDialDeviceEvent(deviceList);
-  EXPECT_TRUE(media_sink_service_.finish_timer_->IsRunning());
+  EXPECT_TRUE(media_sink_service()->finish_timer_->IsRunning());

[Kevin M, 2017/05/03 21:07:27]

No need to use a getter function; you can use the arrow operator on the field.

e.g."media_sink_service_->finish_timer_->IsRunning()"

[zhaobin, 2017/05/04 23:52:36]

Done.

+  run_loop.RunUntilIdle();
 }
 
 TEST_F(DialMediaSinkServiceTest, TestOnDeviceDescriptionAvailable) {
   DialDeviceData device_data("first", GURL("http://127.0.0.1/dd.xml"),
                              base::Time::Now());
   ParsedDialDeviceDescription device_description;
   device_description.model_name = "model name";
   device_description.friendly_name = "friendly name";
   device_description.app_url = GURL("http://192.168.1.1/apps");
   device_description.unique_id = "unique id";
 
   media_sink_service()->OnDeviceDescriptionAvailable(device_data,
                                                      device_description);
   EXPECT_TRUE(media_sink_service()->current_sinks_.empty());
 
   std::vector<DialDeviceData> deviceList{device_data};
   EXPECT_CALL(mock_description_service_, GetDeviceDescriptions(deviceList, _));
 
   media_sink_service()->OnDialDeviceEvent(deviceList);
   media_sink_service()->OnDeviceDescriptionAvailable(device_data,
                                                      device_description);
 
   EXPECT_EQ(size_t(1), media_sink_service()->current_sinks_.size());
 }
 
-TEST_F(DialMediaSinkServiceTest, TestFetchCompleted) {
+TEST_F(DialMediaSinkServiceTest, TestFetchCompleted_SameSink) {
   std::vector<MediaSinkInternal> old_sinks;
   std::vector<MediaSinkInternal> new_sinks = CreateDialMediaSinks();
   TestFetchCompleted(old_sinks, new_sinks);
 
   // Same sink
+  base::RunLoop run_loop;
   EXPECT_CALL(mock_sink_discovered_cb_, Run(new_sinks)).Times(0);
   media_sink_service()->OnFetchCompleted();
+  run_loop.RunUntilIdle();
 }
 
 TEST_F(DialMediaSinkServiceTest, TestFetchCompleted_OneNewSink) {
   std::vector<MediaSinkInternal> old_sinks = CreateDialMediaSinks();
   std::vector<MediaSinkInternal> new_sinks = CreateDialMediaSinks();
   MediaSink sink3("sink3", "sink_name_3", MediaSink::IconType::CAST);
   DialSinkExtraData extra_data3 = CreateDialSinkExtraData(
       "model_name3", "192.168.1.3", "https://example3.com");
   new_sinks.push_back(MediaSinkInternal(sink3, extra_data3));
   TestFetchCompleted(old_sinks, new_sinks);
@@ skipping 25 matching lines @@
       "model_name3", "192.168.1.3", "https://example3.com");
 
   std::vector<MediaSinkInternal> new_sinks;
   new_sinks.push_back(MediaSinkInternal(sink1, extra_data2));
   new_sinks.push_back(MediaSinkInternal(sink3, extra_data3));
 
   TestFetchCompleted(old_sinks, new_sinks);
 }
 
 }  // namespace media_router