Merge "Use proto in contextualCard object"

This commit is contained in:
Fan Zhang
2018-10-10 20:19:38 +00:00
committed by Android (Google) Code Review
3 changed files with 17 additions and 19 deletions

View File

@@ -24,9 +24,9 @@ import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
import com.android.settings.intelligence.ContextualCardProto.ContextualCardList;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.google.android.settings.intelligence.libs.contextualcards.ContextualCard;
import com.google.android.settings.intelligence.libs.contextualcards.ContextualCardProvider;
import org.junit.Before;
@@ -34,8 +34,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import java.util.ArrayList;
@RunWith(SettingsRobolectricTestRunner.class)
public class SettingsContextualCardProviderTest {
@@ -54,11 +52,12 @@ public class SettingsContextualCardProviderTest {
}
@Test
public void contentProviderCall_returnCorrectSize() {
public void contentProviderCall_returnCorrectSize() throws Exception {
final Bundle returnValue =
mResolver.call(mUri, ContextualCardProvider.METHOD_GET_CARD_LIST, "", null);
final ArrayList<ContextualCard> cards =
returnValue.getParcelableArrayList(ContextualCardProvider.BUNDLE_CARD_LIST);
assertThat(cards.size()).isEqualTo(2);
final ContextualCardList cards =
ContextualCardList.parseFrom(
returnValue.getByteArray(ContextualCardProvider.BUNDLE_CARD_LIST));
assertThat(cards.getCardCount()).isEqualTo(2);
}
}