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

Commit be181562 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 27f84439 26fdedb0

services/tests/servicestests/src/com/android/server/DynamicSystemServiceTest.java

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ package com.android.server; 
import android.os.ServiceManager;

import android.os.image.IDynamicSystemService;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.LargeTest;



import androidx.test.filters.LargeTest;



public class DynamicSystemServiceTest extends AndroidTestCase {

    private static final String TAG = "DynamicSystemServiceTests";

services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java

+2 −1
Original line number Diff line number Diff line
@@ -70,9 +70,10 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.test.AndroidTestCase;

import android.test.mock.MockContext;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.Log;



import androidx.test.filters.SmallTest;



import com.android.server.LocalServices;



import org.mockito.ArgumentCaptor;

services/tests/servicestests/src/com/android/server/accounts/AccountsDbTest.java

+1 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals; 
import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;



import static org.mockito.Matchers.anyString;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;
@@ -31,17 +30,16 @@ import android.content.Context; 
import android.database.Cursor;

import android.database.sqlite.SQLiteStatement;

import android.os.Build;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.Pair;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;



import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ import android.platform.test.annotations.Presubmit; 
import android.provider.DeviceConfig;

import android.provider.Settings;

import android.server.wm.settings.SettingsSession;

import android.test.suitebuilder.annotation.LargeTest;

import android.text.TextUtils;

import android.util.KeyValueListParser;

import android.util.Log;
@@ -60,6 +59,7 @@ import android.util.Pair; 


import androidx.test.InstrumentationRegistry;

import androidx.test.filters.FlakyTest;

import androidx.test.filters.LargeTest;

import androidx.test.uiautomator.UiDevice;



import org.junit.Before;

services/tests/servicestests/src/com/android/server/am/ServiceRestarterTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,10 +38,10 @@ import android.os.SystemClock; 
import android.provider.DeviceConfig;

import android.provider.Settings;

import android.server.wm.settings.SettingsSession;

import android.test.suitebuilder.annotation.LargeTest;

import android.util.Log;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.compatibility.common.util.SystemUtil;