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

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

Merge "Move deviceinfo test package to sdk 26"

parents 183674b9 ae2af2e8

tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.net.ConnectivityManager; 
import android.support.v7.preference.Preference;



import com.android.settings.TestConfig;

import com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;

import com.android.settings.testutils.shadow.ShadowConnectivityManager;
@@ -36,6 +37,10 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



/**

 * Deprecated in favor of {@link BasebandVersionDialogController}

 */

@Deprecated

@RunWith(SettingsRobolectricTestRunner.class)

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

        shadows = ShadowConnectivityManager.class)

tests/robotests/src/com/android/settings/deviceinfo/BatteryInfoPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ import org.robolectric.RuntimeEnvironment; 
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 BatteryInfoPreferenceControllerTest {



    private Context mContext;

tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java

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

        shadows = {

                ShadowUtils.class

        })

tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java

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



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java

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

    @Mock

    private Fragment mFragment;