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

Commit 26e4b568 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add KeyguardCoordinatorTest cases" into tm-qpr-dev

parents 1ced89ac 5544394a

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java

+11 −17
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 


package com.android.systemui.statusbar.notification.collection.coordinator;



import com.android.keyguard.KeyguardUpdateMonitor;

import androidx.annotation.NonNull;



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

import com.android.systemui.statusbar.StatusBarState;

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

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

import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope;

import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter;

import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider;

import com.android.systemui.statusbar.notification.interruption.KeyguardNotificationVisibilityProvider;

import com.android.systemui.statusbar.notification.collection.provider.SectionHeaderVisibilityProvider;

import com.android.systemui.statusbar.notification.interruption.KeyguardNotificationVisibilityProvider;



import javax.inject.Inject;
@@ -36,27 +36,21 @@ import javax.inject.Inject; 
@CoordinatorScope

public class KeyguardCoordinator implements Coordinator {

    private static final String TAG = "KeyguardCoordinator";

    private final StatusBarStateController mStatusBarStateController;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private final HighPriorityProvider mHighPriorityProvider;

    private final SectionHeaderVisibilityProvider mSectionHeaderVisibilityProvider;

    private final KeyguardNotificationVisibilityProvider mKeyguardNotificationVisibilityProvider;

    private final SectionHeaderVisibilityProvider mSectionHeaderVisibilityProvider;

    private final SharedCoordinatorLogger mLogger;

    private final StatusBarStateController mStatusBarStateController;



    @Inject

    public KeyguardCoordinator(

            StatusBarStateController statusBarStateController,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            HighPriorityProvider highPriorityProvider,

            SectionHeaderVisibilityProvider sectionHeaderVisibilityProvider,

            KeyguardNotificationVisibilityProvider keyguardNotificationVisibilityProvider,

            SharedCoordinatorLogger logger) {

        mStatusBarStateController = statusBarStateController;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mHighPriorityProvider = highPriorityProvider;

        mSectionHeaderVisibilityProvider = sectionHeaderVisibilityProvider;

            SectionHeaderVisibilityProvider sectionHeaderVisibilityProvider,

            SharedCoordinatorLogger logger,

            StatusBarStateController statusBarStateController) {

        mKeyguardNotificationVisibilityProvider = keyguardNotificationVisibilityProvider;

        mSectionHeaderVisibilityProvider = sectionHeaderVisibilityProvider;

        mLogger = logger;

        mStatusBarStateController = statusBarStateController;

    }



    @Override
@@ -72,7 +66,7 @@ public class KeyguardCoordinator implements Coordinator { 


    private final NotifFilter mNotifFilter = new NotifFilter(TAG) {

        @Override

        public boolean shouldFilterOut(NotificationEntry entry, long now) {

        public boolean shouldFilterOut(@NonNull NotificationEntry entry, long now) {

            return mKeyguardNotificationVisibilityProvider.shouldHideNotification(entry);

        }

    };

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/SectionHeaderVisibilityProvider.kt

+1 −1
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.systemui.statusbar.notification.collection.provider



import android.content.Context

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.R

import com.android.systemui.dagger.SysUISingleton

import javax.inject.Inject



/**

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.java

deleted100644 → 0
+0 −89
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.notification.collection.coordinator;



import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



import android.os.Handler;

import android.os.UserHandle;

import android.testing.AndroidTestingRunner;



import androidx.test.filters.SmallTest;



import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.broadcast.BroadcastDispatcher;

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

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

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

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

import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter;

import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider;

import com.android.systemui.statusbar.notification.interruption.KeyguardNotificationVisibilityProvider;

import com.android.systemui.statusbar.notification.collection.provider.SectionHeaderVisibilityProvider;

import com.android.systemui.statusbar.policy.KeyguardStateController;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



/**

 * TODO(b/224771204) Create test cases

 */

@SmallTest

@RunWith(AndroidTestingRunner.class)

@Ignore

public class KeyguardCoordinatorTest extends SysuiTestCase {

    private static final int NOTIF_USER_ID = 0;

    private static final int CURR_USER_ID = 1;



    @Mock private Handler mMainHandler;

    @Mock private KeyguardStateController mKeyguardStateController;

    @Mock private BroadcastDispatcher mBroadcastDispatcher;

    @Mock private StatusBarStateController mStatusBarStateController;

    @Mock private KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    @Mock private HighPriorityProvider mHighPriorityProvider;

    @Mock private SectionHeaderVisibilityProvider mSectionHeaderVisibilityProvider;

    @Mock private NotifPipeline mNotifPipeline;

    @Mock private KeyguardNotificationVisibilityProvider mKeyguardNotificationVisibilityProvider;



    private NotificationEntry mEntry;

    private NotifFilter mKeyguardFilter;



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        KeyguardCoordinator keyguardCoordinator = new KeyguardCoordinator(

                mStatusBarStateController,

                mKeyguardUpdateMonitor, mHighPriorityProvider, mSectionHeaderVisibilityProvider,

                mKeyguardNotificationVisibilityProvider, mock(SharedCoordinatorLogger.class));



        mEntry = new NotificationEntryBuilder()

                .setUser(new UserHandle(NOTIF_USER_ID))

                .build();



        ArgumentCaptor<NotifFilter> filterCaptor = ArgumentCaptor.forClass(NotifFilter.class);

        keyguardCoordinator.attach(mNotifPipeline);

        verify(mNotifPipeline, times(1)).addFinalizeFilter(filterCaptor.capture());

        mKeyguardFilter = filterCaptor.getValue();

    }

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.kt

0 → 100644
+82 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.systemui.statusbar.notification.collection.coordinator



import android.testing.AndroidTestingRunner

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

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

import com.android.systemui.statusbar.StatusBarState

import com.android.systemui.statusbar.notification.collection.NotifPipeline

import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter

import com.android.systemui.statusbar.notification.collection.provider.SectionHeaderVisibilityProvider

import com.android.systemui.statusbar.notification.interruption.KeyguardNotificationVisibilityProvider

import com.android.systemui.util.mockito.eq

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.mockito.withArgCaptor

import java.util.function.Consumer

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mockito.clearInvocations

import org.mockito.Mockito.verify

import org.mockito.Mockito.`when` as whenever



@SmallTest

@RunWith(AndroidTestingRunner::class)

class KeyguardCoordinatorTest : SysuiTestCase() {

    private val notifPipeline: NotifPipeline = mock()

    private val keyguardNotifVisibilityProvider: KeyguardNotificationVisibilityProvider = mock()

    private val sectionHeaderVisibilityProvider: SectionHeaderVisibilityProvider = mock()

    private val sharedCoordinatorLogger: SharedCoordinatorLogger = mock()

    private val statusBarStateController: StatusBarStateController = mock()



    private lateinit var onStateChangeListener: Consumer<String>

    private lateinit var keyguardFilter: NotifFilter



    @Before

    fun setup() {

        val keyguardCoordinator = KeyguardCoordinator(

            keyguardNotifVisibilityProvider,

            sectionHeaderVisibilityProvider,

            sharedCoordinatorLogger,

            statusBarStateController

        )

        keyguardCoordinator.attach(notifPipeline)

        onStateChangeListener = withArgCaptor {

            verify(keyguardNotifVisibilityProvider).addOnStateChangedListener(capture())

        }

        keyguardFilter = withArgCaptor {

            verify(notifPipeline).addFinalizeFilter(capture())

        }

    }



    @Test

    fun testSetSectionHeadersVisibleInShade() {

        clearInvocations(sectionHeaderVisibilityProvider)

        whenever(statusBarStateController.state).thenReturn(StatusBarState.SHADE)

        onStateChangeListener.accept("state change")

        verify(sectionHeaderVisibilityProvider).sectionHeadersVisible = eq(true)

    }



    @Test

    fun testSetSectionHeadersNotVisibleOnKeyguard() {

        clearInvocations(sectionHeaderVisibilityProvider)

        whenever(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD)

        onStateChangeListener.accept("state change")

        verify(sectionHeaderVisibilityProvider).sectionHeadersVisible = eq(false)

    }

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/RowAppearanceCoordinatorTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ import org.junit.Test 
import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.Mockito.verify

import org.mockito.MockitoAnnotations.initMocks

import org.mockito.Mockito.`when` as whenever

import org.mockito.MockitoAnnotations.initMocks



@SmallTest

@RunWith(AndroidTestingRunner::class)

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/SectionStyleProvider.kt

+1 −1

File changed.

Contains only whitespace changes.

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RowAppearanceCoordinator.kt

+1 −1

File changed.

Contains only whitespace changes.

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilderTest.kt

+1 −1

File changed.

Contains only whitespace changes.