Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed3c6e57 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move dream test package to sdk 26"

parents 80845be7 5e5bb279

tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



@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 {

    private static String COMPONENT_KEY = "mocked_component_name_string";

tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



@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 {

    private static String TAG = "CurrentDreamPreferenceControllerTest";

tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import static org.mockito.Mockito.mock; 
import static org.mockito.Mockito.when;



@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 {

    private static final List<String> KEYS = Arrays.asList(

            DreamSettings.WHILE_CHARGING_ONLY,

tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



@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 {

    private StartNowPreferenceController mController;

    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



@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 {

    private WhenToDreamPicker mPicker;

    @Mock(answer = Answers.RETURNS_DEEP_STUBS)