From 8470122ad1f435a3b913f53a5d2cfab15cf4ca82 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Fri, 28 Apr 2023 15:52:25 +0800 Subject: [PATCH] Fix ImeiInfoPreferenceControllerTest For test case updatePreference_simSlotWithoutSim_notSetEnabled, mSecondSimPreference is a mock, instead of check the default value of isEnabled(), verify it's setEnabled() not called. Fix: 279880808 Test: RobolectricTest Change-Id: I72064820754e053def46bdbf10317189c7ac608f --- .../imei/ImeiInfoPreferenceController.java | 1 - .../imei/ImeiInfoPreferenceControllerTest.java | 12 +++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java index 2c7b5f4262d..2045b9661c0 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java @@ -150,7 +150,6 @@ public class ImeiInfoPreferenceController extends BasePreferenceController { @VisibleForTesting protected void updatePreference(Preference preference, int simSlot) { - SubscriptionInfo subInfo = getSubscriptionInfo(simSlot); preference.setTitle(getTitle(simSlot)); preference.setSummary(getSummary()); } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java index 9d700a62476..6699b34ef95 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -19,11 +19,14 @@ package com.android.settings.deviceinfo.imei; import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; import static android.telephony.TelephonyManager.PHONE_TYPE_GSM; import static android.telephony.TelephonyManager.PHONE_TYPE_NONE; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; -import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -32,13 +35,16 @@ import android.content.Context; import android.content.res.Resources; import android.os.UserManager; import android.telephony.TelephonyManager; + import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.deviceinfo.simstatus.SlotSimStatus; + import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -119,13 +125,13 @@ public class ImeiInfoPreferenceControllerTest { } @Test - public void updatePreference_simSlotWithoutSim_shouldBeEnabled() { + public void updatePreference_simSlotWithoutSim_notSetEnabled() { mSecondController = createPreferenceController(null, "imei_info2", mSecondSimPreference, PHONE_TYPE_NONE); mSecondController.updatePreference(mSecondSimPreference, -1); - assertThat(mSecondSimPreference.isEnabled()).isTrue(); + verify(mSecondSimPreference, never()).setEnabled(anyBoolean()); } @Ignore