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

Commit 623db3ce authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I97552d0a,Ic77e586f into main 

* changes:
  Fail any SysuiTestCase that leaks a Log.wtf
  Prevent more unexpected Log.wtf calls
parents 91a4647e 0e7d837c

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java

+0 −4
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ import com.android.systemui.flags.DisableSceneContainer; 
import com.android.systemui.flags.EnableSceneContainer;

import com.android.systemui.flags.FakeFeatureFlagsClassic;

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;

import com.android.systemui.log.LogWtfHandlerRule;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.recents.LauncherProxyService;

import com.android.systemui.settings.UserTracker;
@@ -108,7 +107,6 @@ import kotlinx.coroutines.flow.StateFlow; 


import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -207,8 +205,6 @@ public class NotificationLockscreenUserManagerTest extends SysuiTestCase { 
    private final FakeExecutor mBackgroundExecutor = new FakeExecutor(mFakeSystemClock);

    private final Executor mMainExecutor = Runnable::run; // Direct executor



    @Rule public final LogWtfHandlerRule wtfHandlerRule = new LogWtfHandlerRule();



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

packages/SystemUI/tests/src/com/android/systemui/recents/LauncherProxyServiceTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ class LauncherProxyServiceTest : SysuiTestCase() { 
        `when`(userManager.isVisibleBackgroundUsersSupported()).thenReturn(true)

        `when`(userManager.isUserForeground()).thenReturn(true)

        val spyContext = spy(context)

        val ops = createLauncherProxyService(spyContext)

        val ops = assertLogsWtf { createLauncherProxyService(spyContext) }.result

        ops.startConnectionToCurrentUser()

        verify(spyContext, times(0)).bindServiceAsUser(any(), any(), anyInt(), any())

    }

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt

+4 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.LOCKSCREEN 
import com.android.systemui.keyguard.shared.model.TransitionStep

import com.android.systemui.kosmos.testDispatcher

import com.android.systemui.kosmos.testScope

import com.android.systemui.log.assertLogsWtf

import com.android.systemui.qs.flags.QSComposeFragment

import com.android.systemui.res.R

import com.android.systemui.scene.ui.view.WindowRootViewKeyEventHandler
@@ -413,7 +414,9 @@ class NotificationShadeWindowViewControllerTest(flags: FlagsParameterization) : 


            // THEN move is ignored, down is handled, and window is notified

            assertThat(interactionEventHandler.handleDispatchTouchEvent(MOVE_EVENT)).isFalse()

            assertLogsWtf {

                assertThat(interactionEventHandler.handleDispatchTouchEvent(DOWN_EVENT)).isTrue()

            }

            verify(notificationShadeWindowController).setLaunchingActivity(false)

        }

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar.notification.row; 


import static android.app.Flags.FLAG_NOTIFICATIONS_REDESIGN_TEMPLATES;



import static com.android.systemui.log.LogAssertKt.assertRunnableLogsWtf;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL;

import static com.android.systemui.statusbar.notification.row.NotificationTestHelper.PKG;

import static com.android.systemui.statusbar.notification.row.NotificationTestHelper.USER_HANDLE;
@@ -1147,7 +1148,7 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { 
    public void hasStatusBarChipDuringHeadsUpAnimation_flagOff_false() throws Exception {

        final ExpandableNotificationRow row = mNotificationTestHelper.createRow();



        row.setHasStatusBarChipDuringHeadsUpAnimation(true);

        assertRunnableLogsWtf(() -> row.setHasStatusBarChipDuringHeadsUpAnimation(true));



        assertThat(row.hasStatusBarChipDuringHeadsUpAnimation()).isFalse();

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationCustomContentMemoryVerifierTest.java

+5 −2
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import androidx.test.filters.SmallTest; 


import com.android.server.notification.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.log.LogAssertKt;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder;
@@ -173,8 +174,10 @@ public class NotificationCustomContentMemoryVerifierTest extends SysuiTestCase { 
    public void satisfiesMemoryLimits_viewWithoutCustomNotificationRoot_returnsTrue() {

        NotificationEntry entry = new NotificationEntryBuilder().build();

        View view = new FrameLayout(mContext);

        LogAssertKt.assertRunnableLogsWtf(() -> {

            assertThat(NotificationCustomContentMemoryVerifier.satisfiesMemoryLimits(view, entry))

                    .isTrue();

        });

    }



    @Test