PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev am: 2a14b7e8b5

Browse Source 
am: 1575a3fa40

Change-Id: I254ae60a4fac0f68e83ab5d8bbb4fa2a929ff6c4
This commit is contained in:
Clown SHEN
2019-04-22 20:51:10 -07:00
committed by android-build-merger
parent 50234a6d6f 1575a3fa40
commit 156bafe634
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
View File

@@ -84,7 +84,6 @@ import com.android.settingslib.wifi.WifiTracker;
import com.android.settingslib.wifi.WifiTrackerFactory; import com.android.settingslib.wifi.WifiTrackerFactory;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Answers; import org.mockito.Answers;
@@ -108,7 +107,6 @@ import java.util.stream.Collectors;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowDevicePolicyManager.class, ShadowEntityHeaderController.class}) @Config(shadows = {ShadowDevicePolicyManager.class, ShadowEntityHeaderController.class})
@Ignore("b/130896210")
public class WifiDetailPreferenceControllerTest { public class WifiDetailPreferenceControllerTest {
private static final int LEVEL = 1; private static final int LEVEL = 1;
@@ -120,6 +118,7 @@ public class WifiDetailPreferenceControllerTest {
private static final String RANDOMIZED_MAC_ADDRESS = "RANDOMIZED_MAC_ADDRESS"; private static final String RANDOMIZED_MAC_ADDRESS = "RANDOMIZED_MAC_ADDRESS";
private static final String FACTORY_MAC_ADDRESS = "FACTORY_MAC_ADDRESS"; private static final String FACTORY_MAC_ADDRESS = "FACTORY_MAC_ADDRESS";
private static final String SECURITY = "None"; private static final String SECURITY = "None";
private static final String FQDN = "fqdn";
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PreferenceScreen mockScreen; private PreferenceScreen mockScreen;
@@ -301,7 +300,7 @@ public class WifiDetailPreferenceControllerTest {
list.add(mockAccessPoint); list.add(mockAccessPoint);
when(mockWifiTracker.getAccessPoints()).thenReturn(list); when(mockWifiTracker.getAccessPoints()).thenReturn(list);
WifiTrackerFactory.setTestingWifiTracker(mockWifiTracker); WifiTrackerFactory.setTestingWifiTracker(mockWifiTracker);
when(mockAccessPoint.matches(any(WifiConfiguration.class))).thenReturn(true); when(mockAccessPoint.matches(any(AccessPoint.class))).thenReturn(true);
when(mockAccessPoint.isReachable()).thenReturn(true); when(mockAccessPoint.isReachable()).thenReturn(true);
mController = newWifiDetailPreferenceController(); mController = newWifiDetailPreferenceController();
@@ -313,7 +312,7 @@ public class WifiDetailPreferenceControllerTest {
list.add(mockAccessPoint); list.add(mockAccessPoint);
when(mockWifiTracker.getAccessPoints()).thenReturn(list); when(mockWifiTracker.getAccessPoints()).thenReturn(list);
WifiTrackerFactory.setTestingWifiTracker(mockWifiTracker); WifiTrackerFactory.setTestingWifiTracker(mockWifiTracker);
when(mockAccessPoint.matches(any(WifiConfiguration.class))).thenReturn(true); when(mockAccessPoint.matches(any(AccessPoint.class))).thenReturn(true);
when(mockAccessPoint.isReachable()).thenReturn(true); when(mockAccessPoint.isReachable()).thenReturn(true);
mController = newWifiDetailPreferenceController(); mController = newWifiDetailPreferenceController();
@@ -325,7 +324,7 @@ public class WifiDetailPreferenceControllerTest {
list.add(mockAccessPoint); list.add(mockAccessPoint);
when(mockWifiTracker.getAccessPoints()).thenReturn(list); when(mockWifiTracker.getAccessPoints()).thenReturn(list);
WifiTrackerFactory.setTestingWifiTracker(mockWifiTracker); WifiTrackerFactory.setTestingWifiTracker(mockWifiTracker);
when(mockAccessPoint.matches(any(WifiConfiguration.class))).thenReturn(false); when(mockAccessPoint.matches(any(AccessPoint.class))).thenReturn(false);
when(mockAccessPoint.isReachable()).thenReturn(false); when(mockAccessPoint.isReachable()).thenReturn(false);
mController = newWifiDetailPreferenceController(); mController = newWifiDetailPreferenceController();
@@ -1116,12 +1115,13 @@ public class WifiDetailPreferenceControllerTest {
FeatureFlagPersistent.setEnabled(mContext, FeatureFlags.NETWORK_INTERNET_V2, false); FeatureFlagPersistent.setEnabled(mContext, FeatureFlags.NETWORK_INTERNET_V2, false);
mockWifiConfig.networkId = 5; mockWifiConfig.networkId = 5;
when(mockWifiConfig.isPasspoint()).thenReturn(true); when(mockAccessPoint.isPasspoint()).thenReturn(true);
when(mockAccessPoint.getPasspointFqdn()).thenReturn(FQDN);
mController.displayPreference(mockScreen); mController.displayPreference(mockScreen);
mForgetClickListener.getValue().onClick(null); mForgetClickListener.getValue().onClick(null);
verify(mockWifiManager).removePasspointConfiguration(mockWifiConfig.FQDN); verify(mockWifiManager).removePasspointConfiguration(FQDN);
verify(mockMetricsFeatureProvider) verify(mockMetricsFeatureProvider)
.action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET); .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
} }
@@ -1132,13 +1132,14 @@ public class WifiDetailPreferenceControllerTest {
final WifiDetailPreferenceController spyController = spy(mController); final WifiDetailPreferenceController spyController = spy(mController);
mockWifiConfig.networkId = 5; mockWifiConfig.networkId = 5;
when(mockWifiConfig.isPasspoint()).thenReturn(true); when(mockAccessPoint.isPasspoint()).thenReturn(true);
when(mockAccessPoint.getPasspointFqdn()).thenReturn(FQDN);
spyController.displayPreference(mockScreen); spyController.displayPreference(mockScreen);
FeatureFlagPersistent.setEnabled(mContext, FeatureFlags.NETWORK_INTERNET_V2, true); FeatureFlagPersistent.setEnabled(mContext, FeatureFlags.NETWORK_INTERNET_V2, true);
mForgetClickListener.getValue().onClick(null); mForgetClickListener.getValue().onClick(null);
verify(mockWifiManager, times(0)).removePasspointConfiguration(mockWifiConfig.FQDN); verify(mockWifiManager, times(0)).removePasspointConfiguration(FQDN);
verify(mockMetricsFeatureProvider, times(0)) verify(mockMetricsFeatureProvider, times(0))
.action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET); .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
verify(spyController).showConfirmForgetDialog(); verify(spyController).showConfirmForgetDialog();