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

Merge "Clean up test cases related to long press dismissal"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-29 16:37:21 +00:00
committed by Android (Google) Code Review
parent 560e175ade 7f78005f0a
commit 8c1935c1fd
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
View File

@@ -142,12 +142,11 @@ public class SliceContextualCardRendererTest {
@Test @Test
public void viewClick_keepCard_shouldFlipBackToSlice() { public void viewClick_keepCard_shouldFlipBackToSlice() {
final RecyclerView.ViewHolder viewHolder = getSliceViewHolder(); final RecyclerView.ViewHolder viewHolder = getSliceViewHolder();
final View card = viewHolder.itemView.findViewById(R.id.slice_view);
final Button btnKeep = viewHolder.itemView.findViewById(R.id.keep); final Button btnKeep = viewHolder.itemView.findViewById(R.id.keep);
final ViewFlipper viewFlipper = viewHolder.itemView.findViewById(R.id.view_flipper); final ViewFlipper viewFlipper = viewHolder.itemView.findViewById(R.id.view_flipper);
mRenderer.bindView(viewHolder, buildContextualCard(TEST_SLICE_URI)); mRenderer.bindView(viewHolder, buildContextualCard(TEST_SLICE_URI));
viewFlipper.setDisplayedChild(1);
card.performLongClick();
btnKeep.performClick(); btnKeep.performClick();
assertThat(viewFlipper.getCurrentView()).isInstanceOf(SliceView.class); assertThat(viewFlipper.getCurrentView()).isInstanceOf(SliceView.class);
@@ -156,11 +155,10 @@ public class SliceContextualCardRendererTest {
@Test @Test
public void viewClick_keepCard_shouldRemoveViewHolderFromSet() { public void viewClick_keepCard_shouldRemoveViewHolderFromSet() {
final RecyclerView.ViewHolder viewHolder = getSliceViewHolder(); final RecyclerView.ViewHolder viewHolder = getSliceViewHolder();
final View card = viewHolder.itemView.findViewById(R.id.slice_view);
final Button btnKeep = viewHolder.itemView.findViewById(R.id.keep); final Button btnKeep = viewHolder.itemView.findViewById(R.id.keep);
mRenderer.bindView(viewHolder, buildContextualCard(TEST_SLICE_URI)); mRenderer.bindView(viewHolder, buildContextualCard(TEST_SLICE_URI));
mRenderer.mFlippedCardSet.add(viewHolder);
card.performLongClick();
btnKeep.performClick(); btnKeep.performClick();
assertThat(mRenderer.mFlippedCardSet).doesNotContain(viewHolder); assertThat(mRenderer.mFlippedCardSet).doesNotContain(viewHolder);
@@ -169,14 +167,13 @@ public class SliceContextualCardRendererTest {
@Test @Test
public void viewClick_removeCard_shouldRemoveViewHolderFromSet() { public void viewClick_removeCard_shouldRemoveViewHolderFromSet() {
final RecyclerView.ViewHolder viewHolder = getSliceViewHolder(); final RecyclerView.ViewHolder viewHolder = getSliceViewHolder();
final View card = viewHolder.itemView.findViewById(R.id.slice_view);
final Button btnRemove = viewHolder.itemView.findViewById(R.id.remove); final Button btnRemove = viewHolder.itemView.findViewById(R.id.remove);
final ContextualCard contextualCard = buildContextualCard(TEST_SLICE_URI); final ContextualCard contextualCard = buildContextualCard(TEST_SLICE_URI);
mRenderer.bindView(viewHolder, contextualCard); mRenderer.bindView(viewHolder, contextualCard);
doReturn(mController).when(mControllerRendererPool).getController(mActivity, doReturn(mController).when(mControllerRendererPool).getController(mActivity,
ContextualCard.CardType.SLICE); ContextualCard.CardType.SLICE);
mRenderer.mFlippedCardSet.add(viewHolder);
card.performLongClick();
btnRemove.performClick(); btnRemove.performClick();
assertThat(mRenderer.mFlippedCardSet).doesNotContain(viewHolder); assertThat(mRenderer.mFlippedCardSet).doesNotContain(viewHolder);
@@ -185,7 +182,6 @@ public class SliceContextualCardRendererTest {
@Test @Test
public void viewClick_removeCard_sliceLiveDataShouldRemoveObservers() { public void viewClick_removeCard_sliceLiveDataShouldRemoveObservers() {
final RecyclerView.ViewHolder viewHolder = getSliceViewHolder(); final RecyclerView.ViewHolder viewHolder = getSliceViewHolder();
final View card = viewHolder.itemView.findViewById(R.id.slice_view);
final Button btnRemove = viewHolder.itemView.findViewById(R.id.remove); final Button btnRemove = viewHolder.itemView.findViewById(R.id.remove);
final ContextualCard contextualCard = buildContextualCard(TEST_SLICE_URI); final ContextualCard contextualCard = buildContextualCard(TEST_SLICE_URI);
mRenderer.mSliceLiveDataMap.put(TEST_SLICE_URI, mSliceLiveData); mRenderer.mSliceLiveDataMap.put(TEST_SLICE_URI, mSliceLiveData);
@@ -193,7 +189,6 @@ public class SliceContextualCardRendererTest {
doReturn(mController).when(mControllerRendererPool).getController(mActivity, doReturn(mController).when(mControllerRendererPool).getController(mActivity,
ContextualCard.CardType.SLICE); ContextualCard.CardType.SLICE);
card.performLongClick();
btnRemove.performClick(); btnRemove.performClick();
assertThat(mRenderer.mSliceLiveDataMap.get(TEST_SLICE_URI).hasObservers()).isFalse(); assertThat(mRenderer.mSliceLiveDataMap.get(TEST_SLICE_URI).hasObservers()).isFalse();
@@ -202,11 +197,11 @@ public class SliceContextualCardRendererTest {
@Test @Test
public void onStop_cardIsFlipped_shouldFlipBack() { public void onStop_cardIsFlipped_shouldFlipBack() {
final RecyclerView.ViewHolder viewHolder = getSliceViewHolder(); final RecyclerView.ViewHolder viewHolder = getSliceViewHolder();
final View card = viewHolder.itemView.findViewById(R.id.slice_view);
final ViewFlipper viewFlipper = viewHolder.itemView.findViewById(R.id.view_flipper); final ViewFlipper viewFlipper = viewHolder.itemView.findViewById(R.id.view_flipper);
mRenderer.bindView(viewHolder, buildContextualCard(TEST_SLICE_URI)); mRenderer.bindView(viewHolder, buildContextualCard(TEST_SLICE_URI));
viewFlipper.setDisplayedChild(1);
mRenderer.mFlippedCardSet.add(viewHolder);
card.performLongClick();
mRenderer.onStop(); mRenderer.onStop();
assertThat(viewFlipper.getCurrentView()).isInstanceOf(SliceView.class); assertThat(viewFlipper.getCurrentView()).isInstanceOf(SliceView.class);