PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move datetime package to sdk 26

Browse Source 
Test: make RunSettingsRoboTests -j40
Change-Id: I0b93682625e15a6306f5fbd3409d4a4003beb805
This commit is contained in:
jeffreyhuang
2017-11-27 17:05:06 -08:00
parent eeffbf6225
commit 5e98d62c19
10 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java
View File

@@ -40,7 +40,7 @@ import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowApplication;
@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 AutoTimeFormatPreferenceControllerTest { public class AutoTimeFormatPreferenceControllerTest {
@Mock(answer = RETURNS_DEEP_STUBS) @Mock(answer = RETURNS_DEEP_STUBS)

2
tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
View File

@@ -35,7 +35,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@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 AutoTimePreferenceControllerTest { public class AutoTimePreferenceControllerTest {
@Mock @Mock

2
tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
View File

@@ -39,7 +39,7 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
@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,
shadows = ShadowConnectivityManager.class) shadows = ShadowConnectivityManager.class)
public class AutoTimeZonePreferenceControllerTest { public class AutoTimeZonePreferenceControllerTest {

2
tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
View File

@@ -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 DatePreferenceControllerTest { public class DatePreferenceControllerTest {
@Mock @Mock

2
tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
View File

@@ -39,7 +39,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@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 TimeChangeListenerMixinTest { public class TimeChangeListenerMixinTest {
@Mock @Mock

2
tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
View File

@@ -41,7 +41,7 @@ import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@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 TimeFormatPreferenceControllerTest { public class TimeFormatPreferenceControllerTest {
@Mock(answer = RETURNS_DEEP_STUBS) @Mock(answer = RETURNS_DEEP_STUBS)

2
tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
View File

@@ -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 TimePreferenceControllerTest { public class TimePreferenceControllerTest {
@Mock @Mock

2
tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
View File

@@ -37,7 +37,7 @@ import static org.mockito.Mockito.spy;
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 TimeZonePreferenceControllerTest { public class TimeZonePreferenceControllerTest {
@Mock @Mock

2
tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java
View File

@@ -23,7 +23,7 @@ import java.util.TimeZone;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@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 ZonePickerComparatorTest { public class ZonePickerComparatorTest {
// Strings in Chinese are sorted by alphabet order of their Pinyin. // Strings in Chinese are sorted by alphabet order of their Pinyin.

2
tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
View File

@@ -39,7 +39,7 @@ import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers; import org.robolectric.util.ReflectionHelpers;
@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 ZonePickerTest { public class ZonePickerTest {
private Activity mActivity; private Activity mActivity;