Merge "Fixing DownloadManager Test app." (e1e0613a) · Commits · e / os / android_frameworks_base

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/**

+1 −1

Original line number	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
		// 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)...