commit fab1e83a8ae4e48e51f2089a0a1e9e487cebcf41
author Cole Faust <colefaust@google.com> Thu Aug 13 14:46:43 2020 -0700
committer Cole Faust <colefaust@google.com> Thu Aug 13 14:46:43 2020 -0700
tree 795a766d026508ed591d137d59dfbb9a6d220724
parent b45310a473ed8dee7bf4af83691d1bd434f0c751

Fix toolbar robotest failures

We were accidentally trying to load an id instead of a drawable.
I'm not sure how this was working before...

Fixes: 163158496
Test: m RunCarUiRoboTests
Change-Id: I8841ea8160193f88706fba381ae3914b6c06600f

car-ui-lib/car-ui-lib/src/test/java/com/android/car/ui/toolbar/ToolbarTest.java

diff --git a/car-ui-lib/car-ui-lib/src/test/java/com/android/car/ui/toolbar/ToolbarTest.java b/car-ui-lib/car-ui-lib/src/test/java/com/android/car/ui/toolbar/ToolbarTest.java
index 1423977..330660b 100644
--- a/car-ui-lib/car-ui-lib/src/test/java/com/android/car/ui/toolbar/ToolbarTest.java
+++ b/car-ui-lib/car-ui-lib/src/test/java/com/android/car/ui/toolbar/ToolbarTest.java
@@ -63,10 +63,6 @@
         mToolbar = mActivity.findViewById(R.id.toolbar);
     }
 
-    private int getTestResourceIdInt(String resource) {
-        return mResources.getIdentifier(resource, "id", mContext.getPackageName());
-    }
-
     private int getTestDrawableInt(String drawable) {
         return mResources.getIdentifier(drawable, "drawable", mContext.getPackageName());
     }
@@ -108,7 +104,7 @@
     @Test
     public void showLogo_whenSet_andStateIsHome() {
         mToolbar.setState(Toolbar.State.HOME);
-        mToolbar.setLogo(getTestResourceIdInt("test_ic_launcher"));
+        mToolbar.setLogo(getTestDrawableInt("test_ic_launcher"));
 
         assertThat(mToolbar.findViewById(R.id.car_ui_toolbar_logo).isShown()).isTrue();
         assertThat(mToolbar.findViewById(R.id.car_ui_toolbar_title_logo).isShown()).isFalse();
@@ -121,7 +117,7 @@
 
         Toolbar toolbar = new Toolbar(mContext);
         toolbar.setState(Toolbar.State.HOME);
-        mToolbar.setLogo(getTestResourceIdInt("test_ic_launcher"));
+        mToolbar.setLogo(getTestDrawableInt("test_ic_launcher"));
 
         assertThat(isViewInToolbarShown(toolbar, R.id.car_ui_toolbar_logo)).isFalse();
         assertThat(isViewInToolbarShown(toolbar, R.id.car_ui_toolbar_title_logo)).isFalse();
@@ -130,7 +126,7 @@
     @Test
     public void showTitleLogo_whenSet_andStateIsNotHome() {
         mToolbar.setState(Toolbar.State.SUBPAGE);
-        mToolbar.setLogo(getTestResourceIdInt("test_ic_launcher"));
+        mToolbar.setLogo(getTestDrawableInt("test_ic_launcher"));
 
         assertThat(mToolbar.findViewById(R.id.car_ui_toolbar_logo).isShown()).isFalse();
         assertThat(mToolbar.findViewById(R.id.car_ui_toolbar_title_logo).isShown()).isTrue();