commit f62c52592816c081f485f8735c3c4aa52970932f
author Jeff Sharkey <jsharkey@android.com> Fri Jul 19 16:20:26 2019 -0600
committer Max Spector <mspector@google.com> Thu Oct 10 18:43:22 2019 -0700
tree 8056f4d48d846df00b015cef146481e2614cae32
parent 65b2a36e77376d2b1d0d8bbf4aeddbf7a71df50f

Fix broken tests.

SQLiteQueryBuilder now always allows aggregation operations.

Bug: 137890034
Bug: 135269143
Bug: 135270103

Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Ib35d63c734743efb12c5227c0d5c74b167d1ca6e
(cherry picked from commit 3983fd88c38f8c812d1bb157e4d1d945ee13c546)

tests/src/com/android/providers/media/MediaProviderTest.java

diff --git a/tests/src/com/android/providers/media/MediaProviderTest.java b/tests/src/com/android/providers/media/MediaProviderTest.java
index bc79edd..11788ff 100644
--- a/tests/src/com/android/providers/media/MediaProviderTest.java
+++ b/tests/src/com/android/providers/media/MediaProviderTest.java
@@ -480,41 +480,11 @@
     }
 
     @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(