summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVasu Nori <vnori@google.com>2011-03-10 11:57:56 -0800
committerVasu Nori <vnori@google.com>2011-03-10 15:20:25 -0800
commit6baceb7073ed7858d3424ccf774e5f6a946bec59 (patch)
treec2b3466f2dee3b0ec9a01dbe649206f0ec48932b /tests
parent34cebab410fe28edb9eb1bba6df96ceaa0224739 (diff)
downloadandroid_packages_providers_DownloadProvider-6baceb7073ed7858d3424ccf774e5f6a946bec59.tar.gz
android_packages_providers_DownloadProvider-6baceb7073ed7858d3424ccf774e5f6a946bec59.tar.bz2
android_packages_providers_DownloadProvider-6baceb7073ed7858d3424ccf774e5f6a946bec59.zip
(master) bug:3204324 allow no more than certain number of concurrent downloads
Change-Id: Ibbce0782fcf7649209d6f56be240209cebd9045b
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/providers/downloads/AbstractDownloadManagerFunctionalTest.java3
-rw-r--r--tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java15
2 files changed, 16 insertions, 2 deletions
diff --git a/tests/src/com/android/providers/downloads/AbstractDownloadManagerFunctionalTest.java b/tests/src/com/android/providers/downloads/AbstractDownloadManagerFunctionalTest.java
index 5283d425..d2ecf3e6 100644
--- a/tests/src/com/android/providers/downloads/AbstractDownloadManagerFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/AbstractDownloadManagerFunctionalTest.java
@@ -155,13 +155,12 @@ public abstract class AbstractDownloadManagerFunctionalTest extends
Context realContext = getContext();
mTestContext = new TestContext(realContext);
setupProviderAndResolver();
- assert isDatabaseEmpty(); // ensure we're not messing with real data
mTestContext.setResolver(mResolver);
setContext(mTestContext);
setupService();
getService().mSystemFacade = mSystemFacade;
-
+ assertTrue(isDatabaseEmpty()); // ensure we're not messing with real data
mServer = new MockWebServer();
mServer.play();
}
diff --git a/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java b/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
index c3ac8904..e01b617f 100644
--- a/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
@@ -23,6 +23,8 @@ import android.net.Uri;
import android.os.Environment;
import android.provider.Downloads;
import android.test.suitebuilder.annotation.LargeTest;
+import android.util.Log;
+
import tests.http.MockWebServer;
import tests.http.RecordedRequest;
@@ -37,6 +39,8 @@ import java.net.MalformedURLException;
*/
@LargeTest
public class DownloadManagerFunctionalTest extends AbstractDownloadManagerFunctionalTest {
+ private static final String TAG = "DownloadManagerFunctionalTest";
+
public DownloadManagerFunctionalTest() {
super(new FakeSystemFacade());
}
@@ -104,6 +108,17 @@ public class DownloadManagerFunctionalTest extends AbstractDownloadManagerFuncti
private void runUntilStatus(Uri downloadUri, int status) throws Exception {
runService();
+ boolean done = false;
+ while (!done) {
+ int rslt = getDownloadStatus(downloadUri);
+ if (rslt == Downloads.Impl.STATUS_RUNNING || rslt == Downloads.Impl.STATUS_PENDING) {
+ Log.i(TAG, "status is: " + rslt + ", for: " + downloadUri);
+ DownloadHandler.getInstance().WaitUntilDownloadsTerminate();
+ Thread.sleep(100);
+ } else {
+ done = true;
+ }
+ }
assertEquals(status, getDownloadStatus(downloadUri));
}