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

Commit ba3f71b3 authored by jeffreyhuang's avatar jeffreyhuang
Browse files

move tests to sdk 26 

Test: make RunSettingsRoboTests -j40
Change-Id: I559b2f45b5121eedecad0cdffba68220f7a4d0cb
parent 7ec34c17

tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import static com.google.common.truth.Truth.assertThat; 
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 UserFeatureProviderImplTest {

    public static final int FIRST_USER_ID = 0;

    public static final int SECOND_USER_ID = 4;

tests/robotests/src/com/android/settings/users/UserPreferenceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import org.robolectric.annotation.Config; 
import org.robolectric.util.ReflectionHelpers;



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



    @Mock

tests/robotests/src/com/android/settings/users/UserSettingsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import org.robolectric.Robolectric; 
import org.robolectric.annotation.Config;



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



    @Mock private UserManager mUserManager;

tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import org.robolectric.annotation.Config; 
import static com.google.common.truth.Truth.assertThat;



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



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.annotation.Config;



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



    @Mock