summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVasu Nori <vnori@google.com>2010-12-23 16:47:13 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-23 16:47:13 -0800
commitf2053e4ed8a19c4bf331320028ac8bdb997e1e89 (patch)
tree0e12c40df93327bc9a33e532d397ee71817be573 /tests
parentdc869afe6841a03b5fcc4d19127d82b317d69cde (diff)
parent5218d33d57990c3e3549c58bd3f0ac244dfc3d59 (diff)
downloadandroid_packages_providers_DownloadProvider-f2053e4ed8a19c4bf331320028ac8bdb997e1e89.zip
android_packages_providers_DownloadProvider-f2053e4ed8a19c4bf331320028ac8bdb997e1e89.tar.gz
android_packages_providers_DownloadProvider-f2053e4ed8a19c4bf331320028ac8bdb997e1e89.tar.bz2
Merge "bug:3286430 set quota on downloads data dir"
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java2
-rw-r--r--tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java5
2 files changed, 1 insertions, 6 deletions
diff --git a/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java b/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
index d7f4787..c3ac890 100644
--- a/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
@@ -65,7 +65,7 @@ public class DownloadManagerFunctionalTest extends AbstractDownloadManagerFuncti
Integer.toString(Downloads.Impl.DESTINATION_CACHE_PARTITION));
runUntilStatus(downloadUri, Downloads.Impl.STATUS_SUCCESS);
assertEquals(FILE_CONTENT, getDownloadContents(downloadUri));
- assertStartsWith(Helpers.getDownloadsDataDirectory(getContext()).getAbsolutePath(),
+ assertStartsWith(getContext().getCacheDir().getAbsolutePath(),
getDownloadFilename(downloadUri));
}
diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
index 96fbaab..64c1953 100644
--- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
@@ -25,7 +25,6 @@ import android.net.Uri;
import android.os.Environment;
import android.provider.Downloads;
import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.Suppress;
import tests.http.MockResponse;
import tests.http.RecordedRequest;
@@ -386,10 +385,6 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest {
runSimpleFailureTest(DownloadManager.ERROR_HTTP_DATA_ERROR);
}
- /**
- * un-suppress this test once the bug 3286430 is fixed
- */
- @Suppress
public void testInsufficientSpace() throws Exception {
// this would be better done by stubbing the system API to check available space, but in the
// meantime, just use an absurdly large header value