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

Rename a bunch of stuff.

Browse Source 
For homepage cards, rename Homepage* to ContextualCard*.

Change-Id: I95740f15a1789683fa6c61f03ecf9bc47c367146
Fixes: 113966426
Test: robotests
This commit is contained in:
Fan Zhang
2018-09-06 17:45:50 -07:00
parent 21526c1f80
commit a746381401
15 changed files with 199 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/homepage/conditional/ConditionHomepageCardControllerTest.java → tests/robotests/src/com/android/settings/homepage/conditional/ConditionContextualCardControllerTest.java
View File

@@ -26,7 +26,7 @@ import android.content.Context;
import android.graphics.drawable.Drawable;
import com.android.settings.R;
import com.android.settings.homepage.HomepageCardUpdateListener;
import com.android.settings.homepage.ContextualCardUpdateListener;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -41,20 +41,20 @@ import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
public class ConditionHomepageCardControllerTest {
public class ConditionContextualCardControllerTest {
@Mock
private ConditionManager mConditionManager;
@Mock
private HomepageCardUpdateListener mListener;
private ContextualCardUpdateListener mListener;
private Context mContext;
private ConditionHomepageCardController mController;
private ConditionContextualCardController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
mController = spy(new ConditionHomepageCardController(mContext));
mController = spy(new ConditionContextualCardController(mContext));
ReflectionHelpers.setField(mController, "mConditionManager", mConditionManager);
}
@@ -78,7 +78,7 @@ public class ConditionHomepageCardControllerTest {
final List<ConditionalCard> conditionalCards = new ArrayList<>();
conditionalCards.add(fakeConditionalCard);
when(mConditionManager.getDisplayableCards()).thenReturn(conditionalCards);
mController.setHomepageCardUpdateListener(mListener);
mController.setCardUpdateListener(mListener);
mController.onConditionsChanged();

29
tests/robotests/src/com/android/settings/homepage/conditional/ConditionHomepageCardRendererTest.java → tests/robotests/src/com/android/settings/homepage/conditional/ConditionContextualCardRendererTest.java
View File

@@ -31,8 +31,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.android.settings.R;
import com.android.settings.homepage.ContextualCard;
import com.android.settings.homepage.ControllerRendererPool;
import com.android.settings.homepage.HomepageCard;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -43,20 +43,20 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
public class ConditionHomepageCardRendererTest {
public class ConditionContextualCardRendererTest {
@Mock
private ControllerRendererPool mControllerRendererPool;
@Mock
private ConditionHomepageCardController mController;
private ConditionContextualCardController mController;
private Context mContext;
private ConditionHomepageCardRenderer mRenderer;
private ConditionContextualCardRenderer mRenderer;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
mRenderer = new ConditionHomepageCardRenderer(mContext, mControllerRendererPool);
mRenderer = new ConditionContextualCardRenderer(mContext, mControllerRendererPool);
}
@Test
@@ -68,9 +68,9 @@ public class ConditionHomepageCardRendererTest {
final RecyclerView.ViewHolder viewHolder = mRenderer.createViewHolder(view);
final View card = view.findViewById(R.id.content);
when(mControllerRendererPool.getController(mContext,
HomepageCard.CardType.CONDITIONAL)).thenReturn(mController);
ContextualCard.CardType.CONDITIONAL)).thenReturn(mController);
mRenderer.bindView(viewHolder, getHomepageCard());
mRenderer.bindView(viewHolder, buildConditionContextualCard());
assertThat(card).isNotNull();
assertThat(card.hasOnClickListeners()).isTrue();
@@ -85,28 +85,27 @@ public class ConditionHomepageCardRendererTest {
final RecyclerView.ViewHolder viewHolder = mRenderer.createViewHolder(view);
final View card = view.findViewById(R.id.content);
when(mControllerRendererPool.getController(mContext,
HomepageCard.CardType.CONDITIONAL)).thenReturn(mController);
ContextualCard.CardType.CONDITIONAL)).thenReturn(mController);
mRenderer.bindView(viewHolder, getHomepageCard());
mRenderer.bindView(viewHolder, buildConditionContextualCard());
assertThat(card).isNotNull();
card.performClick();
verify(mController).onPrimaryClick(any(HomepageCard.class));
verify(mController).onPrimaryClick(any(ContextualCard.class));
}
private HomepageCard getHomepageCard() {
ConditionCard conditionCard = ((ConditionCard.Builder) new ConditionCard.Builder()
private ContextualCard buildConditionContextualCard() {
return new ConditionalContextualCard.Builder()
.setConditionId(123)
.setMetricsConstant(1)
.setActionText("test_action")
.setName("test_name")
.setCardType(HomepageCard.CardType.CONDITIONAL)
.setCardType(ContextualCard.CardType.CONDITIONAL)
.setTitleText("test_title")
.setSummaryText("test_summary")
.setIconDrawable(mContext.getDrawable(R.drawable.ic_do_not_disturb_on_24dp))
.setIsHalfWidth(true))
.setIsHalfWidth(true)
.build();
return conditionCard;
}
}