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

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

Merge "Move some tests to sdk version o"

parents 1ba7f8b2 c47d806d

tests/robotests/src/com/android/settings/DeviceAdminAddTest.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import static org.mockito.Matchers.eq; 
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 DeviceAdminAddTest {



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/DisplaySettingsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import java.util.ArrayList; 
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 DisplaySettingsTest {



    @Test

tests/robotests/src/com/android/settings/HelpTrampolineTest.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.robolectric.Shadows.shadowOf;



@RunWith(SettingsRobolectricTestRunner.class)

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

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

        shadows = {

                ShadowHelpUtils.class

        })

tests/robotests/src/com/android/settings/LegalSettingsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import java.util.List; 
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 LegalSettingsTest {



    @Test

tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import org.robolectric.annotation.Config; 
import org.xmlpull.v1.XmlPullParserException;



@RunWith(SettingsRobolectricTestRunner.class)

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

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

public class LicenseHtmlGeneratorFromXmlTest {

    private static final String VAILD_XML_STRING =

            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +