Cherry-pick some test changes from ag/13210542. am: e7963a1d82 am: eb0dc8f775

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645000

Change-Id: I22e26261dcc59274c4286271409ee63c1760b074
This commit is contained in:
Lorenzo Colitti
2021-03-21 17:29:29 +00:00
committed by Automerger Merge Worker

View File

@@ -20,6 +20,7 @@ import static com.android.server.connectivity.NetworkNotificationManager.Notific
import static org.mockito.Mockito.any; import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.eq; import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@@ -142,15 +143,15 @@ public class NetworkNotificationManagerTest {
public void testTitleOfPrivateDnsBroken() { public void testTitleOfPrivateDnsBroken() {
// Test the title of mobile data. // Test the title of mobile data.
verifyTitleByNetwork(100, mCellNai, R.string.mobile_no_internet); verifyTitleByNetwork(100, mCellNai, R.string.mobile_no_internet);
reset(mResources); clearInvocations(mResources);
// Test the title of wifi. // Test the title of wifi.
verifyTitleByNetwork(101, mWifiNai, R.string.wifi_no_internet); verifyTitleByNetwork(101, mWifiNai, R.string.wifi_no_internet);
reset(mResources); clearInvocations(mResources);
// Test the title of other networks. // Test the title of other networks.
verifyTitleByNetwork(102, mVpnNai, R.string.other_networks_no_internet); verifyTitleByNetwork(102, mVpnNai, R.string.other_networks_no_internet);
reset(mResources); clearInvocations(mResources);
} }
@Test @Test