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

Merge "Revert "Rename Enhanced MAC Randomization to Non-Persistent""

Browse Source
This commit is contained in:
Quang Luong
2021-07-13 15:45:51 +00:00
committed by Android (Google) Code Review
parent 09d1003fce e7cb2762f9
commit 373b7cb089
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/robotests/src/com/android/settings/development/WifiNonPersistentMacRandomizationPreferenceControllerTest.java → tests/robotests/src/com/android/settings/development/WifiEnhancedMacRandomizationPreferenceControllerTest.java
View File

@@ -36,48 +36,48 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class WifiNonPersistentMacRandomizationPreferenceControllerTest {
private static final String NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG =
"non_persistent_mac_randomization_force_enabled";
public class WifiEnhancedMacRandomizationPreferenceControllerTest {
private static final String ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG =
"enhanced_mac_randomization_force_enabled";
@Mock
private SwitchPreference mPreference;
@Mock
private PreferenceScreen mPreferenceScreen;
private Context mContext;
private WifiNonPersistentMacRandomizationPreferenceController mController;
private WifiEnhancedMacRandomizationPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new WifiNonPersistentMacRandomizationPreferenceController(mContext);
mController = new WifiEnhancedMacRandomizationPreferenceController(mContext);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
.thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
@Test
public void onPreferenceChanged_enabled_shouldTurnOnNonPersistentRandomization() {
public void onPreferenceChanged_enabled_shouldTurnOnEnhancedRandomization() {
mController.onPreferenceChange(mPreference, true /* new value */);
int mode = Settings.Global.getInt(mContext.getContentResolver(),
NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
assertThat(mode).isEqualTo(1);
}
@Test
public void onPreferenceChanged_disabled_shouldTurnOffNonPersistentRandomization() {
public void onPreferenceChanged_disabled_shouldTurnOffEnhancedRandomization() {
mController.onPreferenceChange(mPreference, false /* new value */);
int mode = Settings.Global.getInt(mContext.getContentResolver(),
NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
assertThat(mode).isEqualTo(0);
}
@Test
public void updateState_preferenceShouldBeChecked() {
Settings.Global.putInt(mContext.getContentResolver(),
NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, 1);
ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, 1);
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -86,7 +86,7 @@ public class WifiNonPersistentMacRandomizationPreferenceControllerTest {
@Test
public void updateState_preferenceShouldNotBeChecked() {
Settings.Global.putInt(mContext.getContentResolver(),
NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, 0);
ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, 0);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
@@ -97,7 +97,7 @@ public class WifiNonPersistentMacRandomizationPreferenceControllerTest {
mController.onDeveloperOptionsSwitchDisabled();
int mode = Settings.Global.getInt(mContext.getContentResolver(),
NON_PERSISTENT_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
assertThat(mode).isEqualTo(0);
assertThat(mPreference.isChecked()).isFalse();