diff options
Diffstat (limited to 'tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java')
-rw-r--r-- | tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java b/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java index 813252a8..13d2c36e 100644 --- a/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java @@ -171,8 +171,8 @@ public abstract class AbstractDownloadProviderFunctionalTest extends Helpers.setSystemFacade(mSystemFacade); mSystemFacade.setUp(); - assertTrue(isDatabaseEmpty()); // ensure we're not messing with real data - assertTrue(isDatabaseSecureAgainstBadSelection()); + assertDatabaseEmpty(); // ensure we're not messing with real data + assertDatabaseSecureAgainstBadSelection(); mServer = new MockWebServer(); mServer.play(); } @@ -188,34 +188,23 @@ public abstract class AbstractDownloadProviderFunctionalTest extends protected void startDownload(long id) { final JobParameters params = mock(JobParameters.class); when(params.getJobId()).thenReturn((int) id); + getService().onBind(null); getService().onStartJob(params); } - private boolean isDatabaseEmpty() { - Cursor cursor = mResolver.query(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, - null, null, null, null); - try { - return cursor.getCount() == 0; - } finally { - cursor.close(); + private void assertDatabaseEmpty() { + try (Cursor cursor = mResolver.query(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, + null, null, null, null)) { + assertEquals(0, cursor.getCount()); } } - private boolean isDatabaseSecureAgainstBadSelection() { - Cursor cursor = null; - try { - cursor = mResolver.query(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, null, - "('1'='1'))) ORDER BY lastmod DESC--", null, null); + private void assertDatabaseSecureAgainstBadSelection() { + try (Cursor cursor = mResolver.query(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, null, + "('1'='1'))) ORDER BY lastmod DESC--", null, null)) { + fail("Database isn't secure!"); + } catch (Exception expected) { } - catch (Exception e) { - return true; - } finally { - if (cursor != null) { - cursor.close(); - } - } - - return false; } /** |