Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ed876ce authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Fix DownloadManager tests." into nyc-dev am: 4938d6e1 

am: 294163e8

* commit '294163e8':
  Fix DownloadManager tests.

Change-Id: I7060e603da86f9c8c84021f8fc7050aa7f3c26ef
parents 383eb025 294163e8

core/tests/coretests/src/android/app/DownloadManagerFunctionalTest.java

+14 −4
Original line number Diff line number Diff line
@@ -284,20 +284,30 @@ public class DownloadManagerFunctionalTest extends DownloadManagerBaseTest { 
        Uri uri = getServerUri(DEFAULT_FILENAME);

        enqueueResponse(buildResponse(HTTP_PARTIAL_CONTENT));



        doErrorTest(uri, DownloadManager.ERROR_UNHANDLED_HTTP_CODE);

        doErrorTest(uri, DownloadManager.ERROR_CANNOT_RESUME);

    }



    /**

     * Tests the download failure error from an unhandled HTTP status code

     */

    @LargeTest

    public void testErrorHttpDataError_invalidRedirect() throws Exception {

    public void testRelativeRedirect() throws Exception {

        Uri uri = getServerUri(DEFAULT_FILENAME);

        final MockResponse resp = buildResponse(HTTP_REDIRECT);

        resp.setHeader("Location", "://blah.blah.blah.com");

        resp.setHeader("Location", ":" + uri.getSchemeSpecificPart());

        enqueueResponse(resp);



        doErrorTest(uri, DownloadManager.ERROR_HTTP_DATA_ERROR);

        byte[] blobData = generateData(DEFAULT_FILE_SIZE, DataType.TEXT);

        enqueueResponse(buildResponse(HTTP_OK, blobData));



        Request request = new Request(uri);

        request.setTitle(DEFAULT_FILENAME);



        long dlRequest = mDownloadManager.enqueue(request);

        waitForDownloadOrTimeout(dlRequest);



        verifyAndCleanupSingleFileDownload(dlRequest, blobData);

        assertEquals(1, mReceiver.numDownloadsCompleted());

    }



    /**