Merge "Properly test TrafficController permissions on package updates." (e21f0cf1) · Commits · e / os / android_frameworks_base

tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java

+22 −3

Original line number	Original line	Diff line number	Diff line
	@@ -561,11 +561,17 @@ public class PermissionMonitorTest {
	mNetdServiceMonitor.expectPermission(INetd.PERMISSION_NONE, new int[]{SYSTEM_UID1});		mNetdServiceMonitor.expectPermission(INetd.PERMISSION_NONE, new int[]{SYSTEM_UID1});
	}		}

	private PackageInfo addPackage(String packageName, int uid, String[] permissions)		private PackageInfo setPackagePermissions(String packageName, int uid, String[] permissions)
	throws Exception {		throws Exception {
	PackageInfo packageInfo = packageInfoWithPermissions(permissions, PARTITION_SYSTEM);		PackageInfo packageInfo = packageInfoWithPermissions(permissions, PARTITION_SYSTEM);
	when(mPackageManager.getPackageInfo(eq(packageName), anyInt())).thenReturn(packageInfo);		when(mPackageManager.getPackageInfo(eq(packageName), anyInt())).thenReturn(packageInfo);
	when(mPackageManager.getPackagesForUid(eq(uid))).thenReturn(new String[]{packageName});		when(mPackageManager.getPackagesForUid(eq(uid))).thenReturn(new String[]{packageName});
			return packageInfo;
			}

			private PackageInfo addPackage(String packageName, int uid, String[] permissions)
			throws Exception {
			PackageInfo packageInfo = setPackagePermissions(packageName, uid, permissions);
	mObserver.onPackageAdded(packageName, uid);		mObserver.onPackageAdded(packageName, uid);
	return packageInfo;		return packageInfo;
	}		}
	@@ -616,14 +622,13 @@ public class PermissionMonitorTest {
	}		}

	@Test		@Test
	public void testPackageUpdate() throws Exception {		public void testPackageRemoveThenAdd() throws Exception {
	final NetdServiceMonitor mNetdServiceMonitor = new NetdServiceMonitor(mNetdService);		final NetdServiceMonitor mNetdServiceMonitor = new NetdServiceMonitor(mNetdService);

	addPackage(MOCK_PACKAGE1, MOCK_UID1, new String[] {INTERNET, UPDATE_DEVICE_STATS});		addPackage(MOCK_PACKAGE1, MOCK_UID1, new String[] {INTERNET, UPDATE_DEVICE_STATS});
	mNetdServiceMonitor.expectPermission(INetd.PERMISSION_INTERNET		mNetdServiceMonitor.expectPermission(INetd.PERMISSION_INTERNET
	\| INetd.PERMISSION_UPDATE_DEVICE_STATS, new int[]{MOCK_UID1});		\| INetd.PERMISSION_UPDATE_DEVICE_STATS, new int[]{MOCK_UID1});

	// Remove and install the same package to simulate the update action
	when(mPackageManager.getPackagesForUid(MOCK_UID1)).thenReturn(new String[]{});		when(mPackageManager.getPackagesForUid(MOCK_UID1)).thenReturn(new String[]{});
	mObserver.onPackageRemoved(MOCK_PACKAGE1, MOCK_UID1);		mObserver.onPackageRemoved(MOCK_PACKAGE1, MOCK_UID1);
	mNetdServiceMonitor.expectPermission(INetd.PERMISSION_UNINSTALLED, new int[]{MOCK_UID1});		mNetdServiceMonitor.expectPermission(INetd.PERMISSION_UNINSTALLED, new int[]{MOCK_UID1});
	@@ -632,6 +637,20 @@ public class PermissionMonitorTest {
	mNetdServiceMonitor.expectPermission(INetd.PERMISSION_INTERNET, new int[]{MOCK_UID1});		mNetdServiceMonitor.expectPermission(INetd.PERMISSION_INTERNET, new int[]{MOCK_UID1});
	}		}

			@Test
			public void testPackageUpdate() throws Exception {
			final NetdServiceMonitor mNetdServiceMonitor = new NetdServiceMonitor(mNetdService);

			addPackage(MOCK_PACKAGE1, MOCK_UID1, new String[] {});
			mNetdServiceMonitor.expectPermission(INetd.PERMISSION_NONE, new int[]{MOCK_UID1});

			// When updating a package, the broadcast receiver gets two broadcasts (a remove and then an
			// add), but the observer sees only one callback (an update).
			setPackagePermissions(MOCK_PACKAGE1, MOCK_UID1, new String[] {INTERNET});
			mObserver.onPackageChanged(MOCK_PACKAGE1, MOCK_UID1);
			mNetdServiceMonitor.expectPermission(INetd.PERMISSION_INTERNET, new int[]{MOCK_UID1});
			}

	@Test		@Test
	public void testPackageUninstallWithMultiplePackages() throws Exception {		public void testPackageUninstallWithMultiplePackages() throws Exception {
	final NetdServiceMonitor mNetdServiceMonitor = new NetdServiceMonitor(mNetdService);		final NetdServiceMonitor mNetdServiceMonitor = new NetdServiceMonitor(mNetdService);