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

Commit efbb6114 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/MultiDexLegacyTestServicesTests2 to androidx.test"
parents b9b73aee c8098c9f

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 
LOCAL_PACKAGE_NAME := MultiDexLegacyTestServicesTests2



LOCAL_JAVA_LIBRARIES := android-support-multidex

LOCAL_STATIC_JAVA_LIBRARIES := android-support-test

LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules



LOCAL_SDK_VERSION := 9

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    <uses-sdk android:minSdkVersion="9" />

    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>

    <instrumentation

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

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

        android:targetPackage="com.android.framework.multidexlegacytestservices" />



    <application

core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/src/com/android/framework/multidexlegacytestservices/test2/ServicesTests.java

+11 −7
Original line number Diff line number Diff line
@@ -19,22 +19,26 @@ package com.android.framework.multidexlegacytestservices.test2; 
import android.app.ActivityManager;

import android.content.Context;

import android.content.Intent;

import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;

import android.util.Log;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import junit.framework.Assert;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;



import java.io.File;

import java.io.FileFilter;

import java.io.IOException;

import java.io.RandomAccessFile;

import java.util.concurrent.TimeoutException;

import junit.framework.Assert;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;



/**

 * Run the tests with: <code>adb shell am instrument -w

 * com.android.framework.multidexlegacytestservices.test2/android.support.test.runner.AndroidJUnitRunner

 * com.android.framework.multidexlegacytestservices.test2/androidx.test.runner.AndroidJUnitRunner

 * </code>

 */

@RunWith(AndroidJUnit4.class)