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

Updating tests to honor per-app TRACK_DEFAULT am: 5c3bb5b1ce

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723153

Change-Id: I144339a24f956aa4144efebf298eda3d323e4d2b
This commit is contained in:
James Mattis
2021-06-07 13:59:12 +00:00
committed by Automerger Merge Worker
parent b6fac46c0d 5c3bb5b1ce
commit 5706b8961d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -11695,10 +11695,12 @@ public class ConnectivityServiceTest {
mServiceContext, "internetFactory", internetFilter, mCsHandlerThread); mServiceContext, "internetFactory", internetFilter, mCsHandlerThread);
internetFactory.setScoreFilter(40); internetFactory.setScoreFilter(40);
internetFactory.register(); internetFactory.register();
// Default internet request & 3rd (fallback) request in OEM_PAID NRI. The unmetered request // Default internet request only. The unmetered request is never sent to factories (it's a
// is never sent to factories (it's a LISTEN, not requestable) and the OEM_PAID request // LISTEN, not requestable). The 3rd (fallback) request in OEM_PAID NRI is TRACK_DEFAULT
// doesn't match the internetFactory filter. // which is also not sent to factories. Finally, the OEM_PAID request doesn't match the
internetFactory.expectRequestAdds(2); // internetFactory filter.
internetFactory.expectRequestAdds(1);
internetFactory.assertRequestCountEquals(1);
NetworkCapabilities oemPaidFilter = new NetworkCapabilities() NetworkCapabilities oemPaidFilter = new NetworkCapabilities()
.addCapability(NET_CAPABILITY_INTERNET) .addCapability(NET_CAPABILITY_INTERNET)
@@ -11721,7 +11723,7 @@ public class ConnectivityServiceTest {
expectNoRequestChanged(oemPaidFactory); expectNoRequestChanged(oemPaidFactory);
oemPaidFactory.assertRequestCountEquals(1); oemPaidFactory.assertRequestCountEquals(1);
// The internet factory however is outscored, and should lose its requests. // The internet factory however is outscored, and should lose its requests.
internetFactory.expectRequestRemoves(2); internetFactory.expectRequestRemove();
internetFactory.assertRequestCountEquals(0); internetFactory.assertRequestCountEquals(0);
final NetworkCapabilities oemPaidNc = new NetworkCapabilities(); final NetworkCapabilities oemPaidNc = new NetworkCapabilities();