Fix failing toolbar instrumentation tests
A change on master (ag/12161937) changes how activities
behave when the back button is pressed, and our tests
were relying on the old behavior.
Now assert based on the number of times onBackPressed()
is called instead of based on if the activity isFinishing().
Fixes: 164117931
Test: atest CarUILibUnitTests
Change-Id: Id16240eb704adbf8f0ab98371b4e341202552cdd
diff --git a/car-ui-lib/car-ui-lib/src/androidTest/java/com/android/car/ui/toolbar/ToolbarTest.java b/car-ui-lib/car-ui-lib/src/androidTest/java/com/android/car/ui/toolbar/ToolbarTest.java
index 5377e27..251092a 100644
--- a/car-ui-lib/car-ui-lib/src/androidTest/java/com/android/car/ui/toolbar/ToolbarTest.java
+++ b/car-ui-lib/car-ui-lib/src/androidTest/java/com/android/car/ui/toolbar/ToolbarTest.java
@@ -33,14 +33,11 @@
import static com.google.common.truth.Truth.assertThat;
import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertTrue;
import static org.hamcrest.core.IsNot.not;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import android.app.Activity;
import android.view.View;
import androidx.test.rule.ActivityTestRule;
@@ -118,8 +115,7 @@
onView(withId(R.id.car_ui_toolbar_nav_icon_container)).perform(click());
- assertTrue(mActivityRule.getActivity().isFinishing());
- assertEquals(mActivityRule.getActivityResult().getResultCode(), Activity.RESULT_CANCELED);
+ assertEquals(1, mActivityRule.getActivity().getTimesOnBackPressed());
}
@Test
@@ -131,8 +127,7 @@
onView(withId(R.id.car_ui_toolbar_nav_icon_container)).perform(click());
- assertTrue(mActivityRule.getActivity().isFinishing());
- assertEquals(mActivityRule.getActivityResult().getResultCode(), Activity.RESULT_CANCELED);
+ assertEquals(1, mActivityRule.getActivity().getTimesOnBackPressed());
}
@Test
@@ -144,7 +139,7 @@
onView(withId(R.id.car_ui_toolbar_nav_icon_container)).perform(click());
- assertFalse(mActivityRule.getActivity().isFinishing());
+ assertEquals(0, mActivityRule.getActivity().getTimesOnBackPressed());
}
@Test
@@ -159,7 +154,7 @@
onView(withId(R.id.car_ui_toolbar_nav_icon_container)).perform(click());
- assertTrue(mActivityRule.getActivity().isFinishing());
+ assertEquals(1, mActivityRule.getActivity().getTimesOnBackPressed());
}
@Test
diff --git a/car-ui-lib/car-ui-lib/src/androidTest/java/com/android/car/ui/toolbar/ToolbarTestActivity.java b/car-ui-lib/car-ui-lib/src/androidTest/java/com/android/car/ui/toolbar/ToolbarTestActivity.java
index 98e1f54..906305e 100644
--- a/car-ui-lib/car-ui-lib/src/androidTest/java/com/android/car/ui/toolbar/ToolbarTestActivity.java
+++ b/car-ui-lib/car-ui-lib/src/androidTest/java/com/android/car/ui/toolbar/ToolbarTestActivity.java
@@ -24,9 +24,25 @@
/** An Activity used for testing {@link ToolbarController}. */
public class ToolbarTestActivity extends Activity {
+ private int mTimesOnBackPressed = 0;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.empty_test_activity);
}
+
+ /**
+ * ag/12161937 changes the behavior of pressing back on the top level activity, so
+ * assert the number of times onBackPressed() is called instead of if the activity isFinishing()
+ */
+ public int getTimesOnBackPressed() {
+ return mTimesOnBackPressed;
+ }
+
+ @Override
+ public void onBackPressed() {
+ super.onBackPressed();
+ mTimesOnBackPressed++;
+ }
}
