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

Commit 4e536b85 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/MultiDexLegacyTestAppTests2 to androidx.test"
parents 0bc8d911 e33bbce9

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

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir) 
## The tests with only one dex

include $(CLEAR_VARS)



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

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

LOCAL_MODULE_TAGS := tests



LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -41,7 +41,7 @@ include $(BUILD_PACKAGE) 
## The tests with a minimal main dex

include $(CLEAR_VARS)



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

LOCAL_STATIC_JAVA_LIBRARIES := 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/MultiDexLegacyTestAppTests2/src/com/android/multidexlegacytestapp/test2/InstrumentationTest.java

+4 −1
Original line number Diff line number Diff line
@@ -15,10 +15,13 @@ 
 */

package com.android.multidexlegacytestapp.test2;



import android.support.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;



import com.android.multidexlegacytestapp.manymethods.Big001;

import com.android.multidexlegacytestapp.manymethods.Big079;



import junit.framework.Assert;



import org.junit.Test;

import org.junit.runner.RunWith;

core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/src/com/android/multidexlegacytestapp/test2/MultiDexAndroidJUnitRunner.java

+2 −1
Original line number Diff line number Diff line 
package com.android.multidexlegacytestapp.test2;



import android.os.Bundle;



import androidx.multidex.MultiDex;

import android.support.test.runner.AndroidJUnitRunner;

import androidx.test.runner.AndroidJUnitRunner;



public class MultiDexAndroidJUnitRunner extends AndroidJUnitRunner {