Loading packages/SettingsLib/tests/integ/Android.mk +2 −2 Original line number Diff line number Diff line Loading @@ -31,8 +31,8 @@ LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_USE_AAPT2 := true LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ espresso-core \ androidx.test.rules \ androidx.test.espresso.core \ mockito-target-minus-junit4 \ truth-prebuilt Loading packages/SettingsLib/tests/integ/AndroidManifest.xml +1 −1 Original line number Diff line number Diff line Loading @@ -31,7 +31,7 @@ <activity android:name=".drawer.SettingsDrawerActivityTest$TestActivity"/> </application> <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.settingslib" android:label="Tests for SettingsLib"> </instrumentation> Loading packages/SettingsLib/tests/integ/AndroidTest.xml +1 −1 Original line number Diff line number Diff line Loading @@ -22,7 +22,7 @@ <option name="test-tag" value="SettingsLibTests" /> <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="com.android.settingslib" /> <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/SettingsLib/tests/integ/src/com/android/settingslib/bluetooth/BluetoothEventManagerIntegTest.java +6 −8 Original line number Diff line number Diff line Loading @@ -16,15 +16,10 @@ package com.android.settingslib.bluetooth; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static java.util.concurrent.TimeUnit.SECONDS; import android.app.ActivityManager; import android.content.Context; import android.content.Intent; Loading @@ -32,15 +27,18 @@ import android.content.pm.UserInfo; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; import android.support.test.InstrumentationRegistry; import android.support.test.filters.LargeTest; import android.support.test.runner.AndroidJUnit4; import androidx.test.InstrumentationRegistry; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import static java.util.concurrent.TimeUnit.SECONDS; import java.util.concurrent.CountDownLatch; /** Loading packages/SettingsLib/tests/integ/src/com/android/settingslib/drawable/UserIconDrawableTest.java +3 −2 Original line number Diff line number Diff line Loading @@ -27,8 +27,9 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.PorterDuff.Mode; import android.support.test.InstrumentationRegistry; import android.support.test.runner.AndroidJUnit4; import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; import com.android.settingslib.R; Loading Loading
packages/SettingsLib/tests/integ/Android.mk +2 −2 Original line number Diff line number Diff line Loading @@ -31,8 +31,8 @@ LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_USE_AAPT2 := true LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ espresso-core \ androidx.test.rules \ androidx.test.espresso.core \ mockito-target-minus-junit4 \ truth-prebuilt Loading
packages/SettingsLib/tests/integ/AndroidManifest.xml +1 −1 Original line number Diff line number Diff line Loading @@ -31,7 +31,7 @@ <activity android:name=".drawer.SettingsDrawerActivityTest$TestActivity"/> </application> <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.settingslib" android:label="Tests for SettingsLib"> </instrumentation> Loading
packages/SettingsLib/tests/integ/AndroidTest.xml +1 −1 Original line number Diff line number Diff line Loading @@ -22,7 +22,7 @@ <option name="test-tag" value="SettingsLibTests" /> <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="com.android.settingslib" /> <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/SettingsLib/tests/integ/src/com/android/settingslib/bluetooth/BluetoothEventManagerIntegTest.java +6 −8 Original line number Diff line number Diff line Loading @@ -16,15 +16,10 @@ package com.android.settingslib.bluetooth; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static java.util.concurrent.TimeUnit.SECONDS; import android.app.ActivityManager; import android.content.Context; import android.content.Intent; Loading @@ -32,15 +27,18 @@ import android.content.pm.UserInfo; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; import android.support.test.InstrumentationRegistry; import android.support.test.filters.LargeTest; import android.support.test.runner.AndroidJUnit4; import androidx.test.InstrumentationRegistry; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import static java.util.concurrent.TimeUnit.SECONDS; import java.util.concurrent.CountDownLatch; /** Loading
packages/SettingsLib/tests/integ/src/com/android/settingslib/drawable/UserIconDrawableTest.java +3 −2 Original line number Diff line number Diff line Loading @@ -27,8 +27,9 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.PorterDuff.Mode; import android.support.test.InstrumentationRegistry; import android.support.test.runner.AndroidJUnit4; import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; import com.android.settingslib.R; Loading