commit 35d91e98706f562ae9bda15121a1dc665488e1ef
author Chaohui Wang <chaohuiw@google.com> Fri May 17 15:05:01 2024 +0800
committer Chaohui Wang <chaohuiw@google.com> Mon May 20 02:18:56 2024 +0000
tree fc8115758ba74b34bb5e0cd2a5fc5d2e4c4b6daf
parent 9c0654daea8044f0bde11053ffd3a4fe22828d18

Fix EnabledNetworkModePreferenceControllerTest

Fix: 337418033
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: I5614a6d863b804442cbb14c1fbc136db9d800a28

tests/unit/Android.bp

diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index c8e886c..bc5824f 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -21,18 +21,16 @@
     static_libs: [
         "aconfig_settings_flags_lib",
         "androidx.arch.core_core-testing",
-        "androidx.test.core",
+        "androidx.lifecycle_lifecycle-runtime-testing",
         "androidx.test.espresso.core",
-        "androidx.test.rules",
         "androidx.test.ext.junit",
-        "androidx.preference_preference",
+        "androidx.test.rules",
         "flag-junit",
         "mockito-target-minus-junit4",
         "platform-test-annotations",
         "platform-test-rules",
         "truth",
         "kotlinx_coroutines_test",
-        "flag-junit",
         "Settings-testutils2",
         "MediaDrmSettingsFlagsLib",
         // Don't add SettingsLib libraries here - you can use them directly as they are in the

tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java

diff --git a/tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
index 85c5c6b..b3d095e 100644
--- a/tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
@@ -48,6 +48,7 @@
 
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.testing.TestLifecycleOwner;
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
@@ -60,7 +61,6 @@
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -113,6 +113,7 @@
         doReturn(mPersistableBundle).when(mCarrierConfigCache).getConfig();
         doReturn(mPersistableBundle).when(mCarrierConfigCache).getConfigForSubId(SUB_ID);
         mPersistableBundle.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
+        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_PREFER_3G_VISIBILITY_BOOL, true);
         mPreference = new ListPreference(mContext);
         mController = new EnabledNetworkModePreferenceController(mContext, KEY);
         mockAllowedNetworkTypes(ALLOWED_ALL_NETWORK_TYPE);
@@ -347,7 +348,6 @@
 
     @UiThreadTest
     @Test
-    @Ignore("b/337418033")
     public void updateState_updateByNetworkMode() {
         mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
 
@@ -379,7 +379,6 @@
 
     @UiThreadTest
     @Test
-    @Ignore("b/337418033")
     public void onPreferenceChange_updateSuccess() {
         mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
         doReturn(true).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
@@ -387,6 +386,7 @@
                         TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
 
         mController.updateState(mPreference);
+        mController.onViewCreated(new TestLifecycleOwner());
         mController.onPreferenceChange(mPreference,
                 String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
 
@@ -396,13 +396,13 @@
 
     @UiThreadTest
     @Test
-    @Ignore("b/337418033")
     public void onPreferenceChange_updateFail() {
         mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
         doReturn(false).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
                 getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
 
         mController.updateState(mPreference);
+        mController.onViewCreated(new TestLifecycleOwner());
         mController.onPreferenceChange(mPreference,
                 String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
 
@@ -412,7 +412,6 @@
 
     @UiThreadTest
     @Test
-    @Ignore("b/337418033")
     public void preferredNetworkModeNotification_preferenceUpdates() {
 
         final PreferenceManager preferenceManager = new PreferenceManager(mContext);