Merge "Move dream test package to sdk 26"
This commit is contained in:
committed by
Android (Google) Code Review
commit
ed3c6e5787
@@ -42,7 +42,7 @@ import static org.mockito.Mockito.verify;
|
|||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
@RunWith(SettingsRobolectricTestRunner.class)
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
|
||||||
public class CurrentDreamPickerTest {
|
public class CurrentDreamPickerTest {
|
||||||
private static String COMPONENT_KEY = "mocked_component_name_string";
|
private static String COMPONENT_KEY = "mocked_component_name_string";
|
||||||
|
|
||||||
|
@@ -41,7 +41,7 @@ import static org.mockito.Mockito.verify;
|
|||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
@RunWith(SettingsRobolectricTestRunner.class)
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
|
||||||
public class CurrentDreamPreferenceControllerTest {
|
public class CurrentDreamPreferenceControllerTest {
|
||||||
private static String TAG = "CurrentDreamPreferenceControllerTest";
|
private static String TAG = "CurrentDreamPreferenceControllerTest";
|
||||||
|
|
||||||
|
@@ -33,7 +33,7 @@ import static org.mockito.Mockito.mock;
|
|||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
@RunWith(SettingsRobolectricTestRunner.class)
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
|
||||||
public class DreamSettingsTest {
|
public class DreamSettingsTest {
|
||||||
private static final List<String> KEYS = Arrays.asList(
|
private static final List<String> KEYS = Arrays.asList(
|
||||||
DreamSettings.WHILE_CHARGING_ONLY,
|
DreamSettings.WHILE_CHARGING_ONLY,
|
||||||
|
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.verify;
|
|||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
@RunWith(SettingsRobolectricTestRunner.class)
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
|
||||||
public class StartNowPreferenceControllerTest {
|
public class StartNowPreferenceControllerTest {
|
||||||
private StartNowPreferenceController mController;
|
private StartNowPreferenceController mController;
|
||||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||||
|
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.verify;
|
|||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
@RunWith(SettingsRobolectricTestRunner.class)
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
|
||||||
public class WhenToDreamPickerTest {
|
public class WhenToDreamPickerTest {
|
||||||
private WhenToDreamPicker mPicker;
|
private WhenToDreamPicker mPicker;
|
||||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||||
|
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.verify;
|
|||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
@RunWith(SettingsRobolectricTestRunner.class)
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
|
||||||
public class WhenToDreamPreferenceControllerTest {
|
public class WhenToDreamPreferenceControllerTest {
|
||||||
private WhenToDreamPreferenceController mController;
|
private WhenToDreamPreferenceController mController;
|
||||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||||
|
Reference in New Issue
Block a user