Commit ffd06428 authored by Wenyu Fu's avatar Wenyu Fu Committed by Commit Bot

Fix PromoCardCoordinatorTest failure on K devices

Getting Xml vector drawables on K- devices would cause failure.
Using AppCompatResources instead.

Bug: 1071414
Change-Id: Ide48b1f0e968e4c36e7038257e9e8f59376ae7a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2153688
Commit-Queue: Theresa  <twellington@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759865}
parent 7bd3a6f9
...@@ -6,11 +6,12 @@ package org.chromium.components.browser_ui.widget.promo; ...@@ -6,11 +6,12 @@ package org.chromium.components.browser_ui.widget.promo;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build;
import android.support.test.InstrumentationRegistry; import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest; import android.support.test.filters.SmallTest;
import android.view.View; import android.view.View;
import androidx.appcompat.content.res.AppCompatResources;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
...@@ -18,7 +19,6 @@ import org.junit.runner.RunWith; ...@@ -18,7 +19,6 @@ import org.junit.runner.RunWith;
import org.chromium.base.test.BaseJUnit4ClassRunner; import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.util.CallbackHelper; import org.chromium.base.test.util.CallbackHelper;
import org.chromium.base.test.util.DisableIf;
import org.chromium.components.browser_ui.widget.test.R; import org.chromium.components.browser_ui.widget.test.R;
import org.chromium.content_public.browser.test.util.TestThreadUtils; import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.modelutil.PropertyModel;
...@@ -45,12 +45,10 @@ public class PromoCardCoordinatorTest { ...@@ -45,12 +45,10 @@ public class PromoCardCoordinatorTest {
@Test @Test
@SmallTest @SmallTest
@DisableIf.Build(sdk_is_less_than = Build.VERSION_CODES.LOLLIPOP,
message = "Failing on K, https://crbug.com/1071414")
public void public void
testTextImageBinding() { testTextImageBinding() {
final Drawable testImage = final Drawable testImage =
mContext.getResources().getDrawable(R.drawable.logo_avatar_anonymous); AppCompatResources.getDrawable(mContext, R.drawable.logo_avatar_anonymous);
final String titleString = "Some string for title"; final String titleString = "Some string for title";
final String testString = "Some test string"; final String testString = "Some test string";
final String primaryButtonString = "Primary button string"; final String primaryButtonString = "Primary button string";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment