PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use external/robolectric-shadows/run_robotests.mk

Browse Source 
This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
This commit is contained in:
James Lemieux
2018-02-26 00:51:42 -08:00
parent 229a6a2bc4
commit 22a39c2b93
752 changed files with 5096 additions and 9182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
View File

@@ -16,15 +16,14 @@
package com.android.settings.security;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.google.common.truth.Truth.assertThat;
import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.After;
@@ -36,7 +35,6 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ScreenPinningPreferenceControllerTest {
private Context mContext;
@@ -54,8 +52,8 @@ public class ScreenPinningPreferenceControllerTest {
@After
public void tearDown() {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.LOCK_TO_APP_ENABLED, 0);
final ContentResolver contentResolver = mContext.getContentResolver();
Settings.System.putInt(contentResolver, Settings.System.LOCK_TO_APP_ENABLED, 0);
}
@Test
@@ -71,8 +69,8 @@ public class ScreenPinningPreferenceControllerTest {
@Test
public void updateState_isOff_shouldDisableOffSummary() {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.LOCK_TO_APP_ENABLED, 0);
final ContentResolver contentResolver = mContext.getContentResolver();
Settings.System.putInt(contentResolver, Settings.System.LOCK_TO_APP_ENABLED, 0);
mController.updateState(mPreference);
@@ -82,13 +80,12 @@ public class ScreenPinningPreferenceControllerTest {
@Test
public void updateState_isOn_shouldDisableOnSummary() {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.LOCK_TO_APP_ENABLED, 1);
final ContentResolver contentResolver = mContext.getContentResolver();
Settings.System.putInt(contentResolver, Settings.System.LOCK_TO_APP_ENABLED, 1);
mController.updateState(mPreference);
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.switch_on_text));
}
}