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

[Wi-Fi] Remove the files which use SettingsLib Wi-Fi objects

Browse Source 
This change removes

WifiDetailPreferenceController
WifiPrivacyPreferenceController

Bug: 152571756
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
      Manualy add a Wi-Fi network of randomized MAC and a Wi-Fi network of device MAC
      in SetupWizard, then observe the MAC value in Settings Wi-Fi detail.
Change-Id: I82ef4e1d2c386d8bd751df8ff18c18163a0e9a6a
This commit is contained in:
Arc Wang
2020-07-28 17:36:41 +08:00
parent 0ab0255f4a
commit c5c92eb342
5 changed files with 22 additions and 1627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,9 @@
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.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.anyString;
@@ -43,7 +46,6 @@ 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;
@@ -381,14 +383,12 @@ public class WifiConfigControllerTest {
}
@Test
public void loadMacRandomizedValue_shouldPersistentAsDefault() {
public void loadMacRandomizedValue_shouldMandomizedMacAsDefault() {
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);
assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(
PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC);
}
@Test
@@ -409,14 +409,12 @@ public class WifiConfigControllerTest {
mockWifiConfig.macRandomizationSetting = macRandomizedValue;
mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
WifiConfigUiBase.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);
assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(
macRandomizedValue == WifiConfiguration.RANDOMIZATION_PERSISTENT
? PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC : PRIVACY_SPINNER_INDEX_DEVICE_MAC);
}
@Test
@@ -427,12 +425,9 @@ public class WifiConfigControllerTest {
}
@Test
public void saveMacRandomizedValue_ChangedToNone_shouldGetNone() {
public void saveMacRandomizedValue_ChangedToDeviceMac_shouldGetNone() {
final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
final int prefMacNone =
WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
WifiConfiguration.RANDOMIZATION_NONE);
privacySetting.setSelection(prefMacNone);
privacySetting.setSelection(PRIVACY_SPINNER_INDEX_DEVICE_MAC);
WifiConfiguration config = mController.getConfig();
assertThat(config.macRandomizationSetting).isEqualTo(WifiConfiguration.RANDOMIZATION_NONE);

128
tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java
View File

@@ -1,128 +0,0 @@
/*
* Copyright (C) 2018 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.details;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import android.content.Context;
import android.net.wifi.WifiConfiguration;
import androidx.preference.DropDownPreference;
import com.android.settings.R;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class WifiPrivacyPreferenceControllerTest {
private static final int PRIVACY_RANDOMIZED = WifiConfiguration.RANDOMIZATION_PERSISTENT;
private static final int PRIVACY_TRUSTED = WifiConfiguration.RANDOMIZATION_NONE;
@Mock
private WifiConfiguration mWifiConfiguration;
private WifiPrivacyPreferenceController mPreferenceController;
private Context mContext;
private DropDownPreference mDropDownPreference;
private String[] perferenceString;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
WifiPrivacyPreferenceController preferenceController = new WifiPrivacyPreferenceController(
mContext);
preferenceController.setWifiConfiguration(mWifiConfiguration);
mPreferenceController = spy(preferenceController);
mDropDownPreference = new DropDownPreference(mContext);
mDropDownPreference.setEntries(R.array.wifi_privacy_entries);
mDropDownPreference.setEntryValues(R.array.wifi_privacy_values);
perferenceString = mContext.getResources().getStringArray(R.array.wifi_privacy_entries);
}
@Test
public void testUpdateState_wifiPrivacy_setCorrectValue() {
doReturn(PRIVACY_TRUSTED).when(mPreferenceController).getRandomizationValue();
mPreferenceController.updateState(mDropDownPreference);
int prefValue = mPreferenceController.translateMacRandomizedValueToPrefValue(
PRIVACY_TRUSTED);
assertThat(mDropDownPreference.getEntry()).isEqualTo(perferenceString[prefValue]);
}
@Test
public void testUpdateState_wifiNotMetered_setCorrectValue() {
doReturn(PRIVACY_RANDOMIZED).when(mPreferenceController).getRandomizationValue();
mPreferenceController.updateState(mDropDownPreference);
int prefValue = mPreferenceController.translateMacRandomizedValueToPrefValue(
PRIVACY_RANDOMIZED);
assertThat(mDropDownPreference.getEntry()).isEqualTo(perferenceString[prefValue]);
}
@Test
public void testController_resilientToNullConfig() {
mPreferenceController = spy(new WifiPrivacyPreferenceController(mContext));
mPreferenceController.getRandomizationValue();
mPreferenceController.onPreferenceChange(mDropDownPreference, "1");
}
@Test
public void testUpdateState_isNotEphemeralNetwork_shouldBeSelectable() {
mPreferenceController.setIsEphemeral(false);
mPreferenceController.updateState(mDropDownPreference);
assertThat(mDropDownPreference.isSelectable()).isTrue();
}
@Test
public void testUpdateState_isEphemeralNetwork_shouldNotSelectable() {
mPreferenceController.setIsEphemeral(true);
mPreferenceController.updateState(mDropDownPreference);
assertThat(mDropDownPreference.isSelectable()).isFalse();
}
@Test
public void testUpdateState_isNotPasspointNetwork_shouldBeSelectable() {
mPreferenceController.setIsPasspoint(false);
mPreferenceController.updateState(mDropDownPreference);
assertThat(mDropDownPreference.isSelectable()).isTrue();
}
@Test
public void testUpdateState_isPasspointNetwork_shouldNotSelectable() {
mPreferenceController.setIsPasspoint(true);
mPreferenceController.updateState(mDropDownPreference);
assertThat(mDropDownPreference.isSelectable()).isFalse();
}
}