diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Android.mk | 6 | ||||
| -rw-r--r-- | tests/AndroidTest.xml | 1 | ||||
| -rw-r--r-- | tests/permission/Android.mk | 5 | ||||
| -rw-r--r-- | tests/public_api_access/Android.mk | 5 | ||||
| -rw-r--r-- | tests/src/com/android/providers/downloads/FakeSystemFacade.java | 26 |
5 files changed, 26 insertions, 17 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index b654e12c..c3d9bcb7 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -7,12 +7,12 @@ LOCAL_MODULE_TAGS := tests # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_INSTRUMENTATION_FOR := DownloadProvider -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock LOCAL_STATIC_JAVA_LIBRARIES := \ mockwebserver \ - mockito-target \ - legacy-android-test + mockito-target LOCAL_PACKAGE_NAME := DownloadProviderTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_CERTIFICATE := media diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml index cad211a4..6a09909f 100644 --- a/tests/AndroidTest.xml +++ b/tests/AndroidTest.xml @@ -23,5 +23,6 @@ <test class="com.android.tradefed.testtype.InstrumentationTest" > <option name="package" value="com.android.providers.downloads.tests" /> <option name="runner" value="android.test.InstrumentationTestRunner" /> + <option name="hidden-api-checks" value="false"/> </test> </configuration> diff --git a/tests/permission/Android.mk b/tests/permission/Android.mk index 62f4d024..ae96b5cd 100644 --- a/tests/permission/Android.mk +++ b/tests/permission/Android.mk @@ -7,9 +7,10 @@ LOCAL_MODULE_TAGS := tests # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base +LOCAL_STATIC_JAVA_LIBRARIES := junit LOCAL_PACKAGE_NAME := DownloadProviderPermissionTests +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/tests/public_api_access/Android.mk b/tests/public_api_access/Android.mk index 66f2f101..3bc2e8e8 100644 --- a/tests/public_api_access/Android.mk +++ b/tests/public_api_access/Android.mk @@ -7,9 +7,10 @@ LOCAL_MODULE_TAGS := tests # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base +LOCAL_STATIC_JAVA_LIBRARIES := junit LOCAL_PACKAGE_NAME := DownloadPublicApiAccessTests +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/tests/src/com/android/providers/downloads/FakeSystemFacade.java b/tests/src/com/android/providers/downloads/FakeSystemFacade.java index aa7b8af4..f381bd8a 100644 --- a/tests/src/com/android/providers/downloads/FakeSystemFacade.java +++ b/tests/src/com/android/providers/downloads/FakeSystemFacade.java @@ -1,14 +1,19 @@ package com.android.providers.downloads; +import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED; +import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import android.app.job.JobParameters; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager.NameNotFoundException; import android.net.ConnectivityManager; import android.net.Network; +import android.net.NetworkCapabilities; import android.net.NetworkInfo; import android.net.NetworkInfo.DetailedState; @@ -65,7 +70,7 @@ public class FakeSystemFacade implements SystemFacade { } @Override - public Network getActiveNetwork(int uid, boolean ignoreBlocked) { + public Network getNetwork(JobParameters params) { if (mActiveNetworkType == null) { return null; } else { @@ -91,19 +96,20 @@ public class FakeSystemFacade implements SystemFacade { } else { final NetworkInfo info = new NetworkInfo(mActiveNetworkType, 0, null, null); info.setDetailedState(DetailedState.CONNECTED, null, null); - info.setRoaming(mIsRoaming); return info; } } @Override - public boolean isNetworkMetered(Network network) { - return mIsMetered; - } - - @Override - public boolean isActiveNetworkMeteredForUid(int uid) { - return mIsMetered; + public NetworkCapabilities getNetworkCapabilities(Network network) { + if (mActiveNetworkType == null) { + return null; + } else { + final NetworkCapabilities caps = new NetworkCapabilities(); + caps.setCapability(NET_CAPABILITY_NOT_METERED, !mIsMetered); + caps.setCapability(NET_CAPABILITY_NOT_ROAMING, !mIsRoaming); + return caps; + } } @Override @@ -127,7 +133,7 @@ public class FakeSystemFacade implements SystemFacade { } @Override - public boolean isCleartextTrafficPermitted(int uid) { + public boolean isCleartextTrafficPermitted(String packageName, String hostname) { return mCleartextTrafficPermitted; } |