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

Commit 27f84439 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 11ef8175 f90986b2

services/tests/uiservicestests/src/com/android/server/notification/NotificationShellCmdTest.java

+2 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static junit.framework.Assert.assertSame; 
import static org.hamcrest.Matchers.instanceOf;

import static org.junit.Assert.assertThat;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -43,12 +42,12 @@ import android.os.Handler; 
import android.os.ResultReceiver;

import android.os.ShellCallback;

import android.os.UserHandle;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableContext;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;



import androidx.test.filters.SmallTest;



import com.android.server.UiServiceTestCase;



import org.junit.Before;

tests/testables/tests/src/android/testing/TestableLooperTest.java

+2 −1
Original line number Diff line number Diff line
@@ -30,10 +30,11 @@ import static org.mockito.Mockito.when; 
import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.TestableLooper.MessageHandler;

import android.testing.TestableLooper.RunWithLooper;



import androidx.test.filters.SmallTest;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

tests/testables/tests/src/android/testing/TestableResourcesTest.java

+1 −1
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ import static org.junit.Assert.assertNull; 
import static org.junit.Assert.fail;



import android.content.res.Resources;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;



import com.android.testables.R;

tests/testables/tests/src/android/testing/TestableSettingsProviderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ import android.content.ContentResolver; 
import android.provider.Settings;

import android.provider.Settings.Global;

import android.provider.Settings.Secure;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Before;