Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60d85b93 authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "Avoid test flaky" into main am: ec571901 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3304564



Change-Id: Id61fef14f799f141304afba7cb2f9cd3fde7e0a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aea2622b ec571901

tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java

+7 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ public class VpnSettingsTest { 
    }



    @Test

    @UiThreadTest

    public void setShownAdvancedPreferences_hasGeneralVpn_returnsVpnCountAs1() {

        Set<Preference> updates = new ArraySet<>();

        AppPreference pref =
@@ -144,6 +145,7 @@ public class VpnSettingsTest { 
    }



    @Test

    @UiThreadTest

    public void setShownAdvancedPreferences_hasAdvancedVpn_returnsAdvancedVpnCountAs1() {

        Set<Preference> updates = new ArraySet<>();

        AppPreference pref =
@@ -158,6 +160,7 @@ public class VpnSettingsTest { 
    }



    @Test

    @UiThreadTest

    public void setShownAdvancedPreferences_noVpn_returnsEmpty() {

        Set<Preference> updates = new ArraySet<>();
@@ -198,6 +201,7 @@ public class VpnSettingsTest { 
    }



    @Test

    @UiThreadTest

    public void clickVpn_VpnConnected_doesNotStartVpnLaunchIntent()

            throws PackageManager.NameNotFoundException {

        Set<Preference> updates = new ArraySet<>();
@@ -217,6 +221,7 @@ public class VpnSettingsTest { 
    }



    @Test

    @UiThreadTest

    public void clickVpn_VpnDisconnected_startsVpnLaunchIntent()

            throws PackageManager.NameNotFoundException {

        Set<Preference> updates = new ArraySet<>();
@@ -238,6 +243,7 @@ public class VpnSettingsTest { 
    }



    @Test

    @UiThreadTest

    public void clickAdvancedVpn_VpnConnectedDisconnectDialogDisabled_startsAppLaunchIntent()

            throws PackageManager.NameNotFoundException {

        Set<Preference> updates = new ArraySet<>();
@@ -262,6 +268,7 @@ public class VpnSettingsTest { 
    }



    @Test

    @UiThreadTest

    public void clickAdvancedVpn_VpnConnectedDisconnectDialogEnabled_doesNotStartAppLaunchIntent()

            throws PackageManager.NameNotFoundException {

        Set<Preference> updates = new ArraySet<>();