Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing DownloadManager Test app."

Browse Source
This commit is contained in:
Neal Nguyen
2011-09-11 14:58:02 -07:00
committed by Android (Google) Code Review
parent 6f0b2ed37d fbfe6d971d
commit e1e0613aa1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,9 +491,10 @@ public class DownloadManagerBaseTest extends InstrumentationTestCase {
*
* @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 {
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,
InterruptedException {
waitForDownloadOrTimeout_skipNotification(id);
waitForReceiverNotifications(1);
waitForDownloadOrTimeout(id, WAIT_FOR_DOWNLOAD_POLL_TIME, MAX_WAIT_FOR_DOWNLOAD_TIME);
}
/**
@@ -813,4 +813,4 @@ public class DownloadManagerBaseTest extends InstrumentationTestCase {
}
return cursor;
}
}
}

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

@@ -208,7 +208,7 @@ public class DownloadManagerTestApp extends DownloadManagerBaseTest {
// Wait until the download finishes; don't wait for a notification b/c
// the download may well have been completed before the last reboot.
waitForDownloadOrTimeout(dlRequest);
waitForDownloadOrTimeout_skipNotification(dlRequest);
Log.i(LOG_TAG, "Verifying download information...");
// Verify specific info about the file (size, name, etc)...