LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert new tests and PackageManager mock

Browse Source 
A mocked PackageManager caused test failures in existing tests.
Revert that for now to make tests pass again.

Bug: 114231106
Bug: 130397860
Test: atest FrameworksNetTests
Change-Id: I4f181789152438f18e6cd2d235d76fabe3872ea3
This commit is contained in:
Lorenzo Colitti
2019-04-12 19:50:22 +09:00
parent bad9d911b8
commit 44c6efb9c1
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -16,8 +16,6 @@
package com.android.server; package com.android.server;
import static android.content.pm.PackageManager.GET_PERMISSIONS;
import static android.content.pm.PackageManager.MATCH_ANY_USER;
import static android.net.ConnectivityManager.CONNECTIVITY_ACTION; import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
import static android.net.ConnectivityManager.NETID_UNSET; import static android.net.ConnectivityManager.NETID_UNSET;
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;
@@ -105,7 +103,6 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.content.res.Resources; import android.content.res.Resources;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
@@ -274,7 +271,6 @@ public class ConnectivityServiceTest {
@Mock IDnsResolver mMockDnsResolver; @Mock IDnsResolver mMockDnsResolver;
@Mock INetd mMockNetd; @Mock INetd mMockNetd;
@Mock NetworkStackClient mNetworkStack; @Mock NetworkStackClient mNetworkStack;
@Mock PackageManager mPackageManager;
@Mock UserManager mUserManager; @Mock UserManager mUserManager;
private ArgumentCaptor<String[]> mStringArrayCaptor = ArgumentCaptor.forClass(String[].class); private ArgumentCaptor<String[]> mStringArrayCaptor = ArgumentCaptor.forClass(String[].class);
@@ -359,11 +355,6 @@ public class ConnectivityServiceTest {
public Resources getResources() { public Resources getResources() {
return mResources; return mResources;
} }
@Override
public PackageManager getPackageManager() {
return mPackageManager;
}
} }
public void waitForIdle(int timeoutMsAsInt) { public void waitForIdle(int timeoutMsAsInt) {
@@ -1233,12 +1224,6 @@ public class ConnectivityServiceTest {
Arrays.asList(new UserInfo[] { Arrays.asList(new UserInfo[] {
new UserInfo(VPN_USER, "", 0), new UserInfo(VPN_USER, "", 0),
})); }));
when(mPackageManager.getInstalledPackages(eq(GET_PERMISSIONS | MATCH_ANY_USER))).thenReturn(
Arrays.asList(new PackageInfo[] {
buildPackageInfo(/* SYSTEM */ false, APP1_UID),
buildPackageInfo(/* SYSTEM */ false, APP2_UID),
buildPackageInfo(/* SYSTEM */ false, VPN_UID)
}));
// InstrumentationTestRunner prepares a looper, but AndroidJUnitRunner does not. // InstrumentationTestRunner prepares a looper, but AndroidJUnitRunner does not.
// http://b/25897652 . // http://b/25897652 .
@@ -6168,6 +6153,7 @@ public class ConnectivityServiceTest {
} }
@Test @Test
@Ignore
public void testFullyRoutedVpnResultsInInterfaceFilteringRules() throws Exception { public void testFullyRoutedVpnResultsInInterfaceFilteringRules() throws Exception {
LinkProperties lp = new LinkProperties(); LinkProperties lp = new LinkProperties();
lp.setInterfaceName("tun0"); lp.setInterfaceName("tun0");
@@ -6194,6 +6180,7 @@ public class ConnectivityServiceTest {
} }
@Test @Test
@Ignore
public void testLegacyVpnDoesNotResultInInterfaceFilteringRule() throws Exception { public void testLegacyVpnDoesNotResultInInterfaceFilteringRule() throws Exception {
LinkProperties lp = new LinkProperties(); LinkProperties lp = new LinkProperties();
lp.setInterfaceName("tun0"); lp.setInterfaceName("tun0");
@@ -6206,6 +6193,8 @@ public class ConnectivityServiceTest {
verify(mMockNetd, never()).firewallAddUidInterfaceRules(any(), any()); verify(mMockNetd, never()).firewallAddUidInterfaceRules(any(), any());
} }
@Test
@Ignore
public void testLocalIpv4OnlyVpnDoesNotResultInInterfaceFilteringRule() public void testLocalIpv4OnlyVpnDoesNotResultInInterfaceFilteringRule()
throws Exception { throws Exception {
LinkProperties lp = new LinkProperties(); LinkProperties lp = new LinkProperties();
@@ -6221,6 +6210,7 @@ public class ConnectivityServiceTest {
} }
@Test @Test
@Ignore
public void testVpnHandoverChangesInterfaceFilteringRule() throws Exception { public void testVpnHandoverChangesInterfaceFilteringRule() throws Exception {
LinkProperties lp = new LinkProperties(); LinkProperties lp = new LinkProperties();
lp.setInterfaceName("tun0"); lp.setInterfaceName("tun0");
@@ -6270,6 +6260,7 @@ public class ConnectivityServiceTest {
} }
@Test @Test
@Ignore
public void testUidUpdateChangesInterfaceFilteringRule() throws Exception { public void testUidUpdateChangesInterfaceFilteringRule() throws Exception {
LinkProperties lp = new LinkProperties(); LinkProperties lp = new LinkProperties();
lp.setInterfaceName("tun0"); lp.setInterfaceName("tun0");