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

Commit 3b851500 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 4cb7b55f 4c35c95f

test-runner/src/android/test/InstrumentationTestRunner.java

+12 −12
Original line number Diff line number Diff line
@@ -16,9 +16,7 @@ 


package android.test;



import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.SmallTest;

import com.android.internal.util.Predicate;

import static android.test.suitebuilder.TestPredicates.hasAnnotation;



import android.app.Activity;

import android.app.Instrumentation;
@@ -29,16 +27,11 @@ import android.test.suitebuilder.TestMethod; 
import android.test.suitebuilder.TestPredicates;

import android.test.suitebuilder.TestSuiteBuilder;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.Log;



import java.io.ByteArrayOutputStream;

import java.io.File;

import java.io.PrintStream;

import java.lang.annotation.Annotation;

import java.lang.reflect.InvocationTargetException;

import java.lang.reflect.Method;

import java.util.ArrayList;

import java.util.List;

import com.android.internal.util.Predicate;



import junit.framework.AssertionFailedError;

import junit.framework.Test;
@@ -49,7 +42,14 @@ import junit.framework.TestSuite; 
import junit.runner.BaseTestRunner;

import junit.textui.ResultPrinter;



import static android.test.suitebuilder.TestPredicates.hasAnnotation;

import java.io.ByteArrayOutputStream;

import java.io.File;

import java.io.PrintStream;

import java.lang.annotation.Annotation;

import java.lang.reflect.InvocationTargetException;

import java.lang.reflect.Method;

import java.util.ArrayList;

import java.util.List;



/**

 * An {@link Instrumentation} that runs various types of {@link junit.framework.TestCase}s against

test-runner/src/android/test/suitebuilder/TestPredicates.java

+2 −0
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ package android.test.suitebuilder; 
import android.test.InstrumentationTestCase;

import android.test.suitebuilder.annotation.Smoke;

import android.test.suitebuilder.annotation.Suppress;



import com.android.internal.util.Predicate;



import java.lang.annotation.Annotation;



/**

tests/CoreTests/android/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -16,5 +16,8 @@ android_test { 
        "android.test.base.stubs",

    ],

    sdk_version: "current",

    static_libs: ["junit"],

    static_libs: [

        "junit",

        "androidx.test.rules",

    ],

}

tests/CoreTests/android/core/RequestAPITest.java

+2 −1
Original line number Diff line number Diff line
@@ -19,10 +19,11 @@ package android.core; 
import android.net.http.RequestHandle;

import android.net.http.RequestQueue;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.Suppress;

import android.util.Log;

import android.webkit.CookieSyncManager;



import androidx.test.filters.Suppress;



import java.io.ByteArrayInputStream;

import java.io.InputStream;

import java.util.HashMap;