Merge "[Wi-Fi] Fix failed test cases"

This commit is contained in:
TreeHugger Robot
2020-02-10 13:34:35 +00:00
committed by Android (Google) Code Review

View File

@@ -25,9 +25,11 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.net.wifi.EAPConstants;
import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.net.wifi.hotspot2.PasspointConfiguration; import android.net.wifi.hotspot2.PasspointConfiguration;
import android.net.wifi.hotspot2.pps.Credential;
import android.net.wifi.hotspot2.pps.HomeSp; import android.net.wifi.hotspot2.pps.HomeSp;
import androidx.preference.PreferenceCategory; 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.ShadowAccessPoint;
import com.android.settings.testutils.shadow.ShadowWifiManager; import com.android.settings.testutils.shadow.ShadowWifiManager;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.AccessPointPreference; import com.android.settingslib.wifi.AccessPointPreference;
import org.junit.Before; import org.junit.Before;
@@ -111,6 +112,13 @@ public class SubscribedAccessPointsPreferenceControllerTest {
homeSp.setFqdn("FQDN"); homeSp.setFqdn("FQDN");
homeSp.setFriendlyName("TESTPASSPOINT"); homeSp.setFriendlyName("TESTPASSPOINT");
config.setHomeSp(homeSp); 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; return config;
} }
} }