From f6b4c24b4a876daa3f4e91d6da418983222b9dfd Mon Sep 17 00:00:00 2001 From: Steve Howard Date: Tue, 27 Jul 2010 17:02:14 -0700 Subject: Fix bug with closing output stream for external downloads. I added a unit test to cover this, and it caught another issue with disallowing external destinations outside of the default downloads directory (which are now allowed with the new API). Change-Id: I4df6442bebb06458ad28c85f6bc8cbcbf3ce67a1 --- .../providers/downloads/PublicApiFunctionalTest.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'tests/src/com/android') diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java index ba3059b6..b02844fa 100644 --- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java @@ -148,6 +148,16 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest { assertTrue("No ETag header: " + headers, headers.contains("If-Match: " + ETAG)); } + public void testInterruptedExternalDownload() throws Exception { + enqueueInterruptedDownloadResponses(5); + Uri destination = getExternalUri(); + Download download = enqueueRequest(getRequest().setDestinationUri(destination)); + download.runUntilStatus(DownloadManager.STATUS_PAUSED); + mSystemFacade.incrementTimeMillis(RETRY_DELAY_MILLIS); + download.runUntilStatus(DownloadManager.STATUS_SUCCESSFUL); + assertEquals(FILE_CONTENT, download.getContents()); + } + private void enqueueInterruptedDownloadResponses(int initialLength) { int totalLength = FILE_CONTENT.length(); // the first response has normal headers but unexpectedly closes after initialLength bytes @@ -225,7 +235,7 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest { public void testDestination() throws Exception { enqueueResponse(HTTP_OK, FILE_CONTENT); - Uri destination = Uri.fromFile(mTestDirectory).buildUpon().appendPath("testfile").build(); + Uri destination = getExternalUri(); Download download = enqueueRequest(getRequest().setDestinationUri(destination)); download.runUntilStatus(DownloadManager.STATUS_SUCCESSFUL); @@ -240,6 +250,10 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest { } } + private Uri getExternalUri() { + return Uri.fromFile(mTestDirectory).buildUpon().appendPath("testfile").build(); + } + public void testRequestHeaders() throws Exception { enqueueEmptyResponse(HTTP_OK); Download download = enqueueRequest(getRequest().setRequestHeader("Header1", "value1") -- cgit v1.2.3