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

[MS17.2] Fix remaining daily budget assertion am: eaa58de991

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

Change-Id: Ia9d27be5a7114f547946375efeebd6ea848af351
This commit is contained in:
Junyu Lai
2022-01-07 14:32:19 +00:00
committed by Automerger Merge Worker
parent 41e2be2aa8 eaa58de991
commit e09d39d37e
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java
View File

@@ -31,6 +31,7 @@ import static com.android.server.net.NetworkPolicyManagerService.OPPORTUNISTIC_Q
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.doCallRealMethod;
@@ -236,9 +237,7 @@ public class MultipathPolicyTrackerTest {
.thenReturn((int) defaultResSetting); .thenReturn((int) defaultResSetting);
when(mNetworkStatsManagerInternal.getNetworkTotalBytes( when(mNetworkStatsManagerInternal.getNetworkTotalBytes(
any(), any(), anyLong(), anyLong())).thenReturn(usedBytesToday);
eq(startOfDay.toInstant().toEpochMilli()),
eq(now.toInstant().toEpochMilli()))).thenReturn(usedBytesToday);
ArgumentCaptor<ConnectivityManager.NetworkCallback> networkCallback = ArgumentCaptor<ConnectivityManager.NetworkCallback> networkCallback =
ArgumentCaptor.forClass(ConnectivityManager.NetworkCallback.class); ArgumentCaptor.forClass(ConnectivityManager.NetworkCallback.class);
@@ -291,8 +290,10 @@ public class MultipathPolicyTrackerTest {
testGetMultipathPreference( testGetMultipathPreference(
DataUnit.MEGABYTES.toBytes(7) /* usedBytesToday */, DataUnit.MEGABYTES.toBytes(7) /* usedBytesToday */,
OPPORTUNISTIC_QUOTA_UNKNOWN, OPPORTUNISTIC_QUOTA_UNKNOWN,
// 29 days from Apr. 2nd to May 1st // Remaining days are 29 days from Apr. 2nd to May 1st.
DataUnit.MEGABYTES.toBytes(15 * 29 * 20) /* policyWarning */, // Set limit so that 15MB * remaining days will be 5% of the remaining limit,
// so it will be 15 * 29 / 0.05 + used bytes.
DataUnit.MEGABYTES.toBytes(15 * 29 * 20 + 7) /* policyWarning */,
LIMIT_DISABLED, LIMIT_DISABLED,
DataUnit.MEGABYTES.toBytes(12) /* defaultGlobalSetting */, DataUnit.MEGABYTES.toBytes(12) /* defaultGlobalSetting */,
2_500_000 /* defaultResSetting */, 2_500_000 /* defaultResSetting */,
@@ -308,9 +309,11 @@ public class MultipathPolicyTrackerTest {
testGetMultipathPreference( testGetMultipathPreference(
DataUnit.MEGABYTES.toBytes(7) /* usedBytesToday */, DataUnit.MEGABYTES.toBytes(7) /* usedBytesToday */,
OPPORTUNISTIC_QUOTA_UNKNOWN, OPPORTUNISTIC_QUOTA_UNKNOWN,
// 29 days from Apr. 2nd to May 1st
POLICY_SNOOZED /* policyWarning */, POLICY_SNOOZED /* policyWarning */,
DataUnit.MEGABYTES.toBytes(15 * 29 * 20) /* policyLimit */, // Remaining days are 29 days from Apr. 2nd to May 1st.
// Set limit so that 15MB * remaining days will be 5% of the remaining limit,
// so it will be 15 * 29 / 0.05 + used bytes.
DataUnit.MEGABYTES.toBytes(15 * 29 * 20 + 7) /* policyLimit */,
DataUnit.MEGABYTES.toBytes(12) /* defaultGlobalSetting */, DataUnit.MEGABYTES.toBytes(12) /* defaultGlobalSetting */,
2_500_000 /* defaultResSetting */, 2_500_000 /* defaultResSetting */,
false /* roaming */); false /* roaming */);