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

33
tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
View File

@@ -28,16 +28,12 @@ import android.content.SharedPreferences;
import android.provider.Settings;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.TestConfig;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
import com.android.settings.search.InlinePayload;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.search.ResultPayload;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,14 +41,12 @@ import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
SettingsShadowResources.class
})
public class PickupGesturePreferenceControllerTest {
private static final String KEY_PICK_UP = "gesture_pick_up";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock
@@ -60,8 +54,6 @@ public class PickupGesturePreferenceControllerTest {
private PickupGesturePreferenceController mController;
private static final String KEY_PICK_UP = "gesture_pick_up";
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -69,12 +61,6 @@ public class PickupGesturePreferenceControllerTest {
mContext, null, mAmbientDisplayConfiguration, 0, KEY_PICK_UP);
}
@After
public void tearDown() {
SettingsShadowResources.reset();
ShadowSecureSettings.clear();
}
@Test
public void isAvailable_configIsTrue_shouldReturnTrue() {
when(mAmbientDisplayConfiguration.pulseOnPickupAvailable()).thenReturn(true);
@@ -132,7 +118,6 @@ public class PickupGesturePreferenceControllerTest {
}
@Test
@Config(shadows = ShadowSecureSettings.class)
public void testSetValue_updatesCorrectly() {
int newValue = 1;
ContentResolver resolver = mContext.getContentResolver();
@@ -146,7 +131,6 @@ public class PickupGesturePreferenceControllerTest {
}
@Test
@Config(shadows = ShadowSecureSettings.class)
public void testGetValue_correctValueReturned() {
int currentValue = 1;
ContentResolver resolver = mContext.getContentResolver();
@@ -159,15 +143,12 @@ public class PickupGesturePreferenceControllerTest {
@Test
public void isSuggestionCompleted_ambientDisplayPickup_trueWhenVisited() {
when(mContext.getResources().getBoolean(anyInt()))
.thenReturn(true);
when(mContext.getResources().getString(anyInt()))
.thenReturn("foo");
when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);
when(mContext.getResources().getString(anyInt())).thenReturn("foo");
final Context context = RuntimeEnvironment.application;
final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
.getSharedPrefs(context);
prefs.edit().putBoolean(
PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
final SharedPreferences prefs =
new SuggestionFeatureProviderImpl(context).getSharedPrefs(context);
prefs.edit().putBoolean(PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
assertThat(PickupGesturePreferenceController.isSuggestionComplete(mContext, prefs))
.isTrue();