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

Merge "[Wi-Fi] Fix unit test fails"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-25 08:33:35 +00:00
committed by Android (Google) Code Review
parent 2229585e88 0614a7d1ea
commit 901ba391d3
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java
View File

@@ -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);

3
tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
View File

@@ -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);

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

@@ -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);
}

7
tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
View File

@@ -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);
}