commit 47c2eebc857c2a070bfa5b0120b92095e9b9a4cf
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Apr 07 05:06:53 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 07 05:06:53 2018 +0000
tree 9e71e6bafe593efcaba97fa59480c8f2a2c192d5
parent aeb33b72b36faad50a5e3df5a38859fcf8e1371a
parent fabbd1730cb53ea519849fdf57f9690c7427fa90

Merge "Fix test expectations for NetworkCallbacks" into pi-dev

tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
index 69cfb10..3f8ee5a 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
@@ -26,8 +26,11 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.net.NetworkRequest;
 import android.net.NetworkScoreManager;
 import android.net.wifi.WifiManager;
+import android.os.Handler;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceScreen;
 
@@ -54,6 +57,8 @@
     @Mock
     private MasterSwitchPreference mPreference;
     @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
     private NetworkScoreManager mNetworkScoreManager;
 
     private Context mContext;
@@ -65,6 +70,7 @@
         MockitoAnnotations.initMocks(this);
         mMetricsFeatureProvider = FakeFeatureFactory.setupForTest().getMetricsFeatureProvider();
         mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
         when(mContext.getSystemService(NetworkScoreManager.class)).thenReturn(mNetworkScoreManager);
         mController = new WifiMasterSwitchPreferenceController(mContext, mMetricsFeatureProvider);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -89,6 +95,10 @@
         mController.onResume();
 
         verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
+        verify(mConnectivityManager).registerNetworkCallback(
+                any(NetworkRequest.class),
+                any(ConnectivityManager.NetworkCallback.class),
+                any(Handler.class));
     }
 
     @Test
@@ -97,6 +107,8 @@
         mController.onPause();
 
         verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
+        verify(mConnectivityManager).unregisterNetworkCallback(
+                any(ConnectivityManager.NetworkCallback.class));
     }
 
     @Test