diff options
| author | Dan Pasanen <dan.pasanen@gmail.com> | 2019-11-15 10:07:36 -0600 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2019-11-16 08:36:29 -0700 |
| commit | ead95964b69bb476944e90e388e0d35585e50e6f (patch) | |
| tree | 6c386686480fdd374926b0dcbec4593d447ceb48 | |
| parent | d7d9d26724f9c68102ecdefb3b5efc681eec6521 (diff) | |
| parent | 6c79570ba1fa026d83996ad42a7d403c79811695 (diff) | |
| download | android_packages_providers_MediaProvider-lineage-17.0.tar.gz android_packages_providers_MediaProvider-lineage-17.0.tar.bz2 android_packages_providers_MediaProvider-lineage-17.0.zip | |
Merge tag 'android-10.0.0_r11' into lineage-17.0lineage-17.0
Android 10.0.0 release 11
Change-Id: Idc911f523530bc70503c653fd315fa6599c25b40
| -rw-r--r-- | tests/src/com/android/providers/media/MediaProviderTest.java | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/tests/src/com/android/providers/media/MediaProviderTest.java b/tests/src/com/android/providers/media/MediaProviderTest.java index bc79edd3..11788ff5 100644 --- a/tests/src/com/android/providers/media/MediaProviderTest.java +++ b/tests/src/com/android/providers/media/MediaProviderTest.java @@ -480,41 +480,11 @@ public class MediaProviderTest { } @Test - public void testComputeProjection() throws Exception { - final SQLiteQueryBuilder builder = new SQLiteQueryBuilder(); - final ArrayMap<String, String> map = new ArrayMap<>(); - map.put("external", "internal"); - builder.setProjectionMap(map); - builder.setProjectionAggregationAllowed(false); - builder.setStrict(true); - - assertArrayEquals( - new String[] { "internal" }, - builder.computeProjection(null)); - assertArrayEquals( - new String[] { "internal" }, - builder.computeProjection(new String[] { "external" })); - assertThrows(IllegalArgumentException.class, () -> { - builder.computeProjection(new String[] { "internal" }); - }); - assertThrows(IllegalArgumentException.class, () -> { - builder.computeProjection(new String[] { "MIN(internal)" }); - }); - assertThrows(IllegalArgumentException.class, () -> { - builder.computeProjection(new String[] { "MIN(external)" }); - }); - assertThrows(IllegalArgumentException.class, () -> { - builder.computeProjection(new String[] { "FOO(external)" }); - }); - } - - @Test public void testComputeProjection_AggregationAllowed() throws Exception { final SQLiteQueryBuilder builder = new SQLiteQueryBuilder(); final ArrayMap<String, String> map = new ArrayMap<>(); map.put("external", "internal"); builder.setProjectionMap(map); - builder.setProjectionAggregationAllowed(true); builder.setStrict(true); assertArrayEquals( |