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

move tests to sdk 26

Browse Source 
Test: make RunSettingsRoboTests -j40
Change-Id: I559b2f45b5121eedecad0cdffba68220f7a4d0cb
This commit is contained in:
jeffreyhuang
2017-12-01 15:23:19 -08:00
parent 7ec34c1781
commit ba3f71b355
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
View File

@@ -37,7 +37,7 @@ import static com.google.common.truth.Truth.assertThat;
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 UserFeatureProviderImplTest { public class UserFeatureProviderImplTest {
public static final int FIRST_USER_ID = 0; public static final int FIRST_USER_ID = 0;
public static final int SECOND_USER_ID = 4; public static final int SECOND_USER_ID = 4;

2
tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
View File

@@ -38,7 +38,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 UserPreferenceTest { public class UserPreferenceTest {
@Mock @Mock

2
tests/robotests/src/com/android/settings/users/UserSettingsTest.java
View File

@@ -40,7 +40,7 @@ import org.robolectric.Robolectric;
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)
public class UserSettingsTest { public class UserSettingsTest {
@Mock private UserManager mUserManager; @Mock private UserManager mUserManager;

2
tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
View File

@@ -32,7 +32,7 @@ import org.robolectric.annotation.Config;
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 LocalClassLoaderContextThemeWrapperTest { public class LocalClassLoaderContextThemeWrapperTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)

2
tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
View File

@@ -33,7 +33,7 @@ import org.mockito.MockitoAnnotations;
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)
public class AppDialogFragmentTest { public class AppDialogFragmentTest {
@Mock @Mock

2
tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
View File

@@ -32,7 +32,7 @@ import static org.mockito.Mockito.when;
* Tests for {@link VpnUtils}. * Tests for {@link VpnUtils}.
*/ */
@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 final class VpnUtilsTest { public final class VpnUtilsTest {
@Test @Test
public void testIsAlwaysOnVpnSet() { public void testIsAlwaysOnVpnSet() {

2
tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
View File

@@ -42,7 +42,7 @@ import org.mockito.MockitoAnnotations;
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)
public class WifiDisplaySettingsTest { public class WifiDisplaySettingsTest {
@Mock @Mock