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

Commit 33756f10 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 31d18e5b b58fa977

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ android_library { 
        "SystemUICustomizationTestUtils",

        "androidx.compose.runtime_runtime",

        "kosmos",

        "androidx.test.rules",

    ],

    libs: [

        "android.test.runner",

packages/SystemUI/tests/src/com/android/keyguard/AuthKeyguardMessageAreaTest.java

+2 −1
Original line number Diff line number Diff line
@@ -18,11 +18,12 @@ package com.android.keyguard; 


import static com.google.common.truth.Truth.assertThat;



import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper.RunWithLooper;

import android.view.View;



import androidx.test.filters.SmallTest;



import com.android.systemui.SysuiTestCase;



import org.junit.Before;

packages/SystemUI/tests/src/com/android/keyguard/BouncerPanelExpansionCalculatorTest.kt

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


package com.android.keyguard



import android.test.suitebuilder.annotation.SmallTest

import androidx.test.filters.SmallTest

import android.testing.AndroidTestingRunner

import com.android.systemui.SysuiTestCase

import com.google.common.truth.Truth.assertThat

packages/SystemUI/tests/src/com/android/keyguard/CarrierTextManagerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -50,10 +50,11 @@ import android.telephony.ServiceState; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.text.TextUtils;



import androidx.test.filters.SmallTest;



import com.android.keyguard.logging.CarrierTextManagerLogger;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.keyguard.WakefulnessLifecycle;

packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchTest.java

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.mock; 
import static org.mockito.Mockito.when;



import android.content.Context;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper.RunWithLooper;

import android.util.AttributeSet;
@@ -40,6 +39,8 @@ import android.view.ViewGroup; 
import android.widget.FrameLayout;

import android.widget.TextView;



import androidx.test.filters.SmallTest;



import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.plugins.clocks.ClockController;