Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev am: ab04f86066
am: 91d1b6640a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964828 Change-Id: Ic3e3f1c1364e529c57a01d332e2244d0615ec566
This commit is contained in:
@@ -16,8 +16,6 @@
|
||||
|
||||
package com.android.settings.network;
|
||||
|
||||
import static com.android.settings.network.ProviderModelSlice.ACTION_TITLE_CONNECT_TO_CARRIER;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
@@ -420,29 +418,4 @@ public class ProviderModelSliceTest {
|
||||
|
||||
verify(mMockNetworkProviderWorker, never()).connectCarrierNetwork();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getWifiSliceItemRow_wifiNoInternetAccess_actionConnectToWifiSsid() {
|
||||
when(mWifiSliceItem.getKey()).thenReturn("wifi_key");
|
||||
when(mWifiSliceItem.getTitle()).thenReturn("wifi_ssid");
|
||||
when(mWifiSliceItem.hasInternetAccess()).thenReturn(false);
|
||||
|
||||
ListBuilder.RowBuilder rowBuilder =
|
||||
mMockProviderModelSlice.getWifiSliceItemRow(mWifiSliceItem);
|
||||
|
||||
assertThat(rowBuilder.getPrimaryAction().getTitle())
|
||||
.isEqualTo("wifi_ssid");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getWifiSliceItemRow_wifiHasInternetAccess_actionConnectToCarrier() {
|
||||
when(mWifiSliceItem.getTitle()).thenReturn("wifi_ssid");
|
||||
when(mWifiSliceItem.hasInternetAccess()).thenReturn(true);
|
||||
|
||||
ListBuilder.RowBuilder rowBuilder =
|
||||
mMockProviderModelSlice.getWifiSliceItemRow(mWifiSliceItem);
|
||||
|
||||
assertThat(rowBuilder.getPrimaryAction().getTitle())
|
||||
.isEqualTo(ACTION_TITLE_CONNECT_TO_CARRIER);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user