Use external/robolectric-shadows/run_robotests.mk
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:
@@ -17,7 +17,6 @@
|
||||
package com.android.settings.display;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Matchers.anyString;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.reset;
|
||||
@@ -31,7 +30,6 @@ import android.provider.Settings.System;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.wrapper.PowerManagerWrapper;
|
||||
|
||||
@@ -41,17 +39,12 @@ import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadow.api.Shadow;
|
||||
import org.robolectric.shadows.ShadowContentResolver;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class BrightnessLevelPreferenceControllerTest {
|
||||
@Mock
|
||||
private Context mContext;
|
||||
@Mock
|
||||
private ContentResolver mContentResolver;
|
||||
|
||||
@Mock
|
||||
private PowerManagerWrapper mPowerManager;
|
||||
@Mock
|
||||
@@ -59,12 +52,17 @@ public class BrightnessLevelPreferenceControllerTest {
|
||||
@Mock
|
||||
private Preference mPreference;
|
||||
|
||||
private Context mContext;
|
||||
|
||||
private ContentResolver mContentResolver;
|
||||
|
||||
private BrightnessLevelPreferenceController mController;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
when(mContext.getContentResolver()).thenReturn(mContentResolver);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mContentResolver = mContext.getContentResolver();
|
||||
when(mPowerManager.getMinimumScreenBrightnessSetting()).thenReturn(0);
|
||||
when(mPowerManager.getMaximumScreenBrightnessSetting()).thenReturn(100);
|
||||
when(mPowerManager.getMinimumScreenBrightnessForVrSetting()).thenReturn(0);
|
||||
@@ -72,7 +70,6 @@ public class BrightnessLevelPreferenceControllerTest {
|
||||
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
|
||||
mController = spy(new BrightnessLevelPreferenceController(mContext, null, mPowerManager));
|
||||
doReturn(false).when(mController).isInVrMode();
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -82,10 +79,9 @@ public class BrightnessLevelPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void onStart_shouldRegisterObserver() {
|
||||
Context context = RuntimeEnvironment.application;
|
||||
BrightnessLevelPreferenceController controller =
|
||||
new BrightnessLevelPreferenceController(context, null, mPowerManager);
|
||||
ShadowContentResolver shadowContentResolver = Shadow.extract(context.getContentResolver());
|
||||
new BrightnessLevelPreferenceController(mContext, null, mPowerManager);
|
||||
ShadowContentResolver shadowContentResolver = Shadow.extract(mContentResolver);
|
||||
|
||||
controller.onStart();
|
||||
|
||||
@@ -99,10 +95,9 @@ public class BrightnessLevelPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void onStop_shouldUnregisterObserver() {
|
||||
Context context = RuntimeEnvironment.application;
|
||||
BrightnessLevelPreferenceController controller =
|
||||
new BrightnessLevelPreferenceController(context, null, mPowerManager);
|
||||
ShadowContentResolver shadowContentResolver = Shadow.extract(context.getContentResolver());
|
||||
new BrightnessLevelPreferenceController(mContext, null, mPowerManager);
|
||||
ShadowContentResolver shadowContentResolver = Shadow.extract(mContext.getContentResolver());
|
||||
|
||||
controller.displayPreference(mScreen);
|
||||
controller.onStart();
|
||||
|
Reference in New Issue
Block a user