Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Migrate frameworks/base/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2 to androidx.test"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-11 01:21:48 +00:00
committed by Android (Google) Code Review
parent 0bc8d9118a e33bbce92b
commit 4e536b855e
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.mk
View File

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

5
core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/src/com/android/multidexlegacytestapp/test2/InstrumentationTest.java
View File

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

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

@@ -1,8 +1,9 @@
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 {