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

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

Merge "Migrate... 

Merge "Migrate frameworks/base/core/tests/hosttests/test-apps/MultiDexLegacyAndException to androidx.test"
parents b8edee56 c3e6e067

core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir) 
## The application with a minimal main dex

include $(CLEAR_VARS)



LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex android-support-multidex-instrumentation android-support-test

LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex android-support-multidex-instrumentation androidx.test.rules

LOCAL_MODULE_TAGS := tests



LOCAL_SRC_FILES := $(call all-java-files-under, src)

core/tests/hosttests/test-apps/MultiDexLegacyAndException/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
                     android:targetPackage="com.android.multidexlegacyandexception"

                     android:label="Test for MultiDexLegacyAndException" />



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

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

                     android:targetPackage="com.android.multidexlegacyandexception"

                     android:label="Test for MultiDexLegacyAndException" />

</manifest>

core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/tests/MultiDexAndroidJUnitRunner.java

+2 −1
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ 
package com.android.multidexlegacyandexception.tests;



import android.os.Bundle;



import androidx.multidex.MultiDex;

import android.support.test.runner.AndroidJUnitRunner;

import androidx.test.runner.AndroidJUnitRunner;



public class MultiDexAndroidJUnitRunner extends AndroidJUnitRunner {

core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/tests/NoActivityJUnit4Test.java

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


package com.android.multidexlegacyandexception.tests;



import android.support.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;



import org.junit.runner.RunWith;



/**