Merge "Adjust NetworkStatsServiceTest to mock out the JNI."

This commit is contained in:
Treehugger Robot
2022-01-28 11:51:44 +00:00
committed by Gerrit Code Review

View File

@@ -198,6 +198,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
@Mock
private LocationPermissionChecker mLocationPermissionChecker;
private @Mock IBpfMap<U32, U8> mUidCounterSetMap;
private @Mock NetworkStatsService.TagStatsDeleter mTagStatsDeleter;
private NetworkStatsService mService;
private INetworkStatsSession mSession;
@@ -358,6 +359,11 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
public IBpfMap<U32, U8> getUidCounterSetMap() {
return mUidCounterSetMap;
}
@Override
public NetworkStatsService.TagStatsDeleter getTagStatsDeleter() {
return mTagStatsDeleter;
}
};
}
@@ -696,8 +702,10 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
final Intent intent = new Intent(ACTION_UID_REMOVED);
intent.putExtra(EXTRA_UID, UID_BLUE);
mServiceContext.sendBroadcast(intent);
verify(mTagStatsDeleter).deleteTagData(UID_BLUE);
intent.putExtra(EXTRA_UID, UID_RED);
mServiceContext.sendBroadcast(intent);
verify(mTagStatsDeleter).deleteTagData(UID_RED);
// existing uid and total should remain unchanged; but removed UID
// should be gone completely.