[Wi-Fi] Branch WifiDialog files for WifiTracker2 development
Add these files: WifiConfigController2.java WifiConfigUiBase2.java WifiDialog2.java WifiConfigController2Test.java WifiDialog2Test.java Bug: 146407136 Test: compile Change-Id: I0689ae8ddee4f35e3bc104fd0b2e94eb8f689630
This commit is contained in:
Arc Wang
1792
src/com/android/settings/wifi/WifiConfigController2.java
Normal file
1792
src/com/android/settings/wifi/WifiConfigController2.java
Normal file
File diff suppressed because it is too large
Load Diff
107
src/com/android/settings/wifi/WifiConfigUiBase2.java
Normal file
107
src/com/android/settings/wifi/WifiConfigUiBase2.java
Normal file
@@ -0,0 +1,107 @@
|
||||
/*
|
||||
* Copyright (C) 2019 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.wifi;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.LayoutInflater;
|
||||
import android.widget.Button;
|
||||
|
||||
/**
|
||||
* Foundation interface glues between Activities and UIs like {@link WifiDialog2}.
|
||||
*/
|
||||
public interface WifiConfigUiBase2 {
|
||||
|
||||
/**
|
||||
* Viewing mode for a Wi-Fi access point. Data is displayed in non-editable mode.
|
||||
*/
|
||||
int MODE_VIEW = 0;
|
||||
/**
|
||||
* Connect mode. Data is displayed in editable mode, and a connect button will be shown.
|
||||
*/
|
||||
int MODE_CONNECT = 1;
|
||||
/**
|
||||
* Modify mode. All data is displayed in editable fields, and a "save" button is shown instead
|
||||
* of "connect". Clients are expected to only save but not connect to the access point in this
|
||||
* mode.
|
||||
*/
|
||||
int MODE_MODIFY = 2;
|
||||
|
||||
/**
|
||||
* UI like {@link WifiDialog} overrides to provide {@link Context} to controller.
|
||||
*/
|
||||
Context getContext();
|
||||
|
||||
/**
|
||||
* {@link WifiConfigController2} share the logic for controlling buttons, text fields, etc.
|
||||
*/
|
||||
WifiConfigController2 getController();
|
||||
|
||||
/**
|
||||
* UI like {@link WifiDialog} overrides to provide {@link LayoutInflater} to controller.
|
||||
*/
|
||||
LayoutInflater getLayoutInflater();
|
||||
|
||||
/**
|
||||
* One of MODE_VIEW, MODE_CONNECT and MODE_MODIFY of the UI like {@link WifiDialog}.
|
||||
*/
|
||||
int getMode();
|
||||
|
||||
/**
|
||||
* For controller to dispatch submit event to host UI and UI like {@link WifiDialog}.
|
||||
*/
|
||||
void dispatchSubmit();
|
||||
|
||||
/**
|
||||
* UI like {@link WifiDialog} overrides to set title.
|
||||
*/
|
||||
void setTitle(int id);
|
||||
|
||||
/**
|
||||
* UI like {@link WifiDialog} overrides to set title.
|
||||
*/
|
||||
void setTitle(CharSequence title);
|
||||
|
||||
/**
|
||||
* UI like {@link WifiDialog} overrides to set submit button text.
|
||||
*/
|
||||
void setSubmitButton(CharSequence text);
|
||||
|
||||
/**
|
||||
* UI like {@link WifiDialog} overrides to set forget button text.
|
||||
*/
|
||||
void setForgetButton(CharSequence text);
|
||||
|
||||
/**
|
||||
* UI like {@link WifiDialog} overrides to set cancel button text.
|
||||
*/
|
||||
void setCancelButton(CharSequence text);
|
||||
|
||||
/**
|
||||
* UI like {@link WifiDialog} overrides to get submit button.
|
||||
*/
|
||||
Button getSubmitButton();
|
||||
|
||||
/**
|
||||
* UI like {@link WifiDialog} overrides to get forget button.
|
||||
*/
|
||||
Button getForgetButton();
|
||||
|
||||
/**
|
||||
* UI like {@link WifiDialog} overrides to get cancel button.
|
||||
*/
|
||||
Button getCancelButton();
|
||||
}
|
||||
216
src/com/android/settings/wifi/WifiDialog2.java
Normal file
216
src/com/android/settings/wifi/WifiDialog2.java
Normal file
@@ -0,0 +1,216 @@
|
||||
/*
|
||||
* Copyright (C) 2019 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.wifi;
|
||||
|
||||
import android.annotation.StyleRes;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.ImageButton;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settingslib.RestrictedLockUtils;
|
||||
import com.android.settingslib.RestrictedLockUtilsInternal;
|
||||
import com.android.settingslib.wifi.AccessPoint;
|
||||
|
||||
/**
|
||||
* Dialog for users to edit a Wi-Fi network.
|
||||
*/
|
||||
public class WifiDialog2 extends AlertDialog implements WifiConfigUiBase2,
|
||||
DialogInterface.OnClickListener {
|
||||
|
||||
/**
|
||||
* Host UI component of WifiDialog2 can receive callbacks by this interface.
|
||||
*/
|
||||
public interface WifiDialog2Listener {
|
||||
/**
|
||||
* To forget the Wi-Fi network.
|
||||
*/
|
||||
default void onForget(WifiDialog2 dialog) {
|
||||
}
|
||||
|
||||
/**
|
||||
* To save the Wi-Fi network.
|
||||
*/
|
||||
default void onSubmit(WifiDialog2 dialog) {
|
||||
}
|
||||
|
||||
/**
|
||||
* To trigger Wi-Fi QR code scanner.
|
||||
*/
|
||||
default void onScan(WifiDialog2 dialog, String ssid) {
|
||||
}
|
||||
}
|
||||
|
||||
private static final int BUTTON_SUBMIT = DialogInterface.BUTTON_POSITIVE;
|
||||
private static final int BUTTON_FORGET = DialogInterface.BUTTON_NEUTRAL;
|
||||
|
||||
private final int mMode;
|
||||
private final WifiDialog2Listener mListener;
|
||||
private final AccessPoint mAccessPoint;
|
||||
|
||||
private View mView;
|
||||
private WifiConfigController2 mController;
|
||||
private boolean mHideSubmitButton;
|
||||
|
||||
/**
|
||||
* Creates a WifiDialog2 with no additional style. It displays as a dialog above the current
|
||||
* view.
|
||||
*/
|
||||
public static WifiDialog2 createModal(Context context, WifiDialog2Listener listener,
|
||||
AccessPoint accessPoint, int mode) {
|
||||
return new WifiDialog2(context, listener, accessPoint, mode, 0 /* style */,
|
||||
mode == WifiConfigUiBase2.MODE_VIEW /* hideSubmitButton */);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a WifiDialog2 with customized style. It displays as a dialog above the current
|
||||
* view.
|
||||
*/
|
||||
public static WifiDialog2 createModal(Context context, WifiDialog2Listener listener,
|
||||
AccessPoint accessPoint, int mode, @StyleRes int style) {
|
||||
return new WifiDialog2(context, listener, accessPoint, mode, style,
|
||||
mode == WifiConfigUiBase2.MODE_VIEW /* hideSubmitButton */);
|
||||
}
|
||||
|
||||
/* package */ WifiDialog2(Context context, WifiDialog2Listener listener,
|
||||
AccessPoint accessPoint, int mode, @StyleRes int style, boolean hideSubmitButton) {
|
||||
super(context, style);
|
||||
mMode = mode;
|
||||
mListener = listener;
|
||||
mAccessPoint = accessPoint;
|
||||
mHideSubmitButton = hideSubmitButton;
|
||||
}
|
||||
|
||||
@Override
|
||||
public WifiConfigController2 getController() {
|
||||
return mController;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
mView = getLayoutInflater().inflate(R.layout.wifi_dialog, /* root */ null);
|
||||
setView(mView);
|
||||
mController = new WifiConfigController2(this, mView, mAccessPoint, mMode);
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
if (mHideSubmitButton) {
|
||||
mController.hideSubmitButton();
|
||||
} else {
|
||||
/* During creation, the submit button can be unavailable to determine
|
||||
* visibility. Right after creation, update button visibility */
|
||||
mController.enableSubmitIfAppropriate();
|
||||
}
|
||||
|
||||
if (mAccessPoint == null) {
|
||||
mController.hideForgetButton();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onStart() {
|
||||
final ImageButton ssidScannerButton = findViewById(R.id.ssid_scanner_button);
|
||||
if (mHideSubmitButton) {
|
||||
ssidScannerButton.setVisibility(View.GONE);
|
||||
return;
|
||||
}
|
||||
|
||||
View.OnClickListener onClickScannerButtonListener = v -> {
|
||||
if (mListener == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
final TextView ssidEditText = findViewById(R.id.ssid);
|
||||
final String ssid = ssidEditText.getText().toString();
|
||||
mListener.onScan(/* WifiDialog2 */ this, ssid);
|
||||
};
|
||||
ssidScannerButton.setOnClickListener(onClickScannerButtonListener);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRestoreInstanceState(Bundle savedInstanceState) {
|
||||
super.onRestoreInstanceState(savedInstanceState);
|
||||
mController.updatePassword();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void dispatchSubmit() {
|
||||
if (mListener != null) {
|
||||
mListener.onSubmit(this);
|
||||
}
|
||||
dismiss();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(DialogInterface dialogInterface, int id) {
|
||||
if (mListener != null) {
|
||||
switch (id) {
|
||||
case BUTTON_SUBMIT:
|
||||
mListener.onSubmit(this);
|
||||
break;
|
||||
case BUTTON_FORGET:
|
||||
if (WifiUtils.isNetworkLockedDown(getContext(), mAccessPoint.getConfig())) {
|
||||
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
|
||||
RestrictedLockUtilsInternal.getDeviceOwner(getContext()));
|
||||
return;
|
||||
}
|
||||
mListener.onForget(this);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMode() {
|
||||
return mMode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Button getSubmitButton() {
|
||||
return getButton(BUTTON_SUBMIT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Button getForgetButton() {
|
||||
return getButton(BUTTON_FORGET);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Button getCancelButton() {
|
||||
return getButton(BUTTON_NEGATIVE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSubmitButton(CharSequence text) {
|
||||
setButton(BUTTON_SUBMIT, text, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setForgetButton(CharSequence text) {
|
||||
setButton(BUTTON_FORGET, text, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCancelButton(CharSequence text) {
|
||||
setButton(BUTTON_NEGATIVE, text, this);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,554 @@
|
||||
/*
|
||||
* Copyright (C) 2019 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.wifi;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.anyString;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
import android.net.wifi.WifiConfiguration;
|
||||
import android.net.wifi.WifiEnterpriseConfig;
|
||||
import android.net.wifi.WifiEnterpriseConfig.Eap;
|
||||
import android.net.wifi.WifiEnterpriseConfig.Phase2;
|
||||
import android.net.wifi.WifiManager;
|
||||
import android.os.ServiceSpecificException;
|
||||
import android.security.KeyStore;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.inputmethod.InputMethodManager;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.Spinner;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
|
||||
import com.android.settings.wifi.details.WifiPrivacyPreferenceController;
|
||||
import com.android.settingslib.wifi.AccessPoint;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.Shadows;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowInputMethodManager;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = ShadowConnectivityManager.class)
|
||||
public class WifiConfigController2Test {
|
||||
|
||||
@Mock
|
||||
private WifiConfigUiBase2 mConfigUiBase;
|
||||
@Mock
|
||||
private Context mContext;
|
||||
@Mock
|
||||
private AccessPoint mAccessPoint;
|
||||
@Mock
|
||||
private KeyStore mKeyStore;
|
||||
private View mView;
|
||||
private Spinner mHiddenSettingsSpinner;
|
||||
|
||||
public WifiConfigController2 mController;
|
||||
private static final String HEX_PSK = "01234567012345670123456701234567012345670123456701234567"
|
||||
+ "01abcdef";
|
||||
// An invalid ASCII PSK pass phrase. It is 64 characters long, must not be greater than 63
|
||||
private static final String LONG_PSK =
|
||||
"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl";
|
||||
// An invalid PSK pass phrase. It is 7 characters long, must be at least 8
|
||||
private static final String SHORT_PSK = "abcdefg";
|
||||
// Valid PSK pass phrase
|
||||
private static final String GOOD_PSK = "abcdefghijklmnopqrstuvwxyz";
|
||||
private static final String GOOD_SSID = "abc";
|
||||
private static final int DHCP = 0;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
when(mConfigUiBase.getContext()).thenReturn(mContext);
|
||||
when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
|
||||
mView = LayoutInflater.from(mContext).inflate(R.layout.wifi_dialog, null);
|
||||
final Spinner ipSettingsSpinner = mView.findViewById(R.id.ip_settings);
|
||||
mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
|
||||
ipSettingsSpinner.setSelection(DHCP);
|
||||
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, mAccessPoint,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void ssidExceeds32Bytes_shouldShowSsidTooLongWarning() {
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null /* accessPoint */,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
final TextView ssid = mView.findViewById(R.id.ssid);
|
||||
assertThat(ssid).isNotNull();
|
||||
ssid.setText("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎");
|
||||
mController.showWarningMessagesIfAppropriate();
|
||||
|
||||
assertThat(mView.findViewById(R.id.ssid_too_long_warning).getVisibility())
|
||||
.isEqualTo(View.VISIBLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void ssidShorterThan32Bytes_shouldNotShowSsidTooLongWarning() {
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null /* accessPoint */,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
|
||||
final TextView ssid = mView.findViewById(R.id.ssid);
|
||||
assertThat(ssid).isNotNull();
|
||||
ssid.setText("123456789012345678901234567890");
|
||||
mController.showWarningMessagesIfAppropriate();
|
||||
|
||||
assertThat(mView.findViewById(R.id.ssid_too_long_warning).getVisibility())
|
||||
.isEqualTo(View.GONE);
|
||||
|
||||
ssid.setText("123");
|
||||
mController.showWarningMessagesIfAppropriate();
|
||||
|
||||
assertThat(mView.findViewById(R.id.ssid_too_long_warning).getVisibility())
|
||||
.isEqualTo(View.GONE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isSubmittable_noSSID_shouldReturnFalse() {
|
||||
final TextView ssid = mView.findViewById(R.id.ssid);
|
||||
assertThat(ssid).isNotNull();
|
||||
ssid.setText("");
|
||||
assertThat(mController.isSubmittable()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isSubmittable_longPsk_shouldReturnFalse() {
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
assertThat(password).isNotNull();
|
||||
password.setText(LONG_PSK);
|
||||
assertThat(mController.isSubmittable()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isSubmittable_shortPsk_shouldReturnFalse() {
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
assertThat(password).isNotNull();
|
||||
password.setText(SHORT_PSK);
|
||||
assertThat(mController.isSubmittable()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isSubmittable_goodPsk_shouldReturnTrue() {
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
assertThat(password).isNotNull();
|
||||
password.setText(GOOD_PSK);
|
||||
assertThat(mController.isSubmittable()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isSubmittable_hexPsk_shouldReturnTrue() {
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
assertThat(password).isNotNull();
|
||||
password.setText(HEX_PSK);
|
||||
assertThat(mController.isSubmittable()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isSubmittable_savedConfigZeroLengthPassword_shouldReturnTrue() {
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
assertThat(password).isNotNull();
|
||||
password.setText("");
|
||||
when(mAccessPoint.isSaved()).thenReturn(true);
|
||||
assertThat(mController.isSubmittable()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isSubmittable_nullAccessPoint_noException() {
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
mController.isSubmittable();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isSubmittable_EapToPskWithValidPassword_shouldReturnTrue() {
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
final TextView ssid = mView.findViewById(R.id.ssid);
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
final Spinner securitySpinner = mView.findViewById(R.id.security);
|
||||
assertThat(password).isNotNull();
|
||||
assertThat(securitySpinner).isNotNull();
|
||||
when(mAccessPoint.isSaved()).thenReturn(true);
|
||||
|
||||
// Change it from EAP to PSK
|
||||
mController.onItemSelected(securitySpinner, null, AccessPoint.SECURITY_EAP, 0);
|
||||
mController.onItemSelected(securitySpinner, null, AccessPoint.SECURITY_PSK, 0);
|
||||
password.setText(GOOD_PSK);
|
||||
ssid.setText(GOOD_SSID);
|
||||
|
||||
assertThat(mController.isSubmittable()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isSubmittable_EapWithAkaMethod_shouldReturnTrue() {
|
||||
when(mAccessPoint.isSaved()).thenReturn(true);
|
||||
mController.mAccessPointSecurity = AccessPoint.SECURITY_EAP;
|
||||
mView.findViewById(R.id.l_ca_cert).setVisibility(View.GONE);
|
||||
|
||||
assertThat(mController.isSubmittable()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSignalString_notReachable_shouldHaveNoSignalString() {
|
||||
when(mAccessPoint.isReachable()).thenReturn(false);
|
||||
|
||||
assertThat(mController.getSignalString()).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void loadCertificates_keyStoreListFail_shouldNotCrash() {
|
||||
// Set up
|
||||
when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
|
||||
when(mKeyStore.list(anyString()))
|
||||
.thenThrow(new ServiceSpecificException(-1, "permission error"));
|
||||
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, mAccessPoint,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
|
||||
// Verify that the EAP method menu is visible.
|
||||
assertThat(mView.findViewById(R.id.eap).getVisibility()).isEqualTo(View.VISIBLE);
|
||||
// No Crash
|
||||
}
|
||||
|
||||
@Test
|
||||
public void ssidGetFocus_addNewNetwork_shouldReturnTrue() {
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null /* accessPoint */,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
final TextView ssid = mView.findViewById(R.id.ssid);
|
||||
// Verify ssid text get focus when add new network (accesspoint is null)
|
||||
assertThat(ssid.isFocused()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void passwordGetFocus_connectSecureWifi_shouldReturnTrue() {
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
// Verify password get focus when connect to secure wifi without eap type
|
||||
assertThat(password.isFocused()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hiddenWarning_warningVisibilityProperlyUpdated() {
|
||||
View warningView = mView.findViewById(R.id.hidden_settings_warning);
|
||||
mController.onItemSelected(mHiddenSettingsSpinner, null, mController.HIDDEN_NETWORK, 0);
|
||||
assertThat(warningView.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
|
||||
mController.onItemSelected(mHiddenSettingsSpinner, null, mController.NOT_HIDDEN_NETWORK, 0);
|
||||
assertThat(warningView.getVisibility()).isEqualTo(View.GONE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hiddenField_visibilityUpdatesCorrectly() {
|
||||
View hiddenField = mView.findViewById(R.id.hidden_settings_field);
|
||||
assertThat(hiddenField.getVisibility()).isEqualTo(View.GONE);
|
||||
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null /* accessPoint */,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
assertThat(hiddenField.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void securitySpinner_saeSuitebAndOweNotVisible() {
|
||||
securitySpinnerTestHelper(false, false, false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void securitySpinner_saeSuitebAndOweVisible() {
|
||||
securitySpinnerTestHelper(true, true, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void securitySpinner_saeVisible_suitebAndOweNotVisible() {
|
||||
securitySpinnerTestHelper(true, false, false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void securitySpinner_oweVisible_suitebAndSaeNotVisible() {
|
||||
securitySpinnerTestHelper(false, false, true);
|
||||
}
|
||||
|
||||
private void securitySpinnerTestHelper(boolean saeVisible, boolean suitebVisible,
|
||||
boolean oweVisible) {
|
||||
WifiManager wifiManager = mock(WifiManager.class);
|
||||
when(wifiManager.isWpa3SaeSupported()).thenReturn(saeVisible);
|
||||
when(wifiManager.isWpa3SuiteBSupported()).thenReturn(suitebVisible);
|
||||
when(wifiManager.isEnhancedOpenSupported()).thenReturn(oweVisible);
|
||||
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null /* accessPoint */,
|
||||
WifiConfigUiBase2.MODE_MODIFY, wifiManager);
|
||||
|
||||
final Spinner securitySpinner = mView.findViewById(R.id.security);
|
||||
final ArrayAdapter<String> adapter = (ArrayAdapter) securitySpinner.getAdapter();
|
||||
boolean saeFound = false;
|
||||
boolean suitebFound = false;
|
||||
boolean oweFound = false;
|
||||
for (int i = 0; i < adapter.getCount(); i++) {
|
||||
String val = adapter.getItem(i);
|
||||
|
||||
if (val.compareTo(mContext.getString(R.string.wifi_security_sae)) == 0) {
|
||||
saeFound = true;
|
||||
}
|
||||
|
||||
if (val.compareTo(mContext.getString(R.string.wifi_security_eap_suiteb)) == 0) {
|
||||
suitebFound = true;
|
||||
}
|
||||
|
||||
if (val.compareTo(mContext.getString(R.string.wifi_security_owe)) == 0) {
|
||||
oweFound = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (saeVisible) {
|
||||
assertThat(saeFound).isTrue();
|
||||
} else {
|
||||
assertThat(saeFound).isFalse();
|
||||
}
|
||||
if (suitebVisible) {
|
||||
assertThat(suitebFound).isTrue();
|
||||
} else {
|
||||
assertThat(suitebFound).isFalse();
|
||||
}
|
||||
if (oweVisible) {
|
||||
assertThat(oweFound).isTrue();
|
||||
} else {
|
||||
assertThat(oweFound).isFalse();
|
||||
}
|
||||
}
|
||||
|
||||
public class TestWifiConfigController2 extends WifiConfigController2 {
|
||||
|
||||
private TestWifiConfigController2(
|
||||
WifiConfigUiBase2 parent, View view, AccessPoint accessPoint, int mode) {
|
||||
super(parent, view, accessPoint, mode);
|
||||
}
|
||||
|
||||
private TestWifiConfigController2(
|
||||
WifiConfigUiBase2 parent, View view, AccessPoint accessPoint, int mode,
|
||||
WifiManager wifiManager) {
|
||||
super(parent, view, accessPoint, mode, wifiManager);
|
||||
}
|
||||
|
||||
@Override
|
||||
boolean isSplitSystemUser() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
KeyStore getKeyStore() {
|
||||
return mKeyStore;
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void loadMacRandomizedValue_shouldPersistentAsDefault() {
|
||||
final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
|
||||
final int prefPersist =
|
||||
WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
|
||||
WifiConfiguration.RANDOMIZATION_PERSISTENT);
|
||||
|
||||
assertThat(privacySetting.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(prefPersist);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void loadSavedMacRandomizedPersistentValue_shouldCorrectMacValue() {
|
||||
checkSavedMacRandomizedValue(WifiConfiguration.RANDOMIZATION_PERSISTENT);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void loadSavedMacRandomizedNoneValue_shouldCorrectMacValue() {
|
||||
checkSavedMacRandomizedValue(WifiConfiguration.RANDOMIZATION_NONE);
|
||||
}
|
||||
|
||||
private void checkSavedMacRandomizedValue(int macRandomizedValue) {
|
||||
when(mAccessPoint.isSaved()).thenReturn(true);
|
||||
final WifiConfiguration mockWifiConfig = mock(WifiConfiguration.class);
|
||||
when(mAccessPoint.getConfig()).thenReturn(mockWifiConfig);
|
||||
mockWifiConfig.macRandomizationSetting = macRandomizedValue;
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, mAccessPoint,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
|
||||
final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
|
||||
final int expectedPrefValue =
|
||||
WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
|
||||
macRandomizedValue);
|
||||
|
||||
assertThat(privacySetting.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(expectedPrefValue);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void saveMacRandomizedValue_noChanged_shouldPersistentAsDefault() {
|
||||
WifiConfiguration config = mController.getConfig();
|
||||
assertThat(config.macRandomizationSetting).isEqualTo(
|
||||
WifiConfiguration.RANDOMIZATION_PERSISTENT);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void saveMacRandomizedValue_ChangedToNone_shouldGetNone() {
|
||||
final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
|
||||
final int prefMacNone =
|
||||
WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
|
||||
WifiConfiguration.RANDOMIZATION_NONE);
|
||||
privacySetting.setSelection(prefMacNone);
|
||||
|
||||
WifiConfiguration config = mController.getConfig();
|
||||
assertThat(config.macRandomizationSetting).isEqualTo(WifiConfiguration.RANDOMIZATION_NONE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void replaceTtsString_whenTargetMatched_shouldSuccess() {
|
||||
final CharSequence[] display = {"PEAP", "AKA1", "AKA2'"};
|
||||
final CharSequence[] target = {"AKA1", "AKA2'"};
|
||||
final CharSequence[] ttsString = {"AKA1_TTS", "AKA2_TTS"};
|
||||
|
||||
final CharSequence[] resultTts = mController.findAndReplaceTargetStrings(display, target,
|
||||
ttsString);
|
||||
|
||||
assertThat(resultTts[0]).isEqualTo("PEAP");
|
||||
assertThat(resultTts[1]).isEqualTo("AKA1_TTS");
|
||||
assertThat(resultTts[2]).isEqualTo("AKA2_TTS");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void replaceTtsString_whenNoTargetStringMatched_originalStringShouldNotChanged() {
|
||||
final CharSequence[] display = {"PEAP", "AKA1", "AKA2"};
|
||||
final CharSequence[] target = {"WEP1", "WEP2'"};
|
||||
final CharSequence[] ttsString = {"WEP1_TTS", "WEP2_TTS"};
|
||||
|
||||
final CharSequence[] resultTts = mController.findAndReplaceTargetStrings(display, target,
|
||||
ttsString);
|
||||
|
||||
assertThat(resultTts[0]).isEqualTo("PEAP");
|
||||
assertThat(resultTts[1]).isEqualTo("AKA1");
|
||||
assertThat(resultTts[2]).isEqualTo("AKA2");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void checktEapMethodTargetAndTtsArraylength_shouldHaveSameCount() {
|
||||
final Resources resources = mContext.getResources();
|
||||
final String[] targetStringArray = resources.getStringArray(
|
||||
R.array.wifi_eap_method_target_strings);
|
||||
final String[] ttsStringArray = resources.getStringArray(
|
||||
R.array.wifi_eap_method_tts_strings);
|
||||
|
||||
assertThat(targetStringArray.length).isEqualTo(ttsStringArray.length);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void selectSecurity_wpa3Eap192bit_eapMethodTls() {
|
||||
final WifiManager wifiManager = mock(WifiManager.class);
|
||||
when(wifiManager.isWpa3SuiteBSupported()).thenReturn(true);
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null /* accessPoint */,
|
||||
WifiConfigUiBase2.MODE_MODIFY, wifiManager);
|
||||
final Spinner securitySpinner = mView.findViewById(R.id.security);
|
||||
final Spinner eapMethodSpinner = mView.findViewById(R.id.method);
|
||||
int wpa3Eap192bitPosition = -1;
|
||||
final int securityCount = mController.mSecurityInPosition.length;
|
||||
for (int i = 0; i < securityCount; i++) {
|
||||
if (mController.mSecurityInPosition[i] != null
|
||||
&& mController.mSecurityInPosition[i] == AccessPoint.SECURITY_EAP_SUITE_B) {
|
||||
wpa3Eap192bitPosition = i;
|
||||
}
|
||||
}
|
||||
|
||||
mController.onItemSelected(securitySpinner, /* view */ null, wpa3Eap192bitPosition,
|
||||
/* id */ 0);
|
||||
|
||||
final int selectedItemPosition = eapMethodSpinner.getSelectedItemPosition();
|
||||
assertThat(eapMethodSpinner.getSelectedItem().toString()).isEqualTo("TLS");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void checkImeStatus_whenAdvancedToggled_shouldBeHide() {
|
||||
final InputMethodManager inputMethodManager = mContext
|
||||
.getSystemService(InputMethodManager.class);
|
||||
final ShadowInputMethodManager shadowImm = Shadows.shadowOf(inputMethodManager);
|
||||
final CheckBox advButton = mView.findViewById(R.id.wifi_advanced_togglebox);
|
||||
|
||||
inputMethodManager.showSoftInput(null /* view */, 0 /* flags */);
|
||||
advButton.performClick();
|
||||
|
||||
assertThat(shadowImm.isSoftInputVisible()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void selectEapMethod_savedAccessPoint_shouldGetCorrectPosition() {
|
||||
when(mAccessPoint.isSaved()).thenReturn(true);
|
||||
when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
|
||||
final WifiConfiguration mockWifiConfig = mock(WifiConfiguration.class);
|
||||
final WifiEnterpriseConfig mockWifiEnterpriseConfig = mock(WifiEnterpriseConfig.class);
|
||||
when(mockWifiEnterpriseConfig.getEapMethod()).thenReturn(Eap.PEAP);
|
||||
mockWifiConfig.enterpriseConfig = mockWifiEnterpriseConfig;
|
||||
when(mAccessPoint.getConfig()).thenReturn(mockWifiConfig);
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, mAccessPoint,
|
||||
WifiConfigUiBase2.MODE_MODIFY);
|
||||
final Spinner eapMethodSpinner = mView.findViewById(R.id.method);
|
||||
final Spinner phase2Spinner = mView.findViewById(R.id.phase2);
|
||||
WifiConfiguration wifiConfiguration;
|
||||
|
||||
// Test EAP method PEAP
|
||||
eapMethodSpinner.setSelection(Eap.PEAP);
|
||||
phase2Spinner.setSelection(WifiConfigController2.WIFI_PEAP_PHASE2_MSCHAPV2);
|
||||
wifiConfiguration = mController.getConfig();
|
||||
|
||||
assertThat(wifiConfiguration.enterpriseConfig.getEapMethod()).isEqualTo(Eap.PEAP);
|
||||
assertThat(wifiConfiguration.enterpriseConfig.getPhase2Method()).isEqualTo(
|
||||
Phase2.MSCHAPV2);
|
||||
|
||||
// Test EAP method TTLS
|
||||
eapMethodSpinner.setSelection(Eap.TTLS);
|
||||
phase2Spinner.setSelection(WifiConfigController2.WIFI_TTLS_PHASE2_MSCHAPV2);
|
||||
wifiConfiguration = mController.getConfig();
|
||||
|
||||
assertThat(wifiConfiguration.enterpriseConfig.getEapMethod()).isEqualTo(Eap.TTLS);
|
||||
assertThat(wifiConfiguration.enterpriseConfig.getPhase2Method()).isEqualTo(
|
||||
Phase2.MSCHAPV2);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getHiddenSettingsPosition_whenAdvancedToggled_shouldBeFirst() {
|
||||
final LinearLayout advancedFieldsLayout = mView.findViewById(R.id.wifi_advanced_fields);
|
||||
final LinearLayout hiddenSettingLayout = mView.findViewById(R.id.hidden_settings_field);
|
||||
|
||||
final LinearLayout firstChild = (LinearLayout) advancedFieldsLayout.getChildAt(0);
|
||||
|
||||
assertThat(firstChild).isEqualTo(hiddenSettingLayout);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAdvancedOptionContentDescription_whenViewInitialed_shouldBeCorrect() {
|
||||
final CheckBox advButton = mView.findViewById(R.id.wifi_advanced_togglebox);
|
||||
|
||||
assertThat(advButton.getContentDescription()).isEqualTo(
|
||||
mContext.getString(R.string.wifi_advanced_toggle_description));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
/*
|
||||
* Copyright (C) 2019 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.wifi;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
|
||||
import com.android.settings.wifi.WifiDialog2.WifiDialog2Listener;
|
||||
import com.android.settingslib.wifi.AccessPoint;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = ShadowEntityHeaderController.class)
|
||||
public class WifiDialog2Test {
|
||||
@Mock private AccessPoint mMockAccessPoint;
|
||||
|
||||
private Context mContext = RuntimeEnvironment.application;
|
||||
|
||||
private WifiDialog2Listener mListener = new WifiDialog2Listener() {};
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createModal_usesDefaultTheme() {
|
||||
WifiDialog2 modal = WifiDialog2
|
||||
.createModal(mContext, mListener, mMockAccessPoint, WifiConfigUiBase2.MODE_CONNECT);
|
||||
|
||||
WifiDialog2 wifiDialog2 = new WifiDialog2(mContext, mListener, mMockAccessPoint,
|
||||
WifiConfigUiBase2.MODE_CONNECT, 0 /* style */, false /* hideSubmitButton */);
|
||||
assertThat(modal.getContext().getThemeResId())
|
||||
.isEqualTo(wifiDialog2.getContext().getThemeResId());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createModal_whenSetTheme_shouldBeCustomizedTheme() {
|
||||
WifiDialog2 modal = WifiDialog2.createModal(mContext, mListener, mMockAccessPoint,
|
||||
WifiConfigUiBase2.MODE_CONNECT, R.style.SuwAlertDialogThemeCompat_Light);
|
||||
|
||||
WifiDialog2 wifiDialog2 = new WifiDialog2(mContext, mListener, mMockAccessPoint,
|
||||
WifiConfigUiBase2.MODE_CONNECT, R.style.SuwAlertDialogThemeCompat_Light,
|
||||
false /* hideSubmitButton */);
|
||||
assertThat(modal.getContext().getThemeResId())
|
||||
.isEqualTo(wifiDialog2.getContext().getThemeResId());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user