From 1762a3ccad2e2ff0991812b0658d35c3edfc57bc Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Mon, 10 Feb 2020 19:36:58 +0800 Subject: [PATCH] [Wi-Fi] Fix failed test cases Fix IllegalStateException: Credential or HomeSP are not initialized by setting credential to PasspointConfiguration. Bug: 149180590 Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi Change-Id: I14edefaa938f1aeb43b493d24aca3f810ab89593 --- ...SubscribedAccessPointsPreferenceControllerTest.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceControllerTest.java index b28498b2048..74f94e92664 100644 --- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceControllerTest.java @@ -25,9 +25,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; +import android.net.wifi.EAPConstants; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.net.wifi.hotspot2.PasspointConfiguration; +import android.net.wifi.hotspot2.pps.Credential; import android.net.wifi.hotspot2.pps.HomeSp; import androidx.preference.PreferenceCategory; @@ -35,7 +37,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.testutils.shadow.ShadowAccessPoint; import com.android.settings.testutils.shadow.ShadowWifiManager; -import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.AccessPointPreference; import org.junit.Before; @@ -111,6 +112,13 @@ public class SubscribedAccessPointsPreferenceControllerTest { homeSp.setFqdn("FQDN"); homeSp.setFriendlyName("TESTPASSPOINT"); config.setHomeSp(homeSp); + final Credential.SimCredential simCredential = new Credential.SimCredential(); + final Credential credential = new Credential(); + credential.setRealm("test.example.com"); + simCredential.setImsi("12345*"); + simCredential.setEapType(EAPConstants.EAP_SIM); + credential.setSimCredential(simCredential); + config.setCredential(credential); return config; } }