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

Commit 720c07e5 authored by Brett Chabot's avatar Brett Chabot Committed by Android (Google) Code Review
Browse files

Merge "Migrate frameworks/base/tests/testables and its users to androidx.test"

parents 7b040522 84151d91

packages/ExtServices/tests/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ android_test { 


    static_libs: [

        "ExtServices-core",

        "android-support-test",

        "compatibility-device-util",

        "androidx.test.rules",

        "compatibility-device-util-axt",

        "mockito-target-minus-junit4",

        "espresso-core",

        "androidx.test.espresso.core",

        "truth-prebuilt",

        "testables",

        "testng",

packages/ExtServices/tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        <uses-library android:name="android.test.runner" />

    </application>



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

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

                     android:targetPackage="android.ext.services.tests.unit"

                     android:label="ExtServices Test Cases">

    </instrumentation>

packages/ExtServices/tests/AndroidTest.xml

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

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

        <option name="package" value="android.ext.services.tests.unit" />

        <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>
 
 No newline at end of file

packages/ExtServices/tests/src/android/ext/services/notification/AgingHelperTest.java

+3 −2
Original line number Diff line number Diff line
@@ -39,10 +39,11 @@ import android.os.Build; 
import android.os.Process;

import android.os.UserHandle;

import android.service.notification.StatusBarNotification;

import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;

import android.testing.TestableContext;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

packages/ExtServices/tests/src/android/ext/services/notification/AssistantSettingsTest.java

+3 −2
Original line number Diff line number Diff line
@@ -31,11 +31,12 @@ import android.os.Handler; 
import android.os.Looper;

import android.provider.DeviceConfig;

import android.provider.Settings;

import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;

import android.support.test.uiautomator.UiDevice;

import android.testing.TestableContext;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;



import org.junit.After;