Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev
This commit is contained in:
Treehugger Robot
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
be76ebdc5b
@@ -18,7 +18,9 @@ package com.android.settings.wifi.repository;
|
||||
|
||||
import static android.net.wifi.SoftApConfiguration.BAND_2GHZ;
|
||||
import static android.net.wifi.SoftApConfiguration.SECURITY_TYPE_OPEN;
|
||||
import static android.net.wifi.SoftApConfiguration.SECURITY_TYPE_WPA2_PSK;
|
||||
import static android.net.wifi.SoftApConfiguration.SECURITY_TYPE_WPA3_SAE;
|
||||
import static android.net.wifi.SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION;
|
||||
import static android.net.wifi.WifiAvailableChannel.OP_MODE_SAP;
|
||||
|
||||
import static com.android.settings.wifi.repository.WifiHotspotRepository.BAND_2GHZ_5GHZ;
|
||||
@@ -32,6 +34,7 @@ import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.Mockito.atLeast;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
@@ -81,6 +84,8 @@ public class WifiHotspotRepositoryTest {
|
||||
@Mock
|
||||
WifiManager mWifiManager;
|
||||
@Mock
|
||||
MutableLiveData<Integer> mSecurityType;
|
||||
@Mock
|
||||
MutableLiveData<Integer> mSpeedType;
|
||||
|
||||
WifiHotspotRepository mWifiHotspotRepository;
|
||||
@@ -93,6 +98,7 @@ public class WifiHotspotRepositoryTest {
|
||||
doReturn(SPEED_6GHZ).when(mSpeedType).getValue();
|
||||
|
||||
mWifiHotspotRepository = new WifiHotspotRepository(mContext, mWifiManager);
|
||||
mWifiHotspotRepository.mSecurityType = mSecurityType;
|
||||
mWifiHotspotRepository.mSpeedType = mSpeedType;
|
||||
mWifiHotspotRepository.mCurrentCountryCode = WIFI_CURRENT_COUNTRY_CODE;
|
||||
mWifiHotspotRepository.mIsDualBand = true;
|
||||
@@ -156,6 +162,7 @@ public class WifiHotspotRepositoryTest {
|
||||
@Test
|
||||
public void refresh_liveDataNotUsed_doNothing() {
|
||||
// If LiveData is not used then it's null.
|
||||
mWifiHotspotRepository.mSecurityType = null;
|
||||
mWifiHotspotRepository.mSpeedType = null;
|
||||
|
||||
mWifiHotspotRepository.refresh();
|
||||
@@ -169,7 +176,7 @@ public class WifiHotspotRepositoryTest {
|
||||
|
||||
mWifiHotspotRepository.refresh();
|
||||
|
||||
verify(mWifiManager).getSoftApConfiguration();
|
||||
verify(mWifiManager, atLeast(1)).getSoftApConfiguration();
|
||||
verify(mSpeedType).setValue(anyInt());
|
||||
}
|
||||
|
||||
@@ -191,6 +198,105 @@ public class WifiHotspotRepositoryTest {
|
||||
verify(mWifiManager).unregisterActiveCountryCodeChangedCallback(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
@UiThreadTest
|
||||
public void getSecurityType_shouldNotReturnNull() {
|
||||
// If LiveData is not used then it's null.
|
||||
mWifiHotspotRepository.mSecurityType = null;
|
||||
mockConfigSecurityType(SECURITY_TYPE_OPEN);
|
||||
|
||||
assertThat(mWifiHotspotRepository.getSecurityType()).isNotNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateSecurityType_securityTypeOpen_setValueCorrectly() {
|
||||
mockConfigSecurityType(SECURITY_TYPE_OPEN);
|
||||
|
||||
mWifiHotspotRepository.updateSecurityType();
|
||||
|
||||
verify(mSecurityType).setValue(SECURITY_TYPE_OPEN);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateSecurityType_securityTypeWpa2_setValueCorrectly() {
|
||||
mockConfigSecurityType(SECURITY_TYPE_WPA2_PSK);
|
||||
|
||||
mWifiHotspotRepository.updateSecurityType();
|
||||
|
||||
verify(mSecurityType).setValue(SECURITY_TYPE_WPA2_PSK);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateSecurityType_securityTypeWpa2Wpa3_setValueCorrectly() {
|
||||
mockConfigSecurityType(SECURITY_TYPE_WPA3_SAE_TRANSITION);
|
||||
|
||||
mWifiHotspotRepository.updateSecurityType();
|
||||
|
||||
verify(mSecurityType).setValue(SECURITY_TYPE_WPA3_SAE_TRANSITION);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateSecurityType_securityTypeWpa3_setValueCorrectly() {
|
||||
mockConfigSecurityType(SECURITY_TYPE_WPA3_SAE);
|
||||
|
||||
mWifiHotspotRepository.updateSecurityType();
|
||||
|
||||
verify(mSecurityType).setValue(SECURITY_TYPE_WPA3_SAE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setSecurityType_sameValue_doNotSetConfig() {
|
||||
mockConfigSecurityType(SECURITY_TYPE_WPA3_SAE);
|
||||
|
||||
mWifiHotspotRepository.setSecurityType(SECURITY_TYPE_WPA3_SAE);
|
||||
|
||||
verify(mWifiManager, never()).setSoftApConfiguration(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setSecurityType_wpa3ToWpa2Wpa3_setConfigCorrectly() {
|
||||
mockConfigSecurityType(SECURITY_TYPE_WPA3_SAE);
|
||||
|
||||
mWifiHotspotRepository.setSecurityType(SECURITY_TYPE_WPA3_SAE_TRANSITION);
|
||||
|
||||
verify(mWifiManager).setSoftApConfiguration(mSoftApConfigCaptor.capture());
|
||||
assertThat(mSoftApConfigCaptor.getValue().getSecurityType())
|
||||
.isEqualTo(SECURITY_TYPE_WPA3_SAE_TRANSITION);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setSecurityType_Wpa2Wpa3ToWpa2_setConfigCorrectly() {
|
||||
mockConfigSecurityType(SECURITY_TYPE_WPA3_SAE_TRANSITION);
|
||||
|
||||
mWifiHotspotRepository.setSecurityType(SECURITY_TYPE_WPA2_PSK);
|
||||
|
||||
verify(mWifiManager).setSoftApConfiguration(mSoftApConfigCaptor.capture());
|
||||
assertThat(mSoftApConfigCaptor.getValue().getSecurityType())
|
||||
.isEqualTo(SECURITY_TYPE_WPA2_PSK);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setSecurityType_Wpa2ToOpen_setConfigCorrectly() {
|
||||
mockConfigSecurityType(SECURITY_TYPE_WPA2_PSK);
|
||||
|
||||
mWifiHotspotRepository.setSecurityType(SECURITY_TYPE_OPEN);
|
||||
|
||||
verify(mWifiManager).setSoftApConfiguration(mSoftApConfigCaptor.capture());
|
||||
assertThat(mSoftApConfigCaptor.getValue().getSecurityType())
|
||||
.isEqualTo(SECURITY_TYPE_OPEN);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setSecurityType_OpenToWpa3_setConfigCorrectly() {
|
||||
mockConfigSecurityType(SECURITY_TYPE_OPEN);
|
||||
|
||||
mWifiHotspotRepository.setSecurityType(SECURITY_TYPE_WPA3_SAE);
|
||||
|
||||
verify(mWifiManager).setSoftApConfiguration(mSoftApConfigCaptor.capture());
|
||||
assertThat(mSoftApConfigCaptor.getValue().getSecurityType())
|
||||
.isEqualTo(SECURITY_TYPE_WPA3_SAE);
|
||||
}
|
||||
|
||||
@Test
|
||||
@UiThreadTest
|
||||
public void getSpeedType_shouldNotReturnNull() {
|
||||
@@ -312,8 +418,8 @@ public class WifiHotspotRepositoryTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setSpeedType_from2g5ghz_setConfigBandTo6ghzPreferred() {
|
||||
mockGetSoftApConfiguration(SPEED_2GHZ_5GHZ);
|
||||
public void setSpeedType_2g5ghzTo6ghz_setConfigBandTo6ghzPreferred() {
|
||||
mockConfigSpeedType(SPEED_2GHZ_5GHZ);
|
||||
|
||||
mWifiHotspotRepository.setSpeedType(SPEED_6GHZ);
|
||||
|
||||
@@ -322,8 +428,19 @@ public class WifiHotspotRepositoryTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setSpeedType_from6ghz_setConfigBandsTo2g5ghz() {
|
||||
mockGetSoftApConfiguration(SPEED_6GHZ);
|
||||
public void setSpeedType_2g5ghzTo6ghz_setConfigSecurityToWpa3() {
|
||||
mockConfig(SPEED_2GHZ_5GHZ, SECURITY_TYPE_WPA3_SAE_TRANSITION);
|
||||
|
||||
mWifiHotspotRepository.setSpeedType(SPEED_6GHZ);
|
||||
|
||||
verify(mWifiManager).setSoftApConfiguration(mSoftApConfigCaptor.capture());
|
||||
assertThat(mSoftApConfigCaptor.getValue().getSecurityType())
|
||||
.isEqualTo(SECURITY_TYPE_WPA3_SAE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setSpeedType_6ghzTo2g5ghz_setConfigBandsTo2g5ghz() {
|
||||
mockConfigSpeedType(SPEED_6GHZ);
|
||||
mWifiHotspotRepository.mIsDualBand = true;
|
||||
|
||||
mWifiHotspotRepository.setSpeedType(SPEED_2GHZ_5GHZ);
|
||||
@@ -335,8 +452,8 @@ public class WifiHotspotRepositoryTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setSpeedType_from2ghz_setConfigBandTo5ghzPreferred() {
|
||||
mockGetSoftApConfiguration(SPEED_2GHZ);
|
||||
public void setSpeedType_2ghzTo5ghz_setConfigBandTo5ghzPreferred() {
|
||||
mockConfigSpeedType(SPEED_2GHZ);
|
||||
|
||||
mWifiHotspotRepository.setSpeedType(SPEED_5GHZ);
|
||||
|
||||
@@ -345,8 +462,8 @@ public class WifiHotspotRepositoryTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setSpeedType_from5ghz_setConfigBandTo6ghzPreferred() {
|
||||
mockGetSoftApConfiguration(SPEED_5GHZ);
|
||||
public void setSpeedType_5ghzTo6ghz_setConfigBandTo6ghzPreferred() {
|
||||
mockConfigSpeedType(SPEED_5GHZ);
|
||||
|
||||
mWifiHotspotRepository.setSpeedType(SPEED_6GHZ);
|
||||
|
||||
@@ -355,8 +472,8 @@ public class WifiHotspotRepositoryTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setSpeedType_from5gTo6ghz_setConfigBandTo2ghz() {
|
||||
mockGetSoftApConfiguration(SPEED_6GHZ);
|
||||
public void setSpeedType_6ghzTo2ghz_setConfigBandTo2ghz() {
|
||||
mockConfigSpeedType(SPEED_6GHZ);
|
||||
|
||||
mWifiHotspotRepository.setSpeedType(SPEED_2GHZ);
|
||||
|
||||
@@ -475,10 +592,24 @@ public class WifiHotspotRepositoryTest {
|
||||
assertThat(mWifiHotspotRepository.get6gAvailable()).isNotNull();
|
||||
}
|
||||
|
||||
private void mockGetSoftApConfiguration(int speedType) {
|
||||
private void mockConfigSecurityType(int securityType) {
|
||||
mockConfig(securityType, SPEED_2GHZ);
|
||||
}
|
||||
|
||||
private void mockConfigSpeedType(int speedType) {
|
||||
mockConfig(SECURITY_TYPE_WPA3_SAE, speedType);
|
||||
}
|
||||
|
||||
private void mockConfig(int securityType, int speedType) {
|
||||
SoftApConfiguration.Builder configBuilder = new SoftApConfiguration.Builder();
|
||||
// Security Type
|
||||
doReturn(securityType).when(mSecurityType).getValue();
|
||||
String passphrase = (securityType == SECURITY_TYPE_OPEN) ? null : WIFI_PASSWORD;
|
||||
configBuilder.setPassphrase(passphrase, securityType).build();
|
||||
|
||||
// Speed Type
|
||||
doReturn(speedType).when(mSpeedType).getValue();
|
||||
mWifiHotspotRepository.mIsDualBand = true;
|
||||
SoftApConfiguration.Builder configBuilder = new SoftApConfiguration.Builder();
|
||||
if (speedType == SPEED_2GHZ) {
|
||||
mWifiHotspotRepository.mIsDualBand = false;
|
||||
configBuilder.setBand(BAND_2GHZ);
|
||||
|
||||
@@ -0,0 +1,173 @@
|
||||
/*
|
||||
* Copyright (C) 2023 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.tether;
|
||||
|
||||
import static android.net.wifi.SoftApConfiguration.SECURITY_TYPE_OPEN;
|
||||
import static android.net.wifi.SoftApConfiguration.SECURITY_TYPE_WPA2_PSK;
|
||||
import static android.net.wifi.SoftApConfiguration.SECURITY_TYPE_WPA3_SAE;
|
||||
import static android.net.wifi.SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION;
|
||||
|
||||
import static com.android.settings.wifi.tether.WifiHotspotSecurityViewModel.KEY_SECURITY_NONE;
|
||||
import static com.android.settings.wifi.tether.WifiHotspotSecurityViewModel.KEY_SECURITY_WPA2;
|
||||
import static com.android.settings.wifi.tether.WifiHotspotSecurityViewModel.KEY_SECURITY_WPA2_WPA3;
|
||||
import static com.android.settings.wifi.tether.WifiHotspotSecurityViewModel.KEY_SECURITY_WPA3;
|
||||
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import androidx.test.platform.app.InstrumentationRegistry;
|
||||
|
||||
import com.android.settingslib.widget.SelectorWithWidgetPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class WifiHotspotSecuritySettingsTest {
|
||||
@Rule
|
||||
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
@Mock
|
||||
WifiHotspotSecurityViewModel mViewModel;
|
||||
@Mock
|
||||
SelectorWithWidgetPreference mRadioButtonWpa3;
|
||||
@Mock
|
||||
SelectorWithWidgetPreference mRadioButtonWpa2Wpa3;
|
||||
@Mock
|
||||
SelectorWithWidgetPreference mRadioButtonWpa2;
|
||||
@Mock
|
||||
SelectorWithWidgetPreference mRadioButtonNone;
|
||||
|
||||
Map<Integer, WifiHotspotSecurityViewModel.ViewItem> mViewItemMap = new HashMap<>();
|
||||
WifiHotspotSecurityViewModel.ViewItem mViewItemWpa3 =
|
||||
new WifiHotspotSecurityViewModel.ViewItem(KEY_SECURITY_WPA3);
|
||||
WifiHotspotSecurityViewModel.ViewItem mViewItemWpa2Wpa3 =
|
||||
new WifiHotspotSecurityViewModel.ViewItem(KEY_SECURITY_WPA2_WPA3);
|
||||
WifiHotspotSecurityViewModel.ViewItem mViewItemWpa2 =
|
||||
new WifiHotspotSecurityViewModel.ViewItem(KEY_SECURITY_WPA2);
|
||||
WifiHotspotSecurityViewModel.ViewItem mViewItemNone =
|
||||
new WifiHotspotSecurityViewModel.ViewItem(KEY_SECURITY_NONE);
|
||||
|
||||
WifiHotspotSecuritySettings mSettings;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mViewItemMap.put(SECURITY_TYPE_WPA3_SAE, mViewItemWpa3);
|
||||
mViewItemMap.put(SECURITY_TYPE_WPA3_SAE_TRANSITION, mViewItemWpa2Wpa3);
|
||||
mViewItemMap.put(SECURITY_TYPE_WPA2_PSK, mViewItemWpa2);
|
||||
mViewItemMap.put(SECURITY_TYPE_OPEN, mViewItemNone);
|
||||
|
||||
when(mRadioButtonWpa3.getKey()).thenReturn(KEY_SECURITY_WPA3);
|
||||
when(mRadioButtonWpa2Wpa3.getKey()).thenReturn(KEY_SECURITY_WPA2_WPA3);
|
||||
when(mRadioButtonWpa2.getKey()).thenReturn(KEY_SECURITY_WPA2);
|
||||
when(mRadioButtonNone.getKey()).thenReturn(KEY_SECURITY_NONE);
|
||||
|
||||
InstrumentationRegistry.getInstrumentation().runOnMainSync(
|
||||
() -> mSettings = spy(new WifiHotspotSecuritySettings()));
|
||||
mSettings.mWifiHotspotSecurityViewModel = mViewModel;
|
||||
when(mSettings.findPreference(KEY_SECURITY_WPA3)).thenReturn(mRadioButtonWpa3);
|
||||
when(mSettings.findPreference(KEY_SECURITY_WPA2_WPA3)).thenReturn(mRadioButtonWpa2Wpa3);
|
||||
when(mSettings.findPreference(KEY_SECURITY_WPA2)).thenReturn(mRadioButtonWpa2);
|
||||
when(mSettings.findPreference(KEY_SECURITY_NONE)).thenReturn(mRadioButtonNone);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onViewItemListDataChanged_checkedWpa3_setViewItemCorrectly() {
|
||||
mViewItemWpa3.mIsChecked = true;
|
||||
|
||||
mSettings.onViewItemListDataChanged(mViewItemMap.values().stream().toList());
|
||||
|
||||
verify(mRadioButtonWpa3).setChecked(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onViewItemListDataChanged_checkedWpa2Wpa3_setViewItemCorrectly() {
|
||||
mViewItemWpa2Wpa3.mIsChecked = true;
|
||||
|
||||
mSettings.onViewItemListDataChanged(mViewItemMap.values().stream().toList());
|
||||
|
||||
verify(mRadioButtonWpa2Wpa3).setChecked(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onViewItemListDataChanged_checkedWpa2_setViewItemCorrectly() {
|
||||
mViewItemWpa2.mIsChecked = true;
|
||||
|
||||
mSettings.onViewItemListDataChanged(mViewItemMap.values().stream().toList());
|
||||
|
||||
verify(mRadioButtonWpa2).setChecked(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onViewItemListDataChanged_checkedNone_setViewItemCorrectly() {
|
||||
mViewItemNone.mIsChecked = true;
|
||||
|
||||
mSettings.onViewItemListDataChanged(mViewItemMap.values().stream().toList());
|
||||
|
||||
verify(mRadioButtonNone).setChecked(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onViewItemListDataChanged_enabledWpa3Only_setViewItemCorrectly() {
|
||||
when(mRadioButtonWpa2Wpa3.isEnabled()).thenReturn(true);
|
||||
when(mRadioButtonWpa2.isEnabled()).thenReturn(true);
|
||||
when(mRadioButtonNone.isEnabled()).thenReturn(true);
|
||||
mViewItemWpa2Wpa3.mIsEnabled = false;
|
||||
mViewItemWpa2.mIsEnabled = false;
|
||||
mViewItemNone.mIsEnabled = false;
|
||||
|
||||
mSettings.onViewItemListDataChanged(mViewItemMap.values().stream().toList());
|
||||
|
||||
verify(mRadioButtonWpa2Wpa3).setEnabled(false);
|
||||
verify(mRadioButtonWpa2).setEnabled(false);
|
||||
verify(mRadioButtonNone).setEnabled(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onRadioButtonClicked_clickedWpa3_setSecurityTypeCorrectly() {
|
||||
mSettings.onRadioButtonClicked(mRadioButtonWpa3);
|
||||
|
||||
verify(mViewModel).handleRadioButtonClicked(KEY_SECURITY_WPA3);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onRadioButtonClicked_clickedWpa2Wpa3_setSecurityTypeCorrectly() {
|
||||
mSettings.onRadioButtonClicked(mRadioButtonWpa2Wpa3);
|
||||
|
||||
verify(mViewModel).handleRadioButtonClicked(KEY_SECURITY_WPA2_WPA3);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onRadioButtonClicked_clickedWpa2_setSecurityTypeCorrectly() {
|
||||
mSettings.onRadioButtonClicked(mRadioButtonWpa2);
|
||||
|
||||
verify(mViewModel).handleRadioButtonClicked(KEY_SECURITY_WPA2);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onRadioButtonClicked_clickedNone_setSecurityTypeCorrectly() {
|
||||
mSettings.onRadioButtonClicked(mRadioButtonNone);
|
||||
|
||||
verify(mViewModel).handleRadioButtonClicked(KEY_SECURITY_NONE);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,211 @@
|
||||
/*
|
||||
* Copyright (C) 2023 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.tether;
|
||||
|
||||
import static android.net.wifi.SoftApConfiguration.SECURITY_TYPE_OPEN;
|
||||
import static android.net.wifi.SoftApConfiguration.SECURITY_TYPE_WPA2_PSK;
|
||||
import static android.net.wifi.SoftApConfiguration.SECURITY_TYPE_WPA3_SAE;
|
||||
import static android.net.wifi.SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION;
|
||||
|
||||
import static com.android.settings.wifi.repository.WifiHotspotRepository.SPEED_2GHZ;
|
||||
import static com.android.settings.wifi.repository.WifiHotspotRepository.SPEED_2GHZ_5GHZ;
|
||||
import static com.android.settings.wifi.repository.WifiHotspotRepository.SPEED_5GHZ;
|
||||
import static com.android.settings.wifi.repository.WifiHotspotRepository.SPEED_6GHZ;
|
||||
import static com.android.settings.wifi.tether.WifiHotspotSecurityViewModel.KEY_SECURITY_NONE;
|
||||
import static com.android.settings.wifi.tether.WifiHotspotSecurityViewModel.KEY_SECURITY_WPA2;
|
||||
import static com.android.settings.wifi.tether.WifiHotspotSecurityViewModel.KEY_SECURITY_WPA2_WPA3;
|
||||
import static com.android.settings.wifi.tether.WifiHotspotSecurityViewModel.KEY_SECURITY_WPA3;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.Application;
|
||||
import android.content.Context;
|
||||
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
import androidx.test.annotation.UiThreadTest;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.wifi.repository.WifiHotspotRepository;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Spy;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
|
||||
@UiThreadTest
|
||||
public class WifiHotspotSecurityViewModelTest {
|
||||
@Rule
|
||||
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
@Spy
|
||||
Context mContext = ApplicationProvider.getApplicationContext();
|
||||
@Mock
|
||||
WifiHotspotRepository mWifiHotspotRepository;
|
||||
@Mock
|
||||
MutableLiveData<Integer> mSecurityType;
|
||||
@Mock
|
||||
MutableLiveData<Integer> mSpeedType;
|
||||
|
||||
WifiHotspotSecurityViewModel mViewModel;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
FakeFeatureFactory featureFactory = FakeFeatureFactory.setupForTest();
|
||||
when(featureFactory.getWifiFeatureProvider().getWifiHotspotRepository())
|
||||
.thenReturn(mWifiHotspotRepository);
|
||||
when(mWifiHotspotRepository.getSecurityType()).thenReturn(mSecurityType);
|
||||
when(mWifiHotspotRepository.getSpeedType()).thenReturn(mSpeedType);
|
||||
|
||||
mViewModel = new WifiHotspotSecurityViewModel((Application) mContext);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void constructor_observeDataAndSetAutoRefresh() {
|
||||
verify(mSecurityType).observeForever(mViewModel.mSecurityTypeObserver);
|
||||
verify(mSpeedType).observeForever(mViewModel.mSpeedTypeObserver);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onCleared_removeObserverData() {
|
||||
mViewModel.onCleared();
|
||||
|
||||
verify(mSecurityType).removeObserver(mViewModel.mSecurityTypeObserver);
|
||||
verify(mSpeedType).removeObserver(mViewModel.mSpeedTypeObserver);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onSecurityTypeChanged_securityTypeWpa3_setCheckedCorrectly() {
|
||||
mViewModel.onSecurityTypeChanged(SECURITY_TYPE_WPA3_SAE);
|
||||
|
||||
assertItemChecked(true, false, false, false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onSecurityTypeChanged_securityTypeWpa2Wpa3_setCheckedCorrectly() {
|
||||
mViewModel.onSecurityTypeChanged(SECURITY_TYPE_WPA3_SAE_TRANSITION);
|
||||
|
||||
assertItemChecked(false, true, false, false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onSecurityTypeChanged_securityTypeWpa2_setCheckedCorrectly() {
|
||||
mViewModel.onSecurityTypeChanged(SECURITY_TYPE_WPA2_PSK);
|
||||
|
||||
assertItemChecked(false, false, true, false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onSecurityTypeChanged_securityTypeNone_setCheckedCorrectly() {
|
||||
mViewModel.onSecurityTypeChanged(SECURITY_TYPE_OPEN);
|
||||
|
||||
assertItemChecked(false, false, false, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onSpeedTypeChanged_speed6g_setEnabledCorrectly() {
|
||||
mViewModel.onSpeedTypeChanged(SPEED_6GHZ);
|
||||
|
||||
assertItemEnabled(true, false, false, false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onSpeedTypeChanged_speed2g5g_setEnabledCorrectly() {
|
||||
mViewModel.onSpeedTypeChanged(SPEED_2GHZ_5GHZ);
|
||||
|
||||
assertItemEnabled(true, true, true, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onSpeedTypeChanged_speed5g_setEnabledCorrectly() {
|
||||
mViewModel.onSpeedTypeChanged(SPEED_5GHZ);
|
||||
|
||||
assertItemEnabled(true, true, true, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onSpeedTypeChanged_speed2g_setEnabledCorrectly() {
|
||||
mViewModel.onSpeedTypeChanged(SPEED_2GHZ);
|
||||
|
||||
assertItemEnabled(true, true, true, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void handleRadioButtonClicked_keyWpa3_setSecurityTypeCorrectly() {
|
||||
mViewModel.handleRadioButtonClicked(KEY_SECURITY_WPA3);
|
||||
|
||||
verify(mWifiHotspotRepository).setSecurityType(SECURITY_TYPE_WPA3_SAE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void handleRadioButtonClicked_keyWpa2Wpa3_setSecurityTypeCorrectly() {
|
||||
mViewModel.handleRadioButtonClicked(KEY_SECURITY_WPA2_WPA3);
|
||||
|
||||
verify(mWifiHotspotRepository).setSecurityType(SECURITY_TYPE_WPA3_SAE_TRANSITION);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void handleRadioButtonClicked_keyWpa2_setSecurityTypeCorrectly() {
|
||||
mViewModel.handleRadioButtonClicked(KEY_SECURITY_WPA2);
|
||||
|
||||
verify(mWifiHotspotRepository).setSecurityType(SECURITY_TYPE_WPA2_PSK);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void handleRadioButtonClicked_keyNone_setSecurityTypeCorrectly() {
|
||||
mViewModel.handleRadioButtonClicked(KEY_SECURITY_NONE);
|
||||
|
||||
verify(mWifiHotspotRepository).setSecurityType(SECURITY_TYPE_OPEN);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getViewItemListData_shouldNotReturnNull() {
|
||||
// Reset mViewInfoListData to trigger an update
|
||||
mViewModel.mViewInfoListData = null;
|
||||
|
||||
assertThat(mViewModel.getViewItemListData()).isNotNull();
|
||||
}
|
||||
|
||||
private void assertItemChecked(boolean checkedWpa3, boolean checkedWpa2Wpa3,
|
||||
boolean checkedWpa2, boolean checkedNone) {
|
||||
assertThat(mViewModel.mViewItemMap.get(SECURITY_TYPE_WPA3_SAE).mIsChecked)
|
||||
.isEqualTo(checkedWpa3);
|
||||
assertThat(mViewModel.mViewItemMap.get(SECURITY_TYPE_WPA3_SAE_TRANSITION).mIsChecked)
|
||||
.isEqualTo(checkedWpa2Wpa3);
|
||||
assertThat(mViewModel.mViewItemMap.get(SECURITY_TYPE_WPA2_PSK).mIsChecked)
|
||||
.isEqualTo(checkedWpa2);
|
||||
assertThat(mViewModel.mViewItemMap.get(SECURITY_TYPE_OPEN).mIsChecked)
|
||||
.isEqualTo(checkedNone);
|
||||
}
|
||||
|
||||
private void assertItemEnabled(boolean enabledWpa3, boolean enabledWpa2Wpa3,
|
||||
boolean enabledWpa2, boolean enabledNone) {
|
||||
assertThat(mViewModel.mViewItemMap.get(SECURITY_TYPE_WPA3_SAE).mIsEnabled)
|
||||
.isEqualTo(enabledWpa3);
|
||||
assertThat(mViewModel.mViewItemMap.get(SECURITY_TYPE_WPA3_SAE_TRANSITION).mIsEnabled)
|
||||
.isEqualTo(enabledWpa2Wpa3);
|
||||
assertThat(mViewModel.mViewItemMap.get(SECURITY_TYPE_WPA2_PSK).mIsEnabled)
|
||||
.isEqualTo(enabledWpa2);
|
||||
assertThat(mViewModel.mViewItemMap.get(SECURITY_TYPE_OPEN).mIsEnabled)
|
||||
.isEqualTo(enabledNone);
|
||||
}
|
||||
}
|
||||
@@ -52,6 +52,8 @@ public class WifiTetherViewModelTest {
|
||||
@Mock
|
||||
WifiHotspotRepository mWifiHotspotRepository;
|
||||
@Mock
|
||||
MutableLiveData<Integer> mSecurityType;
|
||||
@Mock
|
||||
MutableLiveData<Integer> mSpeedType;
|
||||
|
||||
WifiTetherViewModel mViewModel;
|
||||
@@ -63,21 +65,18 @@ public class WifiTetherViewModelTest {
|
||||
FakeFeatureFactory featureFactory = FakeFeatureFactory.setupForTest();
|
||||
when(featureFactory.getWifiFeatureProvider().getWifiHotspotRepository())
|
||||
.thenReturn(mWifiHotspotRepository);
|
||||
when(mWifiHotspotRepository.getSecurityType()).thenReturn(mSecurityType);
|
||||
when(mWifiHotspotRepository.getSpeedType()).thenReturn(mSpeedType);
|
||||
|
||||
mViewModel = new WifiTetherViewModel(mApplication);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void constructor_setAutoRefreshTrue() {
|
||||
verify(mWifiHotspotRepository).setAutoRefresh(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onCleared_setAutoRefreshFalse() {
|
||||
mViewModel.onCleared();
|
||||
|
||||
verify(mWifiHotspotRepository).setAutoRefresh(false);
|
||||
verify(mSecurityType).removeObserver(mViewModel.mSecurityTypeObserver);
|
||||
verify(mSpeedType).removeObserver(mViewModel.mSpeedTypeObserver);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -96,6 +95,17 @@ public class WifiTetherViewModelTest {
|
||||
verify(mWifiHotspotRepository).refresh();
|
||||
}
|
||||
|
||||
@Test
|
||||
@UiThreadTest
|
||||
public void getSecuritySummary_returnNotNull() {
|
||||
mViewModel.mSecuritySummary = null;
|
||||
|
||||
mViewModel.getSecuritySummary();
|
||||
|
||||
assertThat(mViewModel.mSecuritySummary).isNotNull();
|
||||
verify(mSecurityType).observeForever(mViewModel.mSecurityTypeObserver);
|
||||
}
|
||||
|
||||
@Test
|
||||
@UiThreadTest
|
||||
public void getSpeedSummary_returnNotNull() {
|
||||
@@ -104,5 +114,6 @@ public class WifiTetherViewModelTest {
|
||||
mViewModel.getSpeedSummary();
|
||||
|
||||
assertThat(mViewModel.mSpeedSummary).isNotNull();
|
||||
verify(mSpeedType).observeForever(mViewModel.mSpeedTypeObserver);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user