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

Commit 5999f5d8 authored by Jeffrey Huang's avatar Jeffrey Huang Committed by Android (Google) Code Review
Browse files

Merge "Move accounts package tests to sdk 26"

parents 7c18a206 90f59be2

tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ import org.robolectric.annotation.Implements; 
@RunWith(SettingsRobolectricTestRunner.class)

@Config(

    manifest = TestConfig.MANIFEST_PATH,

    sdk = TestConfig.SDK_VERSION,

    sdk = TestConfig.SDK_VERSION_O,

    shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class

)

public class AccountHeaderPreferenceControllerTest {

tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,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,

        shadows = {ShadowAccountManager.class, ShadowContentResolver.class})

public class AccountPreferenceControllerTest {

tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java

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



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class AccountPreferenceTest {



    private Context mContext;

tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ import org.robolectric.annotation.Config; 
import org.robolectric.shadows.ShadowApplication;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,

        shadows = {ShadowAccountManager.class, ShadowContentResolver.class})

public class AccountSyncPreferenceControllerTest {

tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,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 AccountTypePreferenceLoaderTest {



    @Mock(answer = RETURNS_DEEP_STUBS)