Fix broken tests.
SQLiteQueryBuilder now always allows aggregation operations.
Bug: 137890034
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Ib35d63c734743efb12c5227c0d5c74b167d1ca6e
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(