From f08c87d00258f3e7e653832b128f0e22286ba3f7 Mon Sep 17 00:00:00 2001 From: Fan Wu Date: Mon, 15 Jan 2024 10:49:40 +0800 Subject: [PATCH] Fix LinkifySummaryPreferenceTest The spy annotation will trigger the non-existing API. Bug: 313563183 Test: atest SettingsRoboTests:com.android.settings.widget Change-Id: Iec4448b45e5408846962dc49c65ccc64feb5d2ad --- .../widget/LinkifySummaryPreferenceTest.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/robotests/src/com/android/settings/widget/LinkifySummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/LinkifySummaryPreferenceTest.java index f060588b498..b33a5643b6c 100644 --- a/tests/robotests/src/com/android/settings/widget/LinkifySummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/LinkifySummaryPreferenceTest.java @@ -32,21 +32,22 @@ import android.view.View; import android.widget.TextView; import androidx.preference.PreferenceViewHolder; +import androidx.test.core.app.ApplicationProvider; import org.junit.Before; -import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.mockito.Spy; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; import org.robolectric.RobolectricTestRunner; -import org.robolectric.RuntimeEnvironment; -@Ignore("b/313563183") @RunWith(RobolectricTestRunner.class) public class LinkifySummaryPreferenceTest { - @Spy + @Rule + public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + private PreferenceViewHolder mViewHolder; @Mock private TextView mSummaryTextView; @@ -54,9 +55,7 @@ public class LinkifySummaryPreferenceTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); - - final Context context = RuntimeEnvironment.application; + final Context context = ApplicationProvider.getApplicationContext(); mPreference = new LinkifySummaryPreference(context, null /* attrs */); final View view = spy(View.inflate(context, mPreference.getLayoutResource(),