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

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

Merge "Rename SDK_VERSION_O to SDK_VERSION"

parents 37e4d92a cbfb099a

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

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



@RunWith(SettingsRobolectricTestRunner.class)

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

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

public class DeviceAdminAddTest {



    private FakeFeatureFactory mFeatureFactory;

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

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ import java.util.List; 
@RunWith(SettingsRobolectricTestRunner.class)

@Config(

        manifest = TestConfig.MANIFEST_PATH,

        sdk = TestConfig.SDK_VERSION_O,

        sdk = TestConfig.SDK_VERSION,

        shadows = {ShadowUtils.class, ShadowConnectivityManager.class, ShadowUserManager.class}

)

public class DeviceInfoSettingsTest {

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

+1 −2
Original line number Diff line number Diff line
@@ -15,13 +15,12 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.util.ReflectionHelpers;



import java.util.ArrayList;

import java.util.List;



@RunWith(SettingsRobolectricTestRunner.class)

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

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

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_O,

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

        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_O)

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

public class LegalSettingsTest {



    @Test