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

Commit 4c40fd30 authored by Fangqiu Su's avatar Fangqiu Su Committed by Android (Google) Code Review
Browse files

Merge "Update the imports to androidx.test.filters.*" into main

parents fd6e4f8a 7dfb2a18

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ android_library { 
        "settings-logtags",

        "settings-telephony-protos-lite",

        "statslog-settings",

        "androidx.test.rules",

    ],



    plugins: ["androidx.room_room-compiler-plugin"],

tests/legacy_unit/src/com/android/settings/UserCredentialsTest.java

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ import static com.android.settings.UserCredentialsSettings.Credential; 
import android.os.Parcel;

import android.os.Process;

import android.test.InstrumentationTestCase;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;



/**

 * User credentials settings fragment tests

tests/legacy_unit/src/com/android/settings/UtilsTest.java

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ import android.content.pm.UserInfo; 
import android.os.UserHandle;

import android.os.UserManager;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;



import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

tests/legacy_unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java

+2 −1
Original line number Diff line number Diff line
@@ -17,10 +17,11 @@ 
package com.android.settings.bluetooth;



import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;

import android.text.InputFilter;

import android.text.SpannableStringBuilder;



import androidx.test.filters.SmallTest;



public class Utf8ByteLengthFilterTest extends AndroidTestCase {



    @SmallTest

tests/legacy_unit/src/com/android/settings/vpn2/AppSettingsTest.java

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ import android.content.Context; 
import android.content.pm.ApplicationInfo;

import android.os.Process;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;



import org.mockito.Mock;

import org.mockito.MockitoAnnotations;