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

Commit d8afa0d3 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 05f1c1f4 c52c7150

tests/SurfaceComposition/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ android_test { 
        enabled: false,

    },

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

    static_libs: ["junit"],

    static_libs: [

        "junit",

        "androidx.test.rules",

    ],

    libs: [

        "android.test.runner.stubs",

        "android.test.base.stubs",

tests/SurfaceComposition/src/android/surfacecomposition/SurfaceCompositionTest.java

+2 −1
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ import android.os.Bundle; 
import android.surfacecomposition.SurfaceCompositionMeasuringActivity.AllocationScore;

import android.surfacecomposition.SurfaceCompositionMeasuringActivity.CompositorScore;

import android.test.ActivityInstrumentationTestCase2;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.Log;



import androidx.test.filters.SmallTest;



public class SurfaceCompositionTest extends

        ActivityInstrumentationTestCase2<SurfaceCompositionMeasuringActivity> {

    private final static String TAG = "SurfaceCompositionTest";