diff options
author | Sudheer Shanka <sudheersai@google.com> | 2019-05-01 10:19:53 -0700 |
---|---|---|
committer | Sudheer Shanka <sudheersai@google.com> | 2019-05-01 10:19:53 -0700 |
commit | b502cd3bc3730feb4a6e2684b54974960467f961 (patch) | |
tree | af77288598caac60e8725edf4dd663f6db3becd1 /tests/src/com/android/providers | |
parent | 0af33616d06ba73d0515defa76a3e96a80b7db97 (diff) | |
download | android_packages_providers_DownloadProvider-b502cd3bc3730feb4a6e2684b54974960467f961.tar.gz android_packages_providers_DownloadProvider-b502cd3bc3730feb4a6e2684b54974960467f961.tar.bz2 android_packages_providers_DownloadProvider-b502cd3bc3730feb4a6e2684b54974960467f961.zip |
Fix DownloadProviderTests.
Bug: 131693243
Test: atest DownloadProviderTests
Change-Id: Iefdd7690e45351c2dbdac1cff49f0d11aeba0fb0
Diffstat (limited to 'tests/src/com/android/providers')
-rw-r--r-- | tests/src/com/android/providers/downloads/AbstractPublicApiTest.java | 8 | ||||
-rw-r--r-- | tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/tests/src/com/android/providers/downloads/AbstractPublicApiTest.java b/tests/src/com/android/providers/downloads/AbstractPublicApiTest.java index 3a585b47..bb89b6f6 100644 --- a/tests/src/com/android/providers/downloads/AbstractPublicApiTest.java +++ b/tests/src/com/android/providers/downloads/AbstractPublicApiTest.java @@ -26,6 +26,7 @@ import android.content.ContentResolver; import android.content.ContextWrapper; import android.database.Cursor; import android.net.Uri; +import android.os.Environment; import android.os.ParcelFileDescriptor; import android.os.SystemClock; import android.util.Log; @@ -238,6 +239,13 @@ public abstract class AbstractPublicApiTest extends AbstractDownloadProviderFunc return getRequest(getServerUri(REQUEST_PATH)); } + protected DownloadManager.Request getRequestWithDestinationDownloadsDir() + throws MalformedURLException, UnknownHostException { + final DownloadManager.Request request = getRequest(); + request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, "testfile.txt"); + return request; + } + protected DownloadManager.Request getRequest(String path) { return new DownloadManager.Request(Uri.parse(path)); } diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java index cabcc313..ae0e7e52 100644 --- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java @@ -250,15 +250,15 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest { enqueueResponse(buildEmptyResponse(HTTP_OK)); enqueueResponse(buildEmptyResponse(HTTP_NOT_FOUND)); - Download download1 = enqueueRequest(getRequest()); + Download download1 = enqueueRequest(getRequestWithDestinationDownloadsDir()); download1.runUntilStatus(DownloadManager.STATUS_SUCCESSFUL); mSystemFacade.incrementTimeMillis(1); // ensure downloads are correctly ordered by time - Download download2 = enqueueRequest(getRequest()); + Download download2 = enqueueRequest(getRequestWithDestinationDownloadsDir()); download2.runUntilStatus(DownloadManager.STATUS_FAILED); mSystemFacade.incrementTimeMillis(1); - Download download3 = enqueueRequest(getRequest()); + Download download3 = enqueueRequest(getRequestWithDestinationDownloadsDir()); Cursor cursor = mManager.query(new DownloadManager.Query()); checkAndCloseCursor(cursor, download3, download2, download1); |