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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-12-19 08:10:24 +00:00
committed by Android (Google) Code Review
parent 1ed7dae754 4bb5f3a58e
commit 86d7c4d4da
8 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tests/utiltests/Android.mk
View File

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

2
core/tests/utiltests/AndroidManifest.xml
View File

@@ -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" />

2
core/tests/utiltests/runtests.sh
View File

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

5
core/tests/utiltests/src/android/util/IntArrayTest.java
View File

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

5
core/tests/utiltests/src/android/util/LongArrayTest.java
View File

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

5
core/tests/utiltests/src/android/util/MemoryIntArrayTest.java
View File

@@ -24,8 +24,11 @@ import static org.junit.Assert.fail;
import android.os.Parcel;
import android.os.ParcelFileDescriptor;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.runner.AndroidJUnit4;
import libcore.io.IoUtils;
import org.junit.Test;
import org.junit.runner.RunWith;

3
core/tests/utiltests/src/android/util/RemoteIntArray.java
View File

@@ -24,7 +24,8 @@ import android.os.Build;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.SystemClock;
import android.support.test.InstrumentationRegistry;
import androidx.test.InstrumentationRegistry;
import java.io.Closeable;
import java.io.IOException;

9
core/tests/utiltests/src/com/android/internal/util/LockPatternUtilsTest.java
View File

@@ -29,11 +29,12 @@ import android.content.ContextWrapper;
import android.content.pm.UserInfo;
import android.os.UserManager;
import android.provider.Settings;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import android.test.mock.MockContentResolver;
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.internal.util.test.FakeSettingsProvider;
import com.android.internal.widget.ILockSettings;
import com.android.internal.widget.LockPatternUtils;