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

Commit e1e0613a authored by Neal Nguyen's avatar Neal Nguyen Committed by Android (Google) Code Review
Browse files

Merge "Fixing DownloadManager Test app."

parents 6f0b2ed3 fbfe6d97

core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerBaseTest.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -491,9 +491,10 @@ public class DownloadManagerBaseTest extends InstrumentationTestCase { 
     *

     *

     * @param id The download id to query on (wait for)

     * @param id The download id to query on (wait for)

     */

     */

    private void waitForDownloadOrTimeout_skipNotification(long id) throws TimeoutException,

    protected void waitForDownloadOrTimeout_skipNotification(long id) throws TimeoutException,

            InterruptedException {

            InterruptedException {

        waitForDownloadOrTimeout(id, WAIT_FOR_DOWNLOAD_POLL_TIME, MAX_WAIT_FOR_DOWNLOAD_TIME);

        doWaitForDownloadsOrTimeout(new Query().setFilterById(id),

                WAIT_FOR_DOWNLOAD_POLL_TIME, MAX_WAIT_FOR_DOWNLOAD_TIME);

    }

    }





    /**

    /**
@@ -505,8 +506,7 @@ public class DownloadManagerBaseTest extends InstrumentationTestCase { 
     */

     */

    protected void waitForDownloadOrTimeout(long id) throws TimeoutException,

    protected void waitForDownloadOrTimeout(long id) throws TimeoutException,

            InterruptedException {

            InterruptedException {

        waitForDownloadOrTimeout_skipNotification(id);

        waitForDownloadOrTimeout(id, WAIT_FOR_DOWNLOAD_POLL_TIME, MAX_WAIT_FOR_DOWNLOAD_TIME);

        waitForReceiverNotifications(1);

    }

    }





    /**

    /**

core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerTestApp.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -208,7 +208,7 @@ public class DownloadManagerTestApp extends DownloadManagerBaseTest { 




            // Wait until the download finishes; don't wait for a notification b/c

            // Wait until the download finishes; don't wait for a notification b/c

            // the download may well have been completed before the last reboot.

            // the download may well have been completed before the last reboot.

            waitForDownloadOrTimeout(dlRequest);

            waitForDownloadOrTimeout_skipNotification(dlRequest);





            Log.i(LOG_TAG, "Verifying download information...");

            Log.i(LOG_TAG, "Verifying download information...");

            // Verify specific info about the file (size, name, etc)...

            // Verify specific info about the file (size, name, etc)...