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

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

Merge "Migrate remainder of frameworks/base to androidx.test"

parents 24fe2cc7 502ec7ae

core/tests/BroadcastRadioTests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ LOCAL_MODULE_TAGS := tests 
# LOCAL_SDK_VERSION := current

LOCAL_PRIVATE_PLATFORM_APIS := true



LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util androidx.test.rules testng

LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util-axt androidx.test.rules testng



LOCAL_JAVA_LIBRARIES := android.test.base

keystore/tests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test

    androidx.test.rules hamcrest-library



LOCAL_PACKAGE_NAME := KeystoreTests

LOCAL_PRIVATE_PLATFORM_APIS := true

keystore/tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,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.security.tests"

        android:label="Tests for Keystore">

    </instrumentation>

keystore/tests/src/android/security/ParcelableKeyGenParameterSpecTest.java

+8 −4
Original line number Diff line number Diff line
@@ -22,16 +22,20 @@ import static org.junit.Assert.assertThat; 


import android.os.Parcel;

import android.security.keystore.KeyGenParameterSpec;

import android.security.keystore.ParcelableKeyGenParameterSpec;

import android.security.keystore.KeyProperties;

import android.support.test.runner.AndroidJUnit4;

import android.security.keystore.ParcelableKeyGenParameterSpec;



import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;



import java.math.BigInteger;

import java.security.spec.ECGenParameterSpec;

import java.security.spec.RSAKeyGenParameterSpec;

import java.util.Date;



import javax.security.auth.x500.X500Principal;

import org.junit.Test;

import org.junit.runner.RunWith;



/** Unit tests for {@link ParcelableKeyGenParameterSpec}. */

@RunWith(AndroidJUnit4.class)

keystore/tests/src/android/security/keystore/KeyGenParameterSpecTest.java

+4 −2
Original line number Diff line number Diff line
@@ -20,10 +20,12 @@ import static org.hamcrest.Matchers.is; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertThat;



import android.security.ParcelableKeyGenParameterSpecTest;

import android.security.keystore.KeyGenParameterSpec;

import android.security.keystore.KeyProperties;

import android.security.ParcelableKeyGenParameterSpecTest;

import android.support.test.runner.AndroidJUnit4;



import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;