Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1403)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/dial/dial_registry_unittest.cc

Issue 2756483007: [Device Discovery] Move files from browser/extensions/api/dial to browser/media/router/discovery/di… (Closed)
Patch Set: resolve code review comments from Devlin Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/dial/dial_registry.cc ('k') | chrome/browser/extensions/api/dial/dial_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/dial/dial_registry_unittest.cc
diff --git a/chrome/browser/extensions/api/dial/dial_registry_unittest.cc b/chrome/browser/extensions/api/dial/dial_registry_unittest.cc
deleted file mode 100644
index bbe6a9da8020394dc1281c2ad3dd29e96dff9672..0000000000000000000000000000000000000000
--- a/chrome/browser/extensions/api/dial/dial_registry_unittest.cc
+++ /dev/null
@@ -1,382 +0,0 @@
-// Copyright (c) 2012 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 <stddef.h>
-
-#include "base/memory/ptr_util.h"
-#include "chrome/browser/extensions/api/dial/dial_device_data.h"
-#include "chrome/browser/extensions/api/dial/dial_registry.h"
-#include "chrome/browser/extensions/api/dial/dial_service.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"
-#include "url/gurl.h"
-
-using base::Time;
-using base::TimeDelta;
-using ::testing::A;
-using ::testing::AtLeast;
-using ::testing::Return;
-using ::testing::InSequence;
-
-namespace extensions {
-namespace api {
-namespace dial {
-
-class MockDialObserver : public DialRegistry::Observer {
- public:
- ~MockDialObserver() override {}
-
- MOCK_METHOD1(OnDialDeviceEvent,
- void(const DialRegistry::DeviceList& devices));
- MOCK_METHOD1(OnDialError, void(DialRegistry::DialErrorCode type));
-};
-
-class MockDialService : public DialService {
- public:
- ~MockDialService() override {}
-
- MOCK_METHOD0(Discover, bool());
- MOCK_METHOD1(AddObserver, void(DialService::Observer*));
- MOCK_METHOD1(RemoveObserver, void(DialService::Observer*));
- MOCK_CONST_METHOD1(HasObserver, bool(const DialService::Observer*));
-};
-
-class MockDialRegistry : public DialRegistry {
- public:
- MockDialRegistry(const base::TimeDelta& refresh_interval,
- const base::TimeDelta& expiration,
- const size_t max_devices)
- : DialRegistry(refresh_interval, expiration, max_devices),
- time_(Time::Now()) {}
-
- ~MockDialRegistry() override {
- // Don't let the DialRegistry delete this.
- DialService* tmp = dial_.release();
- if (tmp)
- CHECK_EQ(&mock_service_, tmp);
- }
-
- // Returns the mock Dial service.
- MockDialService& mock_service() {
- return mock_service_;
- }
-
- void set_time(Time time) { time_ = time; }
-
- protected:
- base::Time Now() const override { return time_; }
-
- std::unique_ptr<DialService> CreateDialService() override {
- return base::WrapUnique(&mock_service_);
- }
-
- void ClearDialService() override {
- // Release the pointer but don't delete the object because the test owns it.
- CHECK_EQ(&mock_service_, dial_.release());
- }
-
- private:
- MockDialService mock_service_;
-
- // Set to mock out the current time.
- Time time_;
-};
-
-class DialRegistryTest : public testing::Test {
- public:
- DialRegistryTest()
- : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
- first_device_("first", GURL("http://127.0.0.1/dd.xml"), Time::Now()),
- second_device_("second", GURL("http://127.0.0.2/dd.xml"), Time::Now()),
- third_device_("third", GURL("http://127.0.0.3/dd.xml"), Time::Now()) {
- registry_ = base::MakeUnique<MockDialRegistry>(
- TimeDelta::FromSeconds(1000), TimeDelta::FromSeconds(10), 10);
- registry_->RegisterObserver(&mock_observer_);
- list_with_first_device_.push_back(first_device_);
- list_with_second_device_.push_back(second_device_);
- }
-
- protected:
- void SetListenerExpectations() {
- EXPECT_CALL(registry_->mock_service(),
- AddObserver(A<DialService::Observer*>()));
- EXPECT_CALL(registry_->mock_service(),
- RemoveObserver(A<DialService::Observer*>()));
- }
-
- content::TestBrowserThreadBundle thread_bundle_;
- std::unique_ptr<MockDialRegistry> registry_;
- MockDialObserver mock_observer_;
- const DialDeviceData first_device_;
- const DialDeviceData second_device_;
- const DialDeviceData third_device_;
-
- const DialRegistry::DeviceList empty_list_;
- DialRegistry::DeviceList list_with_first_device_;
- DialRegistry::DeviceList list_with_second_device_;
-};
-
-TEST_F(DialRegistryTest, TestAddRemoveListeners) {
- SetListenerExpectations();
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(empty_list_)).Times(2);
-
- EXPECT_FALSE(registry_->repeating_timer_.IsRunning());
- registry_->OnListenerAdded();
- EXPECT_TRUE(registry_->repeating_timer_.IsRunning());
- registry_->OnListenerAdded();
- EXPECT_TRUE(registry_->repeating_timer_.IsRunning());
- registry_->OnListenerRemoved();
- EXPECT_TRUE(registry_->repeating_timer_.IsRunning());
- registry_->OnListenerRemoved();
- EXPECT_FALSE(registry_->repeating_timer_.IsRunning());
-}
-
-TEST_F(DialRegistryTest, TestNoDevicesDiscovered) {
- SetListenerExpectations();
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(empty_list_));
- EXPECT_CALL(registry_->mock_service(), Discover());
-
- registry_->OnListenerAdded();
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDiscoveryFinished(nullptr);
- registry_->OnListenerRemoved();
-}
-
-TEST_F(DialRegistryTest, TestDevicesDiscovered) {
- DialRegistry::DeviceList expected_list2;
- expected_list2.push_back(first_device_);
- expected_list2.push_back(second_device_);
-
- SetListenerExpectations();
- InSequence s;
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(empty_list_));
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(list_with_first_device_));
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(expected_list2));
-
- registry_->OnListenerAdded();
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDeviceDiscovered(nullptr, first_device_);
- registry_->OnDiscoveryFinished(nullptr);
-
- registry_->DoDiscovery();
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDeviceDiscovered(nullptr, second_device_);
- registry_->OnDiscoveryFinished(nullptr);
- registry_->OnListenerRemoved();
-}
-
-TEST_F(DialRegistryTest, TestDevicesDiscoveredWithTwoListeners) {
- DialRegistry::DeviceList expected_list2;
- expected_list2.push_back(first_device_);
- expected_list2.push_back(second_device_);
-
- SetListenerExpectations();
- InSequence s;
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(empty_list_));
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(list_with_first_device_))
- .Times(2);
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(expected_list2));
-
- registry_->OnListenerAdded();
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDeviceDiscovered(nullptr, first_device_);
- registry_->OnDiscoveryFinished(nullptr);
-
- registry_->OnListenerAdded();
-
- registry_->DoDiscovery();
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDeviceDiscovered(nullptr, second_device_);
- registry_->OnDiscoveryFinished(nullptr);
- registry_->OnListenerRemoved();
- registry_->OnListenerRemoved();
-}
-
-TEST_F(DialRegistryTest, TestDeviceExpires) {
- SetListenerExpectations();
- InSequence s;
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(empty_list_));
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(list_with_first_device_));
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(empty_list_));
-
- registry_->OnListenerAdded();
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDeviceDiscovered(nullptr, first_device_);
- registry_->OnDiscoveryFinished(nullptr);
-
- registry_->set_time(Time::Now() + TimeDelta::FromSeconds(30));
-
- registry_->DoDiscovery();
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDiscoveryFinished(nullptr);
- registry_->OnListenerRemoved();
-}
-
-TEST_F(DialRegistryTest, TestExpiredDeviceIsRediscovered) {
- std::vector<Time> discovery_times;
- discovery_times.push_back(Time::Now());
- discovery_times.push_back(discovery_times[0] + TimeDelta::FromSeconds(30));
- discovery_times.push_back(discovery_times[1] + TimeDelta::FromSeconds(30));
-
- DialDeviceData rediscovered_device("first",
- GURL("http://127.0.0.1/dd.xml"),
- discovery_times[2]);
-
- SetListenerExpectations();
-
- InSequence s;
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(empty_list_));
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(list_with_first_device_));
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(empty_list_));
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(list_with_first_device_));
-
- registry_->set_time(discovery_times[0]);
- registry_->OnListenerAdded();
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDeviceDiscovered(nullptr, first_device_);
- registry_->OnDiscoveryFinished(nullptr);
-
- // Will expire "first" device as it is not discovered this time.
- registry_->set_time(discovery_times[1]);
- registry_->DoDiscovery();
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDiscoveryFinished(nullptr);
-
- // "first" device is rediscovered 30 seconds later. We pass a device object
- // with a newer discovery time so it is not pruned immediately.
- registry_->set_time(discovery_times[2]);
- registry_->DoDiscovery();
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDeviceDiscovered(nullptr, rediscovered_device);
- registry_->OnDiscoveryFinished(nullptr);
-
- registry_->OnListenerRemoved();
-}
-
-TEST_F(DialRegistryTest, TestRemovingListenerDoesNotClearList) {
- DialRegistry::DeviceList expected_list2;
- expected_list2.push_back(first_device_);
- expected_list2.push_back(second_device_);
-
- InSequence s;
- EXPECT_CALL(registry_->mock_service(),
- AddObserver(A<DialService::Observer*>()));
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(empty_list_));
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(expected_list2));
- EXPECT_CALL(registry_->mock_service(),
- RemoveObserver(A<DialService::Observer*>()));
-
- registry_->OnListenerAdded();
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDeviceDiscovered(nullptr, first_device_);
- registry_->OnDeviceDiscovered(nullptr, second_device_);
- registry_->OnDiscoveryFinished(nullptr);
- registry_->OnListenerRemoved();
-
- // Removing and adding a listener again fires an event with the current device
- // list (even though no new devices were discovered).
- EXPECT_CALL(registry_->mock_service(),
- AddObserver(A<DialService::Observer*>()));
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(expected_list2));
- EXPECT_CALL(registry_->mock_service(),
- RemoveObserver(A<DialService::Observer*>()));
-
- registry_->OnListenerAdded();
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDiscoveryFinished(nullptr);
- registry_->OnListenerRemoved();
-}
-
-TEST_F(DialRegistryTest, TestNetworkEventConnectionLost) {
- SetListenerExpectations();
-
- InSequence s;
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(empty_list_));
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(list_with_first_device_));
- EXPECT_CALL(mock_observer_,
- OnDialError(DialRegistry::DIAL_NETWORK_DISCONNECTED));
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(empty_list_));
-
- registry_->OnListenerAdded();
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDeviceDiscovered(nullptr, first_device_);
- registry_->OnDiscoveryFinished(nullptr);
-
- registry_->OnNetworkChanged(net::NetworkChangeNotifier::CONNECTION_NONE);
-
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDiscoveryFinished(nullptr);
- registry_->OnListenerRemoved();
-}
-
-TEST_F(DialRegistryTest, TestNetworkEventConnectionRestored) {
- DialRegistry::DeviceList expected_list3;
- expected_list3.push_back(second_device_);
- expected_list3.push_back(third_device_);
-
- // A disconnection should shutdown the DialService, so we expect the observer
- // to be added twice.
- EXPECT_CALL(registry_->mock_service(),
- AddObserver(A<DialService::Observer*>()))
- .Times(2);
- EXPECT_CALL(registry_->mock_service(),
- RemoveObserver(A<DialService::Observer*>()))
- .Times(2);
-
- InSequence s;
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(empty_list_));
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(list_with_first_device_));
-
- EXPECT_CALL(mock_observer_,
- OnDialError(DialRegistry::DIAL_NETWORK_DISCONNECTED));
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(empty_list_));
-
- EXPECT_CALL(registry_->mock_service(), Discover());
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(list_with_second_device_));
- EXPECT_CALL(mock_observer_, OnDialDeviceEvent(expected_list3));
-
- registry_->OnListenerAdded();
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDeviceDiscovered(nullptr, first_device_);
- registry_->OnDiscoveryFinished(nullptr);
-
- registry_->OnNetworkChanged(net::NetworkChangeNotifier::CONNECTION_NONE);
-
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDiscoveryFinished(nullptr);
-
- registry_->OnNetworkChanged(net::NetworkChangeNotifier::CONNECTION_WIFI);
-
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDeviceDiscovered(nullptr, second_device_);
- registry_->OnDiscoveryFinished(nullptr);
-
- registry_->OnNetworkChanged(net::NetworkChangeNotifier::CONNECTION_ETHERNET);
-
- registry_->OnDiscoveryRequest(nullptr);
- registry_->OnDeviceDiscovered(nullptr, third_device_);
- registry_->OnDiscoveryFinished(nullptr);
-
- registry_->OnListenerRemoved();
-}
-
-} // namespace dial
-} // namespace api
-} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/api/dial/dial_registry.cc ('k') | chrome/browser/extensions/api/dial/dial_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698