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

Merge "Refer to the last Hotspot password when generating the password" into udc-dev am: d078d1f00a am: b0e3972f8c

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

Change-Id: Ib6373f7aea55af0861daed22e1c210f6ab34f85e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Weng Su
2023-02-25 03:12:32 +00:00
committed by Automerger Merge Worker
parent 350a37e46b b0e3972f8c
commit 7d642541b7
10 changed files with 303 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
View File

@@ -50,6 +50,7 @@ import com.android.settings.slices.SlicesFeatureProvider;
import com.android.settings.users.UserFeatureProvider;
import com.android.settings.vpn2.AdvancedVpnFeatureProvider;
import com.android.settings.wifi.WifiTrackerLibProvider;
import com.android.settings.wifi.factory.WifiFeatureProvider;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.mockito.Answers;
@@ -91,6 +92,7 @@ public class FakeFeatureFactory extends FeatureFactory {
public AccessibilitySearchFeatureProvider mAccessibilitySearchFeatureProvider;
public AccessibilityMetricsFeatureProvider mAccessibilityMetricsFeatureProvider;
public AdvancedVpnFeatureProvider mAdvancedVpnFeatureProvider;
public WifiFeatureProvider mWifiFeatureProvider;
/**
* Call this in {@code @Before} method of the test class to use fake factory.
@@ -142,6 +144,7 @@ public class FakeFeatureFactory extends FeatureFactory {
mAccessibilitySearchFeatureProvider = mock(AccessibilitySearchFeatureProvider.class);
mAccessibilityMetricsFeatureProvider = mock(AccessibilityMetricsFeatureProvider.class);
mAdvancedVpnFeatureProvider = mock(AdvancedVpnFeatureProvider.class);
mWifiFeatureProvider = mock(WifiFeatureProvider.class);
}
@Override
@@ -288,4 +291,9 @@ public class FakeFeatureFactory extends FeatureFactory {
public AdvancedVpnFeatureProvider getAdvancedVpnFeatureProvider() {
return mAdvancedVpnFeatureProvider;
}
@Override
public WifiFeatureProvider getWifiFeatureProvider() {
return mWifiFeatureProvider;
}
}

13
tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
View File

@@ -35,7 +35,9 @@ import android.net.wifi.WifiManager;
import androidx.preference.PreferenceScreen;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.widget.ValidatedEditTextPreference;
import com.android.settings.wifi.repository.WifiHotspotRepository;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
@@ -65,6 +67,8 @@ public class WifiTetherPasswordPreferenceControllerTest {
private PreferenceScreen mScreen;
@Mock
private MetricsFeatureProvider mMetricsFeatureProvider;
@Mock
private WifiHotspotRepository mWifiHotspotRepository;
private WifiTetherPasswordPreferenceController mController;
private ValidatedEditTextPreference mPreference;
@@ -73,6 +77,10 @@ public class WifiTetherPasswordPreferenceControllerTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
FakeFeatureFactory featureFactory = FakeFeatureFactory.setupForTest();
when(featureFactory.getWifiFeatureProvider().getWifiHotspotRepository())
.thenReturn(mWifiHotspotRepository);
mPreference = new ValidatedEditTextPreference(RuntimeEnvironment.application);
mConfig = new SoftApConfiguration.Builder().setSsid("test_1234")
.setPassphrase(INITIAL_PASSWORD, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)
@@ -91,6 +99,11 @@ public class WifiTetherPasswordPreferenceControllerTest {
mMetricsFeatureProvider);
}
@Test
public void constructor_shouldQueryLastPasswordIfNeeded() {
verify(mWifiHotspotRepository).queryLastPasswordIfNeeded();
}
@Test
public void displayPreference_shouldStylePreference() {
mController.displayPreference(mScreen);