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

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

Merge "Migrate frameworks/base/core/tests/utiltests to androidx.test"

parents 1ed7dae7 4bb5f3a5
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES += src/android/util/IRemoteMemoryIntArray.aidl
LOCAL_JNI_SHARED_LIBRARIES := libmemoryintarraytest libcutils libc++

LOCAL_STATIC_JAVA_LIBRARIES := \
    android-support-test \
    androidx.test.rules \
    frameworks-base-testutils \
    mockito-target-minus-junit4 \

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@
    </application>

    <instrumentation
        android:name="android.support.test.runner.AndroidJUnitRunner"
        android:name="androidx.test.runner.AndroidJUnitRunner"
        android:targetPackage="com.android.frameworks.utiltests"
        android:label="Frameworks Utility Tests" />

+1 −1
Original line number Diff line number Diff line
@@ -21,4 +21,4 @@ adb wait-for-device

adb install -r -g "$OUT/data/app/FrameworksUtilTests/FrameworksUtilTests.apk"

adb shell am instrument -w "$@" 'com.android.frameworks.utiltests/android.support.test.runner.AndroidJUnitRunner'
adb shell am instrument -w "$@" 'com.android.frameworks.utiltests/androidx.test.runner.AndroidJUnitRunner'
+3 −2
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ package android.util;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;

import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

+3 −2
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ package android.util;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;

import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

Loading