commit 3b60e2a9c31a726c20da70c8353d2910bab2f82a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue May 02 05:08:39 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 02 05:08:39 2023 +0000
tree da99ce6bd7912b6fa384a70711b6714260551cfa
parent 55d7c97022a3fc421bd7c9f962e0380bed60b9dd
parent 0288b6d4afa36d4a2dec2209099992ee3a1c6e15

Merge "Fix battery percentage is inconsistent in settings" into udc-dev

tests/robotests/src/com/android/settings/accessibility/SystemControlsFragmentTest.java

diff --git a/tests/robotests/src/com/android/settings/accessibility/SystemControlsFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/SystemControlsFragmentTest.java
index 1d8fb32..506882b 100644
--- a/tests/robotests/src/com/android/settings/accessibility/SystemControlsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/SystemControlsFragmentTest.java
@@ -25,16 +25,19 @@
 
 import com.android.settings.R;
 import com.android.settings.testutils.XmlTestUtils;
+import com.android.settings.testutils.shadow.ShadowKeyCharacterMap;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import java.util.List;
 
 /** Tests for {@link SystemControlsFragment}. */
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowKeyCharacterMap.class})
 public class SystemControlsFragmentTest {
 
     private final Context mContext = ApplicationProvider.getApplicationContext();

tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
index 057b6cb..b2f0ad5 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
@@ -169,6 +169,7 @@
 
     @Test
     public void getAvailibilityStatus_availableByDefault() {
+        doReturn(true).when(mUserManager).isAdminUser();
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }