Updated misc in Contextual Settings Homepage
- Set static cards with full width and removed packageName from setName method. - Removed Storage card from createStaticCards method because it does not belong to default category. - Changed the parameter type of setSliceUri from String to Uri in ContextualCard. - Added StorageSlice and DeviceInfoSlice to the contextual card provider. - Fixed test cases related to these changes. bug: 117874766 Test: robotest Change-Id: Ic2dca353f85d0b6191ab19882dd8c5cb9c6cc658
This commit is contained in:
@@ -57,15 +57,14 @@ public class CardContentLoaderTest {
|
||||
public void createStaticCards_shouldReturnTwoCards() {
|
||||
final List<ContextualCard> defaultData = mCardContentLoader.createStaticCards();
|
||||
|
||||
assertThat(defaultData).hasSize(3);
|
||||
assertThat(defaultData).hasSize(2);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createStaticCards_shouldContainDataUsageAndDeviceInfo() {
|
||||
final Uri dataUsage = DataUsageSlice.DATA_USAGE_CARD_URI;
|
||||
final Uri deviceInfo = DeviceInfoSlice.DEVICE_INFO_CARD_URI;
|
||||
final Uri storageInfo = StorageSlice.STORAGE_CARD_URI;
|
||||
final List<Uri> expectedUris = Arrays.asList(dataUsage, deviceInfo, storageInfo);
|
||||
final List<Uri> expectedUris = Arrays.asList(dataUsage, deviceInfo);
|
||||
|
||||
final List<Uri> actualCardUris = mCardContentLoader.createStaticCards().stream().map(
|
||||
ContextualCard::getSliceUri).collect(Collectors.toList());
|
||||
@@ -105,7 +104,7 @@ public class CardContentLoaderTest {
|
||||
return new ContextualCard.Builder()
|
||||
.setName("test_card")
|
||||
.setCardType(ContextualCard.CardType.SLICE)
|
||||
.setSliceUri(sliceUri)
|
||||
.setSliceUri(Uri.parse(sliceUri))
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
@@ -58,6 +58,6 @@ public class SettingsContextualCardProviderTest {
|
||||
final ContextualCardList cards =
|
||||
ContextualCardList.parseFrom(
|
||||
returnValue.getByteArray(ContextualCardProvider.BUNDLE_CARD_LIST));
|
||||
assertThat(cards.getCardCount()).isEqualTo(2);
|
||||
assertThat(cards.getCardCount()).isEqualTo(4);
|
||||
}
|
||||
}
|
@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.spy;
|
||||
|
||||
import android.content.Context;
|
||||
import android.net.Uri;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
|
||||
@@ -108,7 +109,7 @@ public class SliceContextualCardRendererTest {
|
||||
private ContextualCard buildContextualCard(String sliceUri) {
|
||||
return new ContextualCard.Builder()
|
||||
.setName("test_name")
|
||||
.setSliceUri(sliceUri)
|
||||
.setSliceUri(Uri.parse(sliceUri))
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user