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:
@@ -24,7 +24,6 @@ import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.os.UserManager;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settingslib.dream.DreamBackend;
|
||||
@@ -35,12 +34,11 @@ import org.junit.runner.RunWith;
|
||||
import org.mockito.Answers;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class WhenToDreamPickerTest {
|
||||
|
||||
private WhenToDreamPicker mPicker;
|
||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||
private DreamBackend mBackend;
|
||||
@@ -82,28 +80,28 @@ public class WhenToDreamPickerTest {
|
||||
|
||||
@Test
|
||||
public void setDreamWhileCharging() {
|
||||
String key = DreamSettings.getKeyFromSetting(DreamBackend.WHILE_CHARGING);
|
||||
final String key = DreamSettings.getKeyFromSetting(DreamBackend.WHILE_CHARGING);
|
||||
mPicker.setDefaultKey(key);
|
||||
verify(mBackend).setWhenToDream(DreamBackend.WHILE_CHARGING);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setDreamWhileDocked() {
|
||||
String key = DreamSettings.getKeyFromSetting(DreamBackend.WHILE_DOCKED);
|
||||
final String key = DreamSettings.getKeyFromSetting(DreamBackend.WHILE_DOCKED);
|
||||
mPicker.setDefaultKey(key);
|
||||
verify(mBackend).setWhenToDream(DreamBackend.WHILE_DOCKED);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setDreamWhileChargingOrDocked() {
|
||||
String key = DreamSettings.getKeyFromSetting(DreamBackend.EITHER);
|
||||
final String key = DreamSettings.getKeyFromSetting(DreamBackend.EITHER);
|
||||
mPicker.setDefaultKey(key);
|
||||
verify(mBackend).setWhenToDream(DreamBackend.EITHER);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setDreamNever() {
|
||||
String key = DreamSettings.getKeyFromSetting(DreamBackend.NEVER);
|
||||
final String key = DreamSettings.getKeyFromSetting(DreamBackend.NEVER);
|
||||
mPicker.setDefaultKey(key);
|
||||
verify(mBackend).setWhenToDream(DreamBackend.NEVER);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user