Merge "hotspot2: fix failures in PasspointNetworkEvaulatorTest"

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java
index c4527adc4..27e7c3da7 100644
--- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java
@@ -30,6 +30,8 @@ import static org.mockito.MockitoAnnotations.initMocks;
 
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
+import android.net.wifi.hotspot2.PasspointConfiguration;
+import android.net.wifi.hotspot2.pps.HomeSp;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Pair;
 
@@ -86,6 +88,11 @@ public class PasspointNetworkEvaluatorTest {
      */
     private static PasspointProvider generateProvider(WifiConfiguration config) {
         PasspointProvider provider = mock(PasspointProvider.class);
+        PasspointConfiguration passpointConfig = new PasspointConfiguration();
+        HomeSp homeSp = new HomeSp();
+        homeSp.setFqdn(config.FQDN);
+        passpointConfig.setHomeSp(homeSp);
+        when(provider.getConfig()).thenReturn(passpointConfig);
         when(provider.getWifiConfig()).thenReturn(config);
         return provider;
     }