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

Commit a1120587 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 ba749fa2 df5ac0d5

test-runner/tests/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -33,7 +33,10 @@ android_test { 
        "android.test.base",

        "android.test.mock",

    ],

    static_libs: ["junit"],

    static_libs: [

        "junit",

        "androidx.test.rules",

    ],



    // Include all test java files.

    srcs: ["src/**/*.java"],

test-runner/tests/src/android/test/AndroidTestRunnerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
package android.test;



import android.test.mock.MockContext;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;



import junit.framework.AssertionFailedError;

import junit.framework.Test;

test-runner/tests/src/android/test/InstrumentationTestRunnerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ import android.os.Bundle; 
import android.test.mock.MockContext;

import android.test.suitebuilder.ListTestCaseNames;

import android.test.suitebuilder.ListTestCaseNames.TestDescriptor;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;



import junit.framework.Test;

import junit.framework.TestCase;

test-runner/tests/src/android/test/suitebuilder/examples/suppress/PartiallySuppressedTest.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.test.suitebuilder.examples.suppress;



import android.test.suitebuilder.annotation.Suppress;

import androidx.test.filters.Suppress;



import junit.framework.TestCase;

test-runner/tests/src/android/test/suitebuilder/examples/suppress/SuppressedTest.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.test.suitebuilder.examples.suppress;



import android.test.suitebuilder.annotation.Suppress;

import androidx.test.filters.Suppress;



import junit.framework.TestCase;