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

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

Merge "Migrate frameworks/base/packages/SettingsProvider/test to androidx.test"

parents 20a1afd9 1cd0f435

packages/SettingsProvider/test/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) \ 
    ../src/com/android/providers/settings/SettingsState.java \

    ../src/com/android/providers/settings/SettingsHelper.java



LOCAL_STATIC_JAVA_LIBRARIES := android-support-test

LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules



LOCAL_JAVA_LIBRARIES := android.test.base

packages/SettingsProvider/test/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
    </application>



    <instrumentation

        android:name="android.support.test.runner.AndroidJUnitRunner"

        android:name="androidx.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.providers.setting.test"

        android:label="Settings Provider Tests" />

packages/SettingsProvider/test/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    <option name="test-tag" value="SettingsProviderTest" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.providers.setting.test" />

        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>

</configuration>

packages/SettingsProvider/test/src/com/android/providers/settings/BaseSettingsProviderTest.java

+5 −2
Original line number Diff line number Diff line
@@ -25,9 +25,12 @@ import android.net.Uri; 
import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;

import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import libcore.io.Streams;



import org.junit.runner.RunWith;



import java.io.FileInputStream;

packages/SettingsProvider/test/src/com/android/providers/settings/DeviceConfigServiceTest.java

+3 −2
Original line number Diff line number Diff line
@@ -24,8 +24,9 @@ import android.content.ContentResolver; 
import android.os.Bundle;

import android.provider.DeviceConfig;

import android.provider.Settings;

import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import libcore.io.Streams;