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

Commit da5110c4 authored by Brett Chabot's avatar Brett Chabot Committed by android-build-merger
Browse files

Merge "Migrate frameworks/opt/telephony to androidx.test" am: 12fdd883 

am: 148a5954

Change-Id: I0668ef3c806ef4eddc219e157bf2dc97dfddbc19
parents 129c8caa 148a5954

tests/telephonytests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ android_test { 
    ],



    static_libs: [

        "android-support-test",

        "androidx.test.rules",

        "frameworks-base-testutils",

        "guava",

        "mockito-target-minus-junit4",

tests/telephonytests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
            </intent-filter>

        </activity>

    </application>

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

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

        android:targetPackage="com.android.frameworks.telephonytests"

        android:label="Frameworks Telephony Tests">

    </instrumentation>

tests/telephonytests/AndroidTest.xml

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

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

        <option name="package" value="com.android.frameworks.telephonytests" />

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

tests/telephonytests/src/android/telephony/ims/ImsCompatTests.java

+2 −1
Original line number Diff line number Diff line
@@ -21,10 +21,11 @@ import static org.mockito.ArgumentMatchers.eq; 
import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;



import android.support.test.runner.AndroidJUnit4;

import android.telephony.ims.aidl.IImsCallSessionListener;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.runner.AndroidJUnit4;



import com.android.ims.internal.IImsMMTelFeature;



import org.junit.After;

tests/telephonytests/src/android/telephony/ims/ImsFeatureTest.java

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static org.mockito.Mockito.verify; 


import android.os.Parcel;

import android.os.RemoteException;

import android.support.test.runner.AndroidJUnit4;

import android.telephony.ims.aidl.IImsCapabilityCallback;

import android.telephony.ims.feature.CapabilityChangeRequest;

import android.telephony.ims.feature.ImsFeature;
@@ -32,6 +31,8 @@ import android.telephony.ims.feature.MmTelFeature; 
import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.runner.AndroidJUnit4;



import com.android.ims.internal.IImsFeatureStatusCallback;



import org.junit.After;