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

Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143

Change-Id: I6b737218b4bec1500ea31218c0b7d13fb0a57f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-15 22:15:59 +00:00
committed by Automerger Merge Worker
parent 8513da9a31 57522f0fcc
commit 2f87be66ce
2 changed files with 59 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.wifi.tether;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,6 +29,10 @@ import android.net.wifi.WifiManager;
import androidx.preference.SwitchPreference;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.wifi.factory.WifiFeatureProvider;
import com.android.settings.wifi.repository.WifiHotspotRepository;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -54,6 +59,8 @@ public class WifiTetherAutoOffPreferenceControllerTest {
mContext = spy(RuntimeEnvironment.application);
WifiFeatureProvider provider = FakeFeatureFactory.setupForTest().getWifiFeatureProvider();
when(provider.getWifiHotspotRepository()).thenReturn(mock(WifiHotspotRepository.class));
when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
mSoftApConfiguration = new SoftApConfiguration.Builder().build();
when(mWifiManager.getSoftApConfiguration()).thenReturn(mSoftApConfiguration);
@@ -101,6 +108,32 @@ public class WifiTetherAutoOffPreferenceControllerTest {
assertThat(mSwitchPreference.isChecked()).isTrue();
}
@Test
public void onPreferenceChange_needShutdownSecondarySap_setSecondarySap() {
mController.mNeedShutdownSecondarySap = true;
setConfigShutdownSecondarySap(false);
mController.onPreferenceChange(mSwitchPreference, true);
ArgumentCaptor<SoftApConfiguration> config =
ArgumentCaptor.forClass(SoftApConfiguration.class);
verify(mWifiManager).setSoftApConfiguration(config.capture());
assertThat(config.getValue().isBridgedModeOpportunisticShutdownEnabled()).isTrue();
}
@Test
public void onPreferenceChange_noNeedShutdownSecondarySap_doNotSetSecondarySap() {
mController.mNeedShutdownSecondarySap = false;
setConfigShutdownSecondarySap(false);
mController.onPreferenceChange(mSwitchPreference, true);
ArgumentCaptor<SoftApConfiguration> config =
ArgumentCaptor.forClass(SoftApConfiguration.class);
verify(mWifiManager).setSoftApConfiguration(config.capture());
assertThat(config.getValue().isBridgedModeOpportunisticShutdownEnabled()).isFalse();
}
private boolean getAutoOffSetting() {
ArgumentCaptor<SoftApConfiguration> softApConfigCaptor =
ArgumentCaptor.forClass(SoftApConfiguration.class);
@@ -115,4 +148,12 @@ public class WifiTetherAutoOffPreferenceControllerTest {
.build();
when(mWifiManager.getSoftApConfiguration()).thenReturn(mSoftApConfiguration);
}
private void setConfigShutdownSecondarySap(boolean enabled) {
mSoftApConfiguration =
new SoftApConfiguration.Builder(mSoftApConfiguration)
.setBridgedModeOpportunisticShutdownEnabled(enabled)
.build();
when(mWifiManager.getSoftApConfiguration()).thenReturn(mSoftApConfiguration);
}
}