summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/public_api_access/AndroidManifest.xml3
-rw-r--r--tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java17
-rw-r--r--tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java6
3 files changed, 7 insertions, 19 deletions
diff --git a/tests/public_api_access/AndroidManifest.xml b/tests/public_api_access/AndroidManifest.xml
index bec636b..0104846 100644
--- a/tests/public_api_access/AndroidManifest.xml
+++ b/tests/public_api_access/AndroidManifest.xml
@@ -23,9 +23,6 @@
</application>
<uses-permission android:name="android.permission.INTERNET"/>
- <!-- The tests in this package can access /cache. so they need the following permission -->
- <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER_ADVANCED"/>
- <uses-permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
<!--
The test declared in this instrumentation can be run via this command
diff --git a/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java b/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
index a5bae8b..d7f4787 100644
--- a/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
@@ -65,22 +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(Environment.getDownloadCacheDirectory().getPath(),
- getDownloadFilename(downloadUri));
- }
-
- /**
- * downloading to system cache should succeed because this tests package has
- * the permission android.permission.ACCESS_CACHE_FILESYSTEM
- */
- public void testDownloadToSystemCache() throws Exception {
- enqueueResponse(HTTP_OK, FILE_CONTENT);
- Uri downloadUri = requestDownload("/path");
- updateDownload(downloadUri, Downloads.Impl.COLUMN_DESTINATION,
- Integer.toString(Downloads.Impl.DESTINATION_SYSTEMCACHE_PARTITION));
- runUntilStatus(downloadUri, Downloads.Impl.STATUS_SUCCESS);
- assertEquals(FILE_CONTENT, getDownloadContents(downloadUri));
- assertStartsWith(Environment.getDownloadCacheDirectory().getPath(),
+ assertStartsWith(Helpers.getDownloadsDataDirectory(getContext()).getAbsolutePath(),
getDownloadFilename(downloadUri));
}
diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
index 5d14930..96fbaab 100644
--- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
@@ -25,6 +25,8 @@ 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;
@@ -384,6 +386,10 @@ 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