PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Uniquely identify Slice intents" into pi-dev am: 45b6a9498c

Browse Source 
am: 2fbb71614c

Change-Id: Iadb98d5cd4943a4762d1f2240d1d2a0f3dcc35e2
This commit is contained in:
Matthew Fritze
2018-04-12 13:31:55 -07:00
committed by android-build-merger
parent f57f6aa9c7 2fbb71614c
commit bcb5bdf06c
3 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
View File

@@ -24,8 +24,10 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import android.app.PendingIntent;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.net.Uri;
import android.provider.Settings;
@@ -389,6 +391,17 @@ public class SliceBuilderUtilsTest {
SliceTester.testSettingsUnavailableSlice(mContext, slice, data);
}
@Test
public void testContentIntent_includesUniqueData() {
final SliceData sliceData = getDummyData();
final Uri expectedUri = new Uri.Builder().appendPath(sliceData.getKey()).build();
final Intent intent = SliceBuilderUtils.getContentIntent(mContext, sliceData);
final Uri intentData = intent.getData();
assertThat(intentData).isEqualTo(expectedUri);
}
private SliceData getDummyData() {
return getDummyData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH);
}

6
tests/robotests/src/com/android/settings/testutils/SliceTester.java
View File

@@ -64,7 +64,7 @@ public class SliceTester {
final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
assertThat(primaryPendingIntent).isEqualTo(
SliceBuilderUtils.getContentIntent(context, sliceData));
SliceBuilderUtils.getContentPendingIntent(context, sliceData));
final List<SliceItem> sliceItems = slice.getItems();
assertTitle(sliceItems, sliceData.getTitle());
@@ -97,7 +97,7 @@ public class SliceTester {
// Check primary intent
final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
assertThat(primaryPendingIntent).isEqualTo(
SliceBuilderUtils.getContentIntent(context, sliceData));
SliceBuilderUtils.getContentPendingIntent(context, sliceData));
final List<SliceItem> sliceItems = slice.getItems();
assertTitle(sliceItems, sliceData.getTitle());
@@ -147,7 +147,7 @@ public class SliceTester {
case DISABLED_FOR_USER:
case DISABLED_DEPENDENT_SETTING:
assertThat(primaryPendingIntent).isEqualTo(
SliceBuilderUtils.getContentIntent(context, sliceData));
SliceBuilderUtils.getContentPendingIntent(context, sliceData));
break;
}