From 0614a7d1ea7c54786b05a2dc18d79bfc0b121572 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Mon, 25 Nov 2019 14:46:03 +0800 Subject: [PATCH] [Wi-Fi] Fix unit test fails Bug: 144405885 Test: WifiSettingsTest WifiSettings2Test WifiDetailPreferenceControllerTest WifiDetailPreferenceController2Test Change-Id: Ib6a34364c3eb47d59a153f07e31c9cddddcf1f8a --- .../src/com/android/settings/wifi/WifiSettings2Test.java | 3 +-- .../src/com/android/settings/wifi/WifiSettingsTest.java | 3 +-- .../wifi/details/WifiDetailPreferenceControllerTest.java | 7 +++---- .../wifi/details2/WifiDetailPreferenceController2Test.java | 7 +++---- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java index e64d015c971..d523866a987 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java @@ -50,7 +50,6 @@ import com.android.settingslib.search.SearchIndexableRaw; import com.android.wifitrackerlib.WifiPickerTracker; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -241,9 +240,9 @@ public class WifiSettings2Test { } @Test - @Ignore public void onCreateAdapter_hasStableIdsTrue() { final PreferenceScreen preferenceScreen = mock(PreferenceScreen.class); + when(preferenceScreen.getContext()).thenReturn(mContext); RecyclerView.Adapter adapter = mWifiSettings2.onCreateAdapter(preferenceScreen); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java index ee14ca5e36d..2fe7c5ca1b4 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java @@ -57,7 +57,6 @@ import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.WifiTracker; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -296,9 +295,9 @@ public class WifiSettingsTest { } @Test - @Ignore public void onCreateAdapter_hasStableIdsTrue() { final PreferenceScreen preferenceScreen = mock(PreferenceScreen.class); + when(preferenceScreen.getContext()).thenReturn(mContext); RecyclerView.Adapter adapter = mWifiSettings.onCreateAdapter(preferenceScreen); diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java index f0ac336aa1d..b9908467260 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; @@ -81,7 +82,6 @@ import com.android.settingslib.wifi.WifiTracker; import com.android.settingslib.wifi.WifiTrackerFactory; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -1859,18 +1859,17 @@ public class WifiDetailPreferenceControllerTest { } @Test - @Ignore public void entityHeader_expiredPasspointR1_shouldHandleExpiration() { - setUpForDisconnectedNetwork(); when(mockAccessPoint.isPasspoint()).thenReturn(true); when(mockAccessPoint.isPasspointConfigurationR1()).thenReturn(true); when(mockAccessPoint.isExpired()).thenReturn(true); + setUpForDisconnectedNetwork(); String expireSummary = mContext.getResources().getString( com.android.settingslib.R.string.wifi_passpoint_expired); displayAndResume(); - verify(mockButtonsPref).setButton3Visible(false); + verify(mockButtonsPref, atLeastOnce()).setButton3Visible(false); verify(mockHeaderController).setSummary(expireSummary); } diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java index 8d15224229d..5b125e9982a 100644 --- a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java @@ -22,6 +22,7 @@ import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; @@ -81,7 +82,6 @@ import com.android.settingslib.wifi.WifiTracker; import com.android.settingslib.wifi.WifiTrackerFactory; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -1859,18 +1859,17 @@ public class WifiDetailPreferenceController2Test { } @Test - @Ignore public void entityHeader_expiredPasspointR1_shouldHandleExpiration() { - setUpForDisconnectedNetwork(); when(mMockAccessPoint.isPasspoint()).thenReturn(true); when(mMockAccessPoint.isPasspointConfigurationR1()).thenReturn(true); when(mMockAccessPoint.isExpired()).thenReturn(true); + setUpForDisconnectedNetwork(); String expireSummary = mContext.getResources().getString( com.android.settingslib.R.string.wifi_passpoint_expired); displayAndResume(); - verify(mMockButtonsPref).setButton3Visible(false); + verify(mMockButtonsPref, atLeastOnce()).setButton3Visible(false); verify(mMockHeaderController).setSummary(expireSummary); }