| Index: webrtc/base/network_unittest.cc
|
| diff --git a/webrtc/base/network_unittest.cc b/webrtc/base/network_unittest.cc
|
| index 0f7d6db8ff2a54090fe99fc655ad735839e2861d..7ad45a37afc0b7c340a256678f51a02e6bea4a87 100644
|
| --- a/webrtc/base/network_unittest.cc
|
| +++ b/webrtc/base/network_unittest.cc
|
| @@ -58,6 +58,16 @@ class NetworkTest : public testing::Test, public sigslot::has_slots<> {
|
| callback_called_ = true;
|
| }
|
|
|
| + void listenToNetworkInactive(BasicNetworkManager& network_manager) {
|
| + BasicNetworkManager::NetworkList networks;
|
| + network_manager.GetNetworks(&networks);
|
| + for (Network* network : networks) {
|
| + network->SignalInactive.connect(this, &NetworkTest::OnNetworkInactive);
|
| + }
|
| + }
|
| +
|
| + void OnNetworkInactive(const Network* network) { num_networks_inactive_++; }
|
| +
|
| NetworkManager::Stats MergeNetworkList(
|
| BasicNetworkManager& network_manager,
|
| const NetworkManager::NetworkList& list,
|
| @@ -147,6 +157,8 @@ class NetworkTest : public testing::Test, public sigslot::has_slots<> {
|
|
|
| protected:
|
| bool callback_called_;
|
| + // Number of networks that become inactive.
|
| + int num_networks_inactive_ = 0;
|
| };
|
|
|
| class TestBasicNetworkManager : public BasicNetworkManager {
|
| @@ -280,6 +292,7 @@ TEST_F(NetworkTest, TestBasicMergeNetworkList) {
|
| EXPECT_TRUE(changed);
|
| EXPECT_EQ(stats.ipv6_network_count, 0);
|
| EXPECT_EQ(stats.ipv4_network_count, 1);
|
| + listenToNetworkInactive(manager);
|
| list.clear();
|
|
|
| manager.GetNetworks(&list);
|
| @@ -294,7 +307,9 @@ TEST_F(NetworkTest, TestBasicMergeNetworkList) {
|
| EXPECT_TRUE(changed);
|
| EXPECT_EQ(stats.ipv6_network_count, 0);
|
| EXPECT_EQ(stats.ipv4_network_count, 1);
|
| + EXPECT_EQ(1, num_networks_inactive_);
|
| list.clear();
|
| + num_networks_inactive_ = 0;
|
|
|
| manager.GetNetworks(&list);
|
| EXPECT_EQ(1U, list.size());
|
| @@ -309,6 +324,7 @@ TEST_F(NetworkTest, TestBasicMergeNetworkList) {
|
| EXPECT_TRUE(changed);
|
| EXPECT_EQ(stats.ipv6_network_count, 0);
|
| EXPECT_EQ(stats.ipv4_network_count, 2);
|
| + EXPECT_EQ(0, num_networks_inactive_);
|
| list.clear();
|
|
|
| // Verify that we get previous instances of Network objects.
|
| @@ -326,6 +342,7 @@ TEST_F(NetworkTest, TestBasicMergeNetworkList) {
|
| EXPECT_FALSE(changed);
|
| EXPECT_EQ(stats.ipv6_network_count, 0);
|
| EXPECT_EQ(stats.ipv4_network_count, 2);
|
| + EXPECT_EQ(0, num_networks_inactive_);
|
| list.clear();
|
|
|
| // Verify that we get previous instances of Network objects.
|
|
|