commit c92720bdb0e22dcf2011dea5479b1e96ef8ced8a
author Yuri Ufimtsev <yufimtsev@google.com> Wed Jan 19 11:41:51 2022 +0000
committer Yuri Ufimtsev <yufimtsev@google.com> Wed Jan 19 14:22:16 2022 +0000
tree 88e3334bdcf78094d4b3172433fb652c968e003c
parent 04f6983ddd6c2d015bc0c433b678052209911873

Change the default Controller keys for RoboTests

Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.security.ManageTrustAgentsPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.security.ScreenPinningPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.security.SimLockPreferenceControllerTest

Bug: 214944423
Bug: 214944992
Bug: 214945259
Change-Id: I9b3bac5fcf57a1c99253c631bc26e6957cad8938

tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
index 02bcbea..4f694bc 100644
--- a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
@@ -28,7 +28,6 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
@@ -92,12 +91,6 @@
     }
 
     @Test
-    @Ignore
-    public void getPreferenceKey_byDefault_returnsDefaultValue() {
-        assertThat(mController.getPreferenceKey()).isEqualTo("screen_pinning_settings");
-    }
-
-    @Test
     public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
         mController = new ScreenPinningPreferenceController(mContext, "key");
 

tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
index 9f4ac65..ef5973c 100644
--- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
@@ -38,7 +38,6 @@
 import com.android.settings.core.BasePreferenceController;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -140,12 +139,6 @@
     }
 
     @Test
-    @Ignore
-    public void getPreferenceKey_byDefault_returnsDefaultValue() {
-        assertThat(mController.getPreferenceKey()).isEqualTo("sim_lock_settings");
-    }
-
-    @Test
     public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
         mController = new SimLockPreferenceController(mContext, "key");
 

tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
index b045ed8..29a62ea 100644
--- a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
@@ -31,7 +31,6 @@
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -120,12 +119,6 @@
     }
 
     @Test
-    @Ignore
-    public void getPreferenceKey_byDefault_returnsDefaultValue() {
-        assertThat(mController.getPreferenceKey()).isEqualTo("manage_trust_agents");
-    }
-
-    @Test
     public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
         mController = new ManageTrustAgentsPreferenceController(mContext, "key");