[Wi-Fi] Fix unit test fails
Bug: 144405885 Test: WifiSettingsTest WifiSettings2Test WifiDetailPreferenceControllerTest WifiDetailPreferenceController2Test Change-Id: Ib6a34364c3eb47d59a153f07e31c9cddddcf1f8a
This commit is contained in:
@@ -50,7 +50,6 @@ import com.android.settingslib.search.SearchIndexableRaw;
|
|||||||
import com.android.wifitrackerlib.WifiPickerTracker;
|
import com.android.wifitrackerlib.WifiPickerTracker;
|
||||||
|
|
||||||
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.Mock;
|
import org.mockito.Mock;
|
||||||
@@ -241,9 +240,9 @@ public class WifiSettings2Test {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void onCreateAdapter_hasStableIdsTrue() {
|
public void onCreateAdapter_hasStableIdsTrue() {
|
||||||
final PreferenceScreen preferenceScreen = mock(PreferenceScreen.class);
|
final PreferenceScreen preferenceScreen = mock(PreferenceScreen.class);
|
||||||
|
when(preferenceScreen.getContext()).thenReturn(mContext);
|
||||||
|
|
||||||
RecyclerView.Adapter adapter = mWifiSettings2.onCreateAdapter(preferenceScreen);
|
RecyclerView.Adapter adapter = mWifiSettings2.onCreateAdapter(preferenceScreen);
|
||||||
|
|
||||||
|
@@ -57,7 +57,6 @@ import com.android.settingslib.wifi.AccessPoint;
|
|||||||
import com.android.settingslib.wifi.WifiTracker;
|
import com.android.settingslib.wifi.WifiTracker;
|
||||||
|
|
||||||
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.Mock;
|
import org.mockito.Mock;
|
||||||
@@ -296,9 +295,9 @@ public class WifiSettingsTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void onCreateAdapter_hasStableIdsTrue() {
|
public void onCreateAdapter_hasStableIdsTrue() {
|
||||||
final PreferenceScreen preferenceScreen = mock(PreferenceScreen.class);
|
final PreferenceScreen preferenceScreen = mock(PreferenceScreen.class);
|
||||||
|
when(preferenceScreen.getContext()).thenReturn(mContext);
|
||||||
|
|
||||||
RecyclerView.Adapter adapter = mWifiSettings.onCreateAdapter(preferenceScreen);
|
RecyclerView.Adapter adapter = mWifiSettings.onCreateAdapter(preferenceScreen);
|
||||||
|
|
||||||
|
@@ -22,6 +22,7 @@ import static org.mockito.ArgumentMatchers.anyBoolean;
|
|||||||
import static org.mockito.ArgumentMatchers.anyInt;
|
import static org.mockito.ArgumentMatchers.anyInt;
|
||||||
import static org.mockito.ArgumentMatchers.anyString;
|
import static org.mockito.ArgumentMatchers.anyString;
|
||||||
import static org.mockito.ArgumentMatchers.nullable;
|
import static org.mockito.ArgumentMatchers.nullable;
|
||||||
|
import static org.mockito.Mockito.atLeastOnce;
|
||||||
import static org.mockito.Mockito.doNothing;
|
import static org.mockito.Mockito.doNothing;
|
||||||
import static org.mockito.Mockito.inOrder;
|
import static org.mockito.Mockito.inOrder;
|
||||||
import static org.mockito.Mockito.mock;
|
import static org.mockito.Mockito.mock;
|
||||||
@@ -81,7 +82,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;
|
||||||
@@ -1859,18 +1859,17 @@ public class WifiDetailPreferenceControllerTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void entityHeader_expiredPasspointR1_shouldHandleExpiration() {
|
public void entityHeader_expiredPasspointR1_shouldHandleExpiration() {
|
||||||
setUpForDisconnectedNetwork();
|
|
||||||
when(mockAccessPoint.isPasspoint()).thenReturn(true);
|
when(mockAccessPoint.isPasspoint()).thenReturn(true);
|
||||||
when(mockAccessPoint.isPasspointConfigurationR1()).thenReturn(true);
|
when(mockAccessPoint.isPasspointConfigurationR1()).thenReturn(true);
|
||||||
when(mockAccessPoint.isExpired()).thenReturn(true);
|
when(mockAccessPoint.isExpired()).thenReturn(true);
|
||||||
|
setUpForDisconnectedNetwork();
|
||||||
String expireSummary = mContext.getResources().getString(
|
String expireSummary = mContext.getResources().getString(
|
||||||
com.android.settingslib.R.string.wifi_passpoint_expired);
|
com.android.settingslib.R.string.wifi_passpoint_expired);
|
||||||
|
|
||||||
displayAndResume();
|
displayAndResume();
|
||||||
|
|
||||||
verify(mockButtonsPref).setButton3Visible(false);
|
verify(mockButtonsPref, atLeastOnce()).setButton3Visible(false);
|
||||||
verify(mockHeaderController).setSummary(expireSummary);
|
verify(mockHeaderController).setSummary(expireSummary);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -22,6 +22,7 @@ import static org.mockito.ArgumentMatchers.anyBoolean;
|
|||||||
import static org.mockito.ArgumentMatchers.anyInt;
|
import static org.mockito.ArgumentMatchers.anyInt;
|
||||||
import static org.mockito.ArgumentMatchers.anyString;
|
import static org.mockito.ArgumentMatchers.anyString;
|
||||||
import static org.mockito.ArgumentMatchers.nullable;
|
import static org.mockito.ArgumentMatchers.nullable;
|
||||||
|
import static org.mockito.Mockito.atLeastOnce;
|
||||||
import static org.mockito.Mockito.doNothing;
|
import static org.mockito.Mockito.doNothing;
|
||||||
import static org.mockito.Mockito.inOrder;
|
import static org.mockito.Mockito.inOrder;
|
||||||
import static org.mockito.Mockito.mock;
|
import static org.mockito.Mockito.mock;
|
||||||
@@ -81,7 +82,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;
|
||||||
@@ -1859,18 +1859,17 @@ public class WifiDetailPreferenceController2Test {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void entityHeader_expiredPasspointR1_shouldHandleExpiration() {
|
public void entityHeader_expiredPasspointR1_shouldHandleExpiration() {
|
||||||
setUpForDisconnectedNetwork();
|
|
||||||
when(mMockAccessPoint.isPasspoint()).thenReturn(true);
|
when(mMockAccessPoint.isPasspoint()).thenReturn(true);
|
||||||
when(mMockAccessPoint.isPasspointConfigurationR1()).thenReturn(true);
|
when(mMockAccessPoint.isPasspointConfigurationR1()).thenReturn(true);
|
||||||
when(mMockAccessPoint.isExpired()).thenReturn(true);
|
when(mMockAccessPoint.isExpired()).thenReturn(true);
|
||||||
|
setUpForDisconnectedNetwork();
|
||||||
String expireSummary = mContext.getResources().getString(
|
String expireSummary = mContext.getResources().getString(
|
||||||
com.android.settingslib.R.string.wifi_passpoint_expired);
|
com.android.settingslib.R.string.wifi_passpoint_expired);
|
||||||
|
|
||||||
displayAndResume();
|
displayAndResume();
|
||||||
|
|
||||||
verify(mMockButtonsPref).setButton3Visible(false);
|
verify(mMockButtonsPref, atLeastOnce()).setButton3Visible(false);
|
||||||
verify(mMockHeaderController).setSummary(expireSummary);
|
verify(mMockHeaderController).setSummary(expireSummary);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user