Merge "Change the default Controller keys for RoboTests"
This commit is contained in:
committed by
Android (Google) Code Review
commit
a031404afc
@@ -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");
|
||||
|
@@ -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");
|
||||
|
@@ -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");
|
||||
|
Reference in New Issue
Block a user