From c92720bdb0e22dcf2011dea5479b1e96ef8ced8a Mon Sep 17 00:00:00 2001
From: Yuri Ufimtsev <yufimtsev@google.com>
Date: Wed, 19 Jan 2022 11:41:51 +0000
Subject: [PATCH] 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
---
 .../security/ScreenPinningPreferenceControllerTest.java    | 7 -------
 .../settings/security/SimLockPreferenceControllerTest.java | 7 -------
 .../ManageTrustAgentsPreferenceControllerTest.java         | 7 -------
 3 files changed, 21 deletions(-)

diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
index 02bcbea87fa..4f694bc8d40 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 com.android.settings.R;
 
 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;
@@ -91,12 +90,6 @@ public class ScreenPinningPreferenceControllerTest {
                 .isEqualTo(mContext.getString(R.string.switch_on_text));
     }
 
-    @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");
diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
index 9f4ac65fe3e..ef5973c1d5b 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 androidx.preference.PreferenceScreen;
 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;
@@ -139,12 +138,6 @@ public class SimLockPreferenceControllerTest {
         assertThat(mPreference.isEnabled()).isTrue();
     }
 
-    @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");
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 b045ed807a2..29a62ea150f 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.security.trustagent.TrustAgentManager.TrustAgentComp
 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;
@@ -119,12 +118,6 @@ public class ManageTrustAgentsPreferenceControllerTest {
                         R.plurals.manage_trust_agents_summary_on, 1, 1));
     }
 
-    @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");