diff options
Diffstat (limited to 'tests/unit/java')
| -rw-r--r-- | tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java b/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java index 66dcf6d2c7..12b227c52d 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java @@ -36,6 +36,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; +import android.content.Context; import android.net.DataUsageRequest; import android.net.NetworkIdentity; import android.net.NetworkIdentitySet; @@ -101,6 +102,7 @@ public class NetworkStatsObserversTest { @Mock private IBinder mUsageCallbackBinder; private TestableUsageCallback mUsageCallback; + @Mock private Context mContext; @Before public void setUp() throws Exception { @@ -127,14 +129,14 @@ public class NetworkStatsObserversTest { final DataUsageRequest inputRequest = new DataUsageRequest( DataUsageRequest.REQUEST_ID_UNSET, sTemplateWifi, thresholdTooLowBytes); - final DataUsageRequest requestByApp = mStatsObservers.register(inputRequest, mUsageCallback, - UID_RED, NetworkStatsAccess.Level.DEVICE); + final DataUsageRequest requestByApp = mStatsObservers.register(mContext, inputRequest, + mUsageCallback, UID_RED, NetworkStatsAccess.Level.DEVICE); assertTrue(requestByApp.requestId > 0); assertTrue(Objects.equals(sTemplateWifi, requestByApp.template)); - assertEquals(THRESHOLD_BYTES, requestByApp.thresholdInBytes); + assertEquals(thresholdTooLowBytes, requestByApp.thresholdInBytes); // Verify the threshold requested by system uid won't be overridden. - final DataUsageRequest requestBySystem = mStatsObservers.register(inputRequest, + final DataUsageRequest requestBySystem = mStatsObservers.register(mContext, inputRequest, mUsageCallback, Process.SYSTEM_UID, NetworkStatsAccess.Level.DEVICE); assertTrue(requestBySystem.requestId > 0); assertTrue(Objects.equals(sTemplateWifi, requestBySystem.template)); @@ -147,7 +149,7 @@ public class NetworkStatsObserversTest { DataUsageRequest inputRequest = new DataUsageRequest( DataUsageRequest.REQUEST_ID_UNSET, sTemplateWifi, highThresholdBytes); - DataUsageRequest request = mStatsObservers.register(inputRequest, mUsageCallback, + DataUsageRequest request = mStatsObservers.register(mContext, inputRequest, mUsageCallback, Process.SYSTEM_UID, NetworkStatsAccess.Level.DEVICE); assertTrue(request.requestId > 0); assertTrue(Objects.equals(sTemplateWifi, request.template)); @@ -159,13 +161,13 @@ public class NetworkStatsObserversTest { DataUsageRequest inputRequest = new DataUsageRequest( DataUsageRequest.REQUEST_ID_UNSET, sTemplateWifi, THRESHOLD_BYTES); - DataUsageRequest request1 = mStatsObservers.register(inputRequest, mUsageCallback, + DataUsageRequest request1 = mStatsObservers.register(mContext, inputRequest, mUsageCallback, Process.SYSTEM_UID, NetworkStatsAccess.Level.DEVICE); assertTrue(request1.requestId > 0); assertTrue(Objects.equals(sTemplateWifi, request1.template)); assertEquals(THRESHOLD_BYTES, request1.thresholdInBytes); - DataUsageRequest request2 = mStatsObservers.register(inputRequest, mUsageCallback, + DataUsageRequest request2 = mStatsObservers.register(mContext, inputRequest, mUsageCallback, Process.SYSTEM_UID, NetworkStatsAccess.Level.DEVICE); assertTrue(request2.requestId > request1.requestId); assertTrue(Objects.equals(sTemplateWifi, request2.template)); @@ -185,7 +187,7 @@ public class NetworkStatsObserversTest { DataUsageRequest inputRequest = new DataUsageRequest( DataUsageRequest.REQUEST_ID_UNSET, sTemplateImsi1, THRESHOLD_BYTES); - DataUsageRequest request = mStatsObservers.register(inputRequest, mUsageCallback, + DataUsageRequest request = mStatsObservers.register(mContext, inputRequest, mUsageCallback, Process.SYSTEM_UID, NetworkStatsAccess.Level.DEVICE); assertTrue(request.requestId > 0); assertTrue(Objects.equals(sTemplateImsi1, request.template)); @@ -205,7 +207,7 @@ public class NetworkStatsObserversTest { DataUsageRequest inputRequest = new DataUsageRequest( DataUsageRequest.REQUEST_ID_UNSET, sTemplateImsi1, THRESHOLD_BYTES); - DataUsageRequest request = mStatsObservers.register(inputRequest, mUsageCallback, + DataUsageRequest request = mStatsObservers.register(mContext, inputRequest, mUsageCallback, UID_RED, NetworkStatsAccess.Level.DEVICE); assertTrue(request.requestId > 0); assertTrue(Objects.equals(sTemplateImsi1, request.template)); @@ -233,7 +235,7 @@ public class NetworkStatsObserversTest { DataUsageRequest inputRequest = new DataUsageRequest( DataUsageRequest.REQUEST_ID_UNSET, sTemplateImsi1, THRESHOLD_BYTES); - DataUsageRequest request = mStatsObservers.register(inputRequest, mUsageCallback, + DataUsageRequest request = mStatsObservers.register(mContext, inputRequest, mUsageCallback, Process.SYSTEM_UID, NetworkStatsAccess.Level.DEVICE); assertTrue(request.requestId > 0); assertTrue(Objects.equals(sTemplateImsi1, request.template)); @@ -257,7 +259,7 @@ public class NetworkStatsObserversTest { DataUsageRequest inputRequest = new DataUsageRequest( DataUsageRequest.REQUEST_ID_UNSET, sTemplateImsi1, THRESHOLD_BYTES); - DataUsageRequest request = mStatsObservers.register(inputRequest, mUsageCallback, + DataUsageRequest request = mStatsObservers.register(mContext, inputRequest, mUsageCallback, Process.SYSTEM_UID, NetworkStatsAccess.Level.DEVICE); assertTrue(request.requestId > 0); assertTrue(Objects.equals(sTemplateImsi1, request.template)); @@ -287,7 +289,7 @@ public class NetworkStatsObserversTest { DataUsageRequest inputRequest = new DataUsageRequest( DataUsageRequest.REQUEST_ID_UNSET, sTemplateImsi1, THRESHOLD_BYTES); - DataUsageRequest request = mStatsObservers.register(inputRequest, mUsageCallback, + DataUsageRequest request = mStatsObservers.register(mContext, inputRequest, mUsageCallback, Process.SYSTEM_UID, NetworkStatsAccess.Level.DEVICE); assertTrue(request.requestId > 0); assertTrue(Objects.equals(sTemplateImsi1, request.template)); @@ -318,7 +320,7 @@ public class NetworkStatsObserversTest { DataUsageRequest inputRequest = new DataUsageRequest( DataUsageRequest.REQUEST_ID_UNSET, sTemplateImsi1, THRESHOLD_BYTES); - DataUsageRequest request = mStatsObservers.register(inputRequest, mUsageCallback, + DataUsageRequest request = mStatsObservers.register(mContext, inputRequest, mUsageCallback, UID_RED, NetworkStatsAccess.Level.DEFAULT); assertTrue(request.requestId > 0); assertTrue(Objects.equals(sTemplateImsi1, request.template)); @@ -351,7 +353,7 @@ public class NetworkStatsObserversTest { DataUsageRequest inputRequest = new DataUsageRequest( DataUsageRequest.REQUEST_ID_UNSET, sTemplateImsi1, THRESHOLD_BYTES); - DataUsageRequest request = mStatsObservers.register(inputRequest, mUsageCallback, + DataUsageRequest request = mStatsObservers.register(mContext, inputRequest, mUsageCallback, UID_BLUE, NetworkStatsAccess.Level.DEFAULT); assertTrue(request.requestId > 0); assertTrue(Objects.equals(sTemplateImsi1, request.template)); @@ -383,7 +385,7 @@ public class NetworkStatsObserversTest { DataUsageRequest inputRequest = new DataUsageRequest( DataUsageRequest.REQUEST_ID_UNSET, sTemplateImsi1, THRESHOLD_BYTES); - DataUsageRequest request = mStatsObservers.register(inputRequest, mUsageCallback, + DataUsageRequest request = mStatsObservers.register(mContext, inputRequest, mUsageCallback, UID_BLUE, NetworkStatsAccess.Level.USER); assertTrue(request.requestId > 0); assertTrue(Objects.equals(sTemplateImsi1, request.template)); @@ -416,7 +418,7 @@ public class NetworkStatsObserversTest { DataUsageRequest inputRequest = new DataUsageRequest( DataUsageRequest.REQUEST_ID_UNSET, sTemplateImsi1, THRESHOLD_BYTES); - DataUsageRequest request = mStatsObservers.register(inputRequest, mUsageCallback, + DataUsageRequest request = mStatsObservers.register(mContext, inputRequest, mUsageCallback, UID_RED, NetworkStatsAccess.Level.USER); assertTrue(request.requestId > 0); assertTrue(Objects.equals(sTemplateImsi1, request.template)); |