Merge "Use Kosmos for jank tracker in tests" into main (7e37a4b0) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -20,16 +20,18 @@ import static org.mockito.Mockito.atLeast;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		import static kotlinx.coroutines.flow.FlowKt.emptyFlow;

		import android.view.View;
		import android.view.ViewTreeObserver;
		import android.widget.FrameLayout;

		import com.android.internal.jank.InteractionJankMonitor;
		import com.android.keyguard.logging.KeyguardLogger;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository;
		import com.android.systemui.keyguard.domain.interactor.KeyguardInteractorFactory;
		import com.android.systemui.kosmos.KosmosJavaAdapter;
		import com.android.systemui.power.data.repository.FakePowerRepository;
		import com.android.systemui.power.domain.interactor.PowerInteractorFactory;
		import com.android.systemui.res.R;
		@@ -46,6 +48,7 @@ import org.mockito.MockitoAnnotations;

		public class KeyguardStatusViewControllerBaseTest extends SysuiTestCase {

		private KosmosJavaAdapter mKosmos;
		@Mock protected KeyguardStatusView mKeyguardStatusView;

		@Mock protected KeyguardSliceViewController mKeyguardSliceViewController;
		@@ -57,7 +60,6 @@ public class KeyguardStatusViewControllerBaseTest extends SysuiTestCase {
		@Mock protected ScreenOffAnimationController mScreenOffAnimationController;
		@Mock protected KeyguardLogger mKeyguardLogger;
		@Mock protected KeyguardStatusViewController mControllerMock;
		@Mock protected InteractionJankMonitor mInteractionJankMonitor;
		@Mock protected ViewTreeObserver mViewTreeObserver;
		@Mock protected DumpManager mDumpManager;
		protected FakeKeyguardRepository mFakeKeyguardRepository;
		@@ -71,6 +73,7 @@ public class KeyguardStatusViewControllerBaseTest extends SysuiTestCase {

		@Before
		public void setup() {
		mKosmos = new KosmosJavaAdapter(this);
		MockitoAnnotations.initMocks(this);

		KeyguardInteractorFactory.WithDependencies deps = KeyguardInteractorFactory.create();
		@@ -87,7 +90,7 @@ public class KeyguardStatusViewControllerBaseTest extends SysuiTestCase {
		mDozeParameters,
		mScreenOffAnimationController,
		mKeyguardLogger,
		mInteractionJankMonitor,
		mKosmos.getInteractionJankMonitor(),
		deps.getKeyguardInteractor(),
		mDumpManager,
		PowerInteractorFactory.create(

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -135,6 +135,7 @@ import com.android.systemui.deviceentry.shared.model.ErrorFaceAuthenticationStat
		import com.android.systemui.deviceentry.shared.model.FaceDetectionStatus;
		import com.android.systemui.deviceentry.shared.model.FailedFaceAuthenticationStatus;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.kosmos.KosmosJavaAdapter;
		import com.android.systemui.log.SessionTracker;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.settings.UserTracker;
		@@ -195,7 +196,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
		DATA_ROAMING_DISABLE, null, null, null, null, false, null, "", false, TEST_GROUP_UUID,
		TEST_CARRIER_ID, PROFILE_CLASS_PROVISIONING);
		private static final int FINGERPRINT_SENSOR_ID = 1;

		private KosmosJavaAdapter mKosmos;
		@Mock
		private UserTracker mUserTracker;
		@Mock
		@@ -240,7 +241,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
		private AuthController mAuthController;
		@Mock
		private TelephonyListenerManager mTelephonyListenerManager;
		@Mock
		private InteractionJankMonitor mInteractionJankMonitor;
		@Mock
		private LatencyTracker mLatencyTracker;
		@@ -300,6 +300,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {

		@Before
		public void setup() throws RemoteException {
		mKosmos = new KosmosJavaAdapter(this);
		mInteractionJankMonitor = mKosmos.getInteractionJankMonitor();
		MockitoAnnotations.initMocks(this);
		when(mSessionTracker.getSessionId(SESSION_KEYGUARD)).thenReturn(mKeyguardInstanceId);

packages/SystemUI/tests/src/com/android/systemui/animation/DialogTransitionAnimatorTest.kt

+3 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ import androidx.test.filters.SmallTest
		import com.android.internal.jank.InteractionJankMonitor
		import com.android.internal.policy.DecorView
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.jank.interactionJankMonitor
		import com.android.systemui.kosmos.Kosmos
		import com.google.common.truth.Truth.assertThat
		import junit.framework.Assert.assertEquals
		import junit.framework.Assert.assertFalse
		@@ -31,7 +33,6 @@ import org.junit.Before
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.Mock
		import org.mockito.Mockito.any
		import org.mockito.Mockito.verify
		import org.mockito.junit.MockitoJUnit
		@@ -43,7 +44,7 @@ class DialogTransitionAnimatorTest : SysuiTestCase() {
		private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator
		private val attachedViews = mutableSetOf<View>()

		@Mock lateinit var interactionJankMonitor: InteractionJankMonitor
		val interactionJankMonitor = Kosmos().interactionJankMonitor
		@get:Rule val rule = MockitoJUnit.rule()

		@Before

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ import android.view.WindowManager;
		import androidx.test.filters.SmallTest;

		import com.android.internal.foldables.FoldGracePeriodProvider;
		import com.android.internal.jank.InteractionJankMonitor;
		import com.android.internal.logging.InstanceId;
		import com.android.internal.logging.UiEventLogger;
		import com.android.internal.widget.LockPatternUtils;
		@@ -181,7 +180,6 @@ public class KeyguardViewMediatorTest extends SysuiTestCase {
		private @Mock NotificationShadeDepthController mNotificationShadeDepthController;
		private @Mock KeyguardUnlockAnimationController mKeyguardUnlockAnimationController;
		private @Mock ScreenOffAnimationController mScreenOffAnimationController;
		private @Mock InteractionJankMonitor mInteractionJankMonitor;
		private @Mock ScreenOnCoordinator mScreenOnCoordinator;
		private @Mock KeyguardTransitions mKeyguardTransitions;
		private @Mock ShadeController mShadeController;
		@@ -235,8 +233,6 @@ public class KeyguardViewMediatorTest extends SysuiTestCase {
		when(mLockPatternUtils.getDevicePolicyManager()).thenReturn(mDevicePolicyManager);
		when(mPowerManager.newWakeLock(anyInt(), any())).thenReturn(mock(WakeLock.class));
		when(mPowerManager.isInteractive()).thenReturn(true);
		when(mInteractionJankMonitor.begin(any(), anyInt())).thenReturn(true);
		when(mInteractionJankMonitor.end(anyInt())).thenReturn(true);
		mContext.addMockSystemService(Context.ALARM_SERVICE, mAlarmManager);
		final ViewRootImpl testViewRoot = mock(ViewRootImpl.class);
		when(testViewRoot.getView()).thenReturn(mock(View.class));
		@@ -1245,7 +1241,7 @@ public class KeyguardViewMediatorTest extends SysuiTestCase {
		() -> mNotificationShadeDepthController,
		mScreenOnCoordinator,
		mKeyguardTransitions,
		mInteractionJankMonitor,
		mKosmos.getInteractionJankMonitor(),
		mDreamOverlayStateController,
		mJavaAdapter,
		mWallpaperRepository,

packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.systemui.shade;

		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyInt;
		import static org.mockito.Mockito.doAnswer;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.when;
		@@ -289,10 +288,6 @@ public class QuickSettingsControllerImplBaseTest extends SysuiTestCase {

		when(mNotificationRemoteInputManager.isRemoteInputActive())
		.thenReturn(false);
		when(mInteractionJankMonitor.begin(any(), anyInt()))
		.thenReturn(true);
		when(mInteractionJankMonitor.end(anyInt()))
		.thenReturn(true);

		when(mPanelView.getParent()).thenReturn(mPanelViewParent);
		when(mQs.getHeader()).thenReturn(mQsHeader);