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

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

Merge "move support test package to sdk 26"

parents b5931a66 7d6a96e4

tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java

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



@RunWith(SettingsRobolectricTestRunner.class)

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

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

public class NewDeviceIntroSuggestionActivityTest {



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/support/SupportConfigTest.java

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



    @Test

tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java

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



@RunWith(SettingsRobolectricTestRunner.class)

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

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

public class SupportDashboardActivityTest {



    private Context mContext;

tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.when; 
import static org.robolectric.shadow.api.Shadow.directlyOn;



@RunWith(SettingsRobolectricTestRunner.class)

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

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

        shadows = {SupportDisclaimerShadowResources.class})

public class SupportDisclaimerDialogFragmentTest {