Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
See go/jetpack-test-android-migration

Test: make checkbuild
Change-Id: Ie4e8f36dc8ec8769ccc2a016a1da682adb725966
This commit is contained in:
KOUSHIK PANUGANTI
2018-12-18 14:36:38 -08:00
parent 7af6d12552
commit 1cd0f4354b
8 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsProvider/test/Android.mk
View File

@@ -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

2
packages/SettingsProvider/test/AndroidManifest.xml
View File

@@ -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" />

2
packages/SettingsProvider/test/AndroidTest.xml
View File

@@ -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>

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

@@ -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;

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

@@ -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;

5
packages/SettingsProvider/test/src/com/android/providers/settings/InstallNonMarketAppsDeprecationTest.java
View File

@@ -26,10 +26,11 @@ import android.os.Process;
import android.os.SystemClock;
import android.os.UserManager;
import android.provider.Settings;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.LargeTest;
import android.util.Log;
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.LargeTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

6
packages/SettingsProvider/test/src/com/android/providers/settings/SettingsHelperRestoreTest.java
View File

@@ -24,8 +24,10 @@ import android.content.Context;
import android.net.Uri;
import android.os.Build;
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 org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

11
packages/SettingsProvider/test/src/com/android/providers/settings/SettingsHelperTest.java
View File

@@ -17,19 +17,10 @@
package com.android.providers.settings;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertSame;
import static junit.framework.Assert.assertNull;
import static junit.framework.Assert.fail;
import com.android.internal.app.LocalePicker;
import com.android.providers.settings.SettingsHelper;
import android.os.LocaleList;
import android.support.test.runner.AndroidJUnit4;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;