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

Merge "Add dhcp in advanced settings toggle." into main

Browse Source
This commit is contained in:
Charlotte Lu
2024-03-12 02:32:57 +00:00
committed by Android (Google) Code Review
parent b9895a2438 08f8f0ce9e
commit 470c27b8bd
7 changed files with 151 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.wifi;
import static com.android.settings.wifi.WifiConfigController.DHCP_SPINNER_INDEX_SEND_DHCP_HOST_NAME_DISABLE;
import static com.android.settings.wifi.WifiConfigController2.DEFAULT_ANONYMOUS_ID;
import static com.android.settings.wifi.WifiConfigController2.WIFI_EAP_METHOD_SIM;
@@ -56,6 +57,7 @@ import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.utils.AndroidKeystoreAliasLoader;
import com.android.settings.wifi.details2.WifiPrivacyPreferenceController;
import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
import com.android.wifitrackerlib.WifiEntry;
@@ -512,6 +514,42 @@ public class WifiConfigController2Test {
assertThat(config.macRandomizationSetting).isEqualTo(WifiConfiguration.RANDOMIZATION_NONE);
}
@Test
public void loadSavedDhcpValue_true() {
checkSavedDhcpValue(true);
}
@Test
public void loadSavedDhcpValue_false() {
checkSavedDhcpValue(false);
}
private void checkSavedDhcpValue(boolean dhcpValue) {
when(mWifiEntry.isSaved()).thenReturn(true);
final WifiConfiguration mockWifiConfig = mock(WifiConfiguration.class);
when(mockWifiConfig.getIpConfiguration()).thenReturn(mock(IpConfiguration.class));
when(mockWifiConfig.isSendDhcpHostnameEnabled()).thenReturn(dhcpValue);
when(mWifiEntry.getWifiConfiguration()).thenReturn(mockWifiConfig);
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
final Spinner dhcpSetting = mView.findViewById(R.id.dhcp_settings);
final int expectedPrefValue =
WifiPrivacyPreferenceController.Companion
.translateSendDhcpHostnameEnabledToPrefValue(dhcpValue);
assertThat(dhcpSetting.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(dhcpSetting.getSelectedItemPosition()).isEqualTo(expectedPrefValue);
}
@Test
public void saveDhcpValue_changedToFalse() {
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
final Spinner privacySetting = mView.findViewById(R.id.dhcp_settings);
privacySetting.setSelection(DHCP_SPINNER_INDEX_SEND_DHCP_HOST_NAME_DISABLE);
WifiConfiguration config = mController.getConfig();
assertThat(config.isSendDhcpHostnameEnabled()).isEqualTo(false);
}
@Test
public void replaceTtsString_whenTargetMatched_shouldSuccess() {
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);

37
tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
View File

@@ -18,6 +18,8 @@ package com.android.settings.wifi;
import static com.android.settings.wifi.WifiConfigController.PRIVACY_SPINNER_INDEX_DEVICE_MAC;
import static com.android.settings.wifi.WifiConfigController.PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC;
import static com.android.settings.wifi.WifiConfigController.DHCP_SPINNER_INDEX_SEND_DHCP_HOST_NAME_ENABLE;
import static com.android.settings.wifi.WifiConfigController.DHCP_SPINNER_INDEX_SEND_DHCP_HOST_NAME_DISABLE;
import static com.google.common.truth.Truth.assertThat;
@@ -450,6 +452,41 @@ public class WifiConfigControllerTest {
assertThat(config.macRandomizationSetting).isEqualTo(WifiConfiguration.RANDOMIZATION_NONE);
}
@Test
public void loadSavedDhcpValue_true() {
checkSavedDhcpValue(true);
}
@Test
public void loadSavedDhcpValue_false() {
checkSavedDhcpValue(false);
}
private void checkSavedDhcpValue(boolean dhcpValue) {
when(mAccessPoint.isSaved()).thenReturn(true);
final WifiConfiguration mockWifiConfig = mock(WifiConfiguration.class);
when(mockWifiConfig.getIpConfiguration()).thenReturn(mock(IpConfiguration.class));
when(mockWifiConfig.isSendDhcpHostnameEnabled()).thenReturn(dhcpValue);
when(mAccessPoint.getConfig()).thenReturn(mockWifiConfig);
mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
WifiConfigUiBase.MODE_CONNECT);
final Spinner dhcpSetting = mView.findViewById(R.id.dhcp_settings);
assertThat(dhcpSetting.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(dhcpSetting.getSelectedItemPosition()).isEqualTo(
dhcpValue ? DHCP_SPINNER_INDEX_SEND_DHCP_HOST_NAME_ENABLE :
DHCP_SPINNER_INDEX_SEND_DHCP_HOST_NAME_DISABLE);
}
@Test
public void saveDhcpValue_changedToFalse() {
final Spinner privacySetting = mView.findViewById(R.id.dhcp_settings);
privacySetting.setSelection(DHCP_SPINNER_INDEX_SEND_DHCP_HOST_NAME_DISABLE);
WifiConfiguration config = mController.getConfig();
assertThat(config.isSendDhcpHostnameEnabled()).isEqualTo(false);
}
@Test
public void replaceTtsString_whenTargetMatched_shouldSuccess() {
final CharSequence[] display = {"PEAP", "AKA1", "AKA2'"};