Merge "Add getDescendants to Settings Slice Provider" into pi-dev

2018-04-17 19:21:20 +00:00
parent adec029f70 6730a061b1
commit 1257466d0b
6 changed files with 392 additions and 33 deletions
--- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
@@ -295,14 +295,16 @@ public class SliceBuilderUtilsTest {
        assertThat(pathPair.second).isEqualTo(KEY);
    }

-    @Test(expected = IllegalArgumentException.class)
+    @Test
    public void getPathData_noKey_returnsNull() {
        final Uri uri = new Uri.Builder()
                .authority(SettingsSliceProvider.SLICE_AUTHORITY)
                .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
                .build();

-        SliceBuilderUtils.getPathData(uri);
+        final Pair<Boolean, String> pathPair = SliceBuilderUtils.getPathData(uri);
+
+        assertThat(pathPair).isNull();
    }

    @Test