diff options
Diffstat (limited to 'tests')
2 files changed, 19 insertions, 15 deletions
diff --git a/tests/public_api_access/src/com/android/providers/downloads/public_api_access_tests/PublicApiAccessTest.java b/tests/public_api_access/src/com/android/providers/downloads/public_api_access_tests/PublicApiAccessTest.java index aca5791b..4b2ae092 100644 --- a/tests/public_api_access/src/com/android/providers/downloads/public_api_access_tests/PublicApiAccessTest.java +++ b/tests/public_api_access/src/com/android/providers/downloads/public_api_access_tests/PublicApiAccessTest.java @@ -53,7 +53,7 @@ public class PublicApiAccessTest extends AndroidTestCase { @Override protected void tearDown() throws Exception { if (mContentResolver != null) { - mContentResolver.delete(Downloads.CONTENT_URI, null, null); + mContentResolver.delete(Downloads.CONTENT_URI, null, null); } super.tearDown(); } @@ -61,7 +61,7 @@ public class PublicApiAccessTest extends AndroidTestCase { public void testMinimalValidWrite() { mContentResolver.insert(Downloads.Impl.CONTENT_URI, buildValidValues()); } - + public void testMaximalValidWrite() { ContentValues values = buildValidValues(); values.put(Downloads.Impl.COLUMN_TITLE, "foo"); @@ -76,18 +76,19 @@ public class PublicApiAccessTest extends AndroidTestCase { private ContentValues buildValidValues() { ContentValues values = new ContentValues(); values.put(Downloads.Impl.COLUMN_URI, "foo"); - values.put(Downloads.Impl.COLUMN_DESTINATION, + values.put(Downloads.Impl.COLUMN_DESTINATION, Downloads.Impl.DESTINATION_CACHE_PARTITION_PURGEABLE); + values.put(Downloads.Impl.COLUMN_VISIBILITY, Downloads.Impl.VISIBILITY_VISIBLE); values.put(Downloads.Impl.COLUMN_IS_PUBLIC_API, true); return values; } - + public void testNoPublicApi() { ContentValues values = buildValidValues(); values.remove(Downloads.Impl.COLUMN_IS_PUBLIC_API); testInvalidValues(values); } - + public void testInvalidDestination() { ContentValues values = buildValidValues(); values.put(Downloads.Impl.COLUMN_DESTINATION, Downloads.Impl.DESTINATION_EXTERNAL); @@ -95,14 +96,20 @@ public class PublicApiAccessTest extends AndroidTestCase { values.put(Downloads.Impl.COLUMN_DESTINATION, Downloads.Impl.DESTINATION_CACHE_PARTITION); testInvalidValues(values); } - + public void testInvalidVisibility() { ContentValues values = buildValidValues(); - values.put(Downloads.Impl.COLUMN_VISIBILITY, + values.put(Downloads.Impl.COLUMN_VISIBILITY, Downloads.Impl.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); testInvalidValues(values); + + values.put(Downloads.Impl.COLUMN_VISIBILITY, Downloads.Impl.VISIBILITY_HIDDEN); + testInvalidValues(values); + + values.remove(Downloads.Impl.COLUMN_VISIBILITY); + testInvalidValues(values); } - + public void testDisallowedColumns() { for (String column : DISALLOWED_COLUMNS) { ContentValues values = buildValidValues(); @@ -110,7 +117,7 @@ public class PublicApiAccessTest extends AndroidTestCase { testInvalidValues(values); } } - + public void testFileUriWithoutExternalPermission() { ContentValues values = buildValidValues(); values.put(Downloads.Impl.COLUMN_DESTINATION, Downloads.Impl.DESTINATION_FILE_URI); diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java index b601846a..840b20ac 100644 --- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java @@ -358,8 +358,7 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest { } public void testNotificationClickedBroadcast() throws Exception { - Download download = enqueueRequest(getRequest().setShowNotification( - DownloadManager.Request.NOTIFICATION_WHEN_RUNNING)); + Download download = enqueueRequest(getRequest()); DownloadReceiver receiver = new DownloadReceiver(); receiver.mSystemFacade = mSystemFacade; @@ -431,15 +430,13 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest { public void testNotifications() throws Exception { enqueueEmptyResponse(HTTP_OK); - Download download = enqueueRequest(getRequest()); // no visibility requested + Download download = enqueueRequest(getRequest().setShowRunningNotification(false)); download.runUntilStatus(DownloadManager.STATUS_SUCCESSFUL); assertEquals(0, mSystemFacade.mActiveNotifications.size()); assertEquals(0, mSystemFacade.mCanceledNotifications.size()); enqueueEmptyResponse(HTTP_OK); - download = enqueueRequest( - getRequest() - .setShowNotification(DownloadManager.Request.NOTIFICATION_WHEN_RUNNING)); + download = enqueueRequest(getRequest()); // notifications by default download.runUntilStatus(DownloadManager.STATUS_SUCCESSFUL); assertEquals(1, mSystemFacade.mActiveNotifications.size()); |