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
This commit is contained in:
Yuri Ufimtsev
2022-01-19 11:41:51 +00:00
parent 04f6983ddd
commit c92720bdb0
3 changed files with 0 additions and 21 deletions

View File

@@ -28,7 +28,6 @@ import com.android.settings.R;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
@@ -91,12 +90,6 @@ public class ScreenPinningPreferenceControllerTest {
.isEqualTo(mContext.getString(R.string.switch_on_text)); .isEqualTo(mContext.getString(R.string.switch_on_text));
} }
@Test
@Ignore
public void getPreferenceKey_byDefault_returnsDefaultValue() {
assertThat(mController.getPreferenceKey()).isEqualTo("screen_pinning_settings");
}
@Test @Test
public void getPreferenceKey_whenGivenValue_returnsGivenValue() { public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
mController = new ScreenPinningPreferenceController(mContext, "key"); mController = new ScreenPinningPreferenceController(mContext, "key");

View File

@@ -38,7 +38,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -139,12 +138,6 @@ public class SimLockPreferenceControllerTest {
assertThat(mPreference.isEnabled()).isTrue(); assertThat(mPreference.isEnabled()).isTrue();
} }
@Test
@Ignore
public void getPreferenceKey_byDefault_returnsDefaultValue() {
assertThat(mController.getPreferenceKey()).isEqualTo("sim_lock_settings");
}
@Test @Test
public void getPreferenceKey_whenGivenValue_returnsGivenValue() { public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
mController = new SimLockPreferenceController(mContext, "key"); mController = new SimLockPreferenceController(mContext, "key");

View File

@@ -31,7 +31,6 @@ import com.android.settings.security.trustagent.TrustAgentManager.TrustAgentComp
import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -119,12 +118,6 @@ public class ManageTrustAgentsPreferenceControllerTest {
R.plurals.manage_trust_agents_summary_on, 1, 1)); R.plurals.manage_trust_agents_summary_on, 1, 1));
} }
@Test
@Ignore
public void getPreferenceKey_byDefault_returnsDefaultValue() {
assertThat(mController.getPreferenceKey()).isEqualTo("manage_trust_agents");
}
@Test @Test
public void getPreferenceKey_whenGivenValue_returnsGivenValue() { public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
mController = new ManageTrustAgentsPreferenceController(mContext, "key"); mController = new ManageTrustAgentsPreferenceController(mContext, "key");