commit ec571901bede2a814d98c3e695968a7ee8ce83b7
author Tom Hsu <tomhsu@google.com> Mon Oct 14 04:13:25 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 14 04:13:25 2024 +0000
tree 9e1228cd749b51e9615265a5eb27514abea1ebd6
parent e61c03648d335a953baa683f246b7c38df081946
parent 9832fe928108b2016c6444fbc0eb2b219bc02dbe

Merge "Avoid test flaky" into main

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

diff --git a/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java b/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java
index 953a524..8764d4f 100644
--- a/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java
+++ b/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java
@@ -130,6 +130,7 @@
     }
 
     @Test
+    @UiThreadTest
     public void setShownAdvancedPreferences_hasGeneralVpn_returnsVpnCountAs1() {
         Set<Preference> updates = new ArraySet<>();
         AppPreference pref =
@@ -144,6 +145,7 @@
     }
 
     @Test
+    @UiThreadTest
     public void setShownAdvancedPreferences_hasAdvancedVpn_returnsAdvancedVpnCountAs1() {
         Set<Preference> updates = new ArraySet<>();
         AppPreference pref =
@@ -158,6 +160,7 @@
     }
 
     @Test
+    @UiThreadTest
     public void setShownAdvancedPreferences_noVpn_returnsEmpty() {
         Set<Preference> updates = new ArraySet<>();
 
@@ -198,6 +201,7 @@
     }
 
     @Test
+    @UiThreadTest
     public void clickVpn_VpnConnected_doesNotStartVpnLaunchIntent()
             throws PackageManager.NameNotFoundException {
         Set<Preference> updates = new ArraySet<>();
@@ -217,6 +221,7 @@
     }
 
     @Test
+    @UiThreadTest
     public void clickVpn_VpnDisconnected_startsVpnLaunchIntent()
             throws PackageManager.NameNotFoundException {
         Set<Preference> updates = new ArraySet<>();
@@ -238,6 +243,7 @@
     }
 
     @Test
+    @UiThreadTest
     public void clickAdvancedVpn_VpnConnectedDisconnectDialogDisabled_startsAppLaunchIntent()
             throws PackageManager.NameNotFoundException {
         Set<Preference> updates = new ArraySet<>();
@@ -262,6 +268,7 @@
     }
 
     @Test
+    @UiThreadTest
     public void clickAdvancedVpn_VpnConnectedDisconnectDialogEnabled_doesNotStartAppLaunchIntent()
             throws PackageManager.NameNotFoundException {
         Set<Preference> updates = new ArraySet<>();