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

Commit a48a5ff6 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Add mock for MediaOutputDialogFactory in tests 

Notification tests create NotificationContentView, which creates
MediaTransferManager and this called Dependency.get for
MediaOutputDialogFactory, creating a bunch of real controllers. Make
sure it's mocked now.

Test: atest SystemUITests
Change-Id: Ie07a045df5d76980ef5e3410aada39210fc335fc
parent 687d46aa

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

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.view.View; 


import com.android.systemui.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.media.dialog.MediaOutputDialogFactory;

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

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

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
@@ -64,6 +65,7 @@ public class DynamicChildBindControllerTest extends SysuiTestCase { 
    @Before

    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);

        mDependency.injectMockDependency(MediaOutputDialogFactory.class);

        allowTestableLooperAsMainThread();

        when(mBindStage.getStageParams(any())).thenReturn(new RowContentBindParams());

        mDynamicChildBindController =

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

+3 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ import static org.mockito.Mockito.times; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.AppOpsManager;

import android.util.ArraySet;

import android.view.NotificationHeaderView;

import android.view.View;

import android.view.ViewPropertyAnimator;
@@ -37,6 +35,7 @@ import androidx.test.runner.AndroidJUnit4; 


import com.android.internal.widget.NotificationExpandButton;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.media.dialog.MediaOutputDialogFactory;



import org.junit.Before;

import org.junit.Test;
@@ -51,6 +50,8 @@ public class NotificationContentViewTest extends SysuiTestCase { 
    @Before

    @UiThreadTest

    public void setup() {

        mDependency.injectMockDependency(MediaOutputDialogFactory.class);



        mView = new NotificationContentView(mContext, null);

        ExpandableNotificationRow row = new ExpandableNotificationRow(mContext, null);

        ExpandableNotificationRow mockRow = spy(row);

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

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.internal.util.NotificationMessagingUtil; 
import com.android.systemui.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.media.MediaFeatureFlag;

import com.android.systemui.media.dialog.MediaOutputDialogFactory;

import com.android.systemui.plugins.FalsingManager;

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

import com.android.systemui.shared.plugins.PluginManager;
@@ -152,6 +153,7 @@ public class NotificationEntryManagerInflationTest extends SysuiTestCase { 
    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mDependency.injectMockDependency(SmartReplyController.class);

        mDependency.injectMockDependency(MediaOutputDialogFactory.class);



        mHandler = Handler.createAsync(TestableLooper.get(this).getLooper());

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

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import com.android.systemui.TestableDependency; 
import com.android.systemui.bubbles.Bubbles;

import com.android.systemui.bubbles.BubblesTestActivity;

import com.android.systemui.media.MediaFeatureFlag;

import com.android.systemui.media.dialog.MediaOutputDialogFactory;

import com.android.systemui.plugins.FalsingManager;

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

import com.android.systemui.statusbar.NotificationMediaManager;
@@ -115,6 +116,7 @@ public class NotificationTestHelper { 
        mTestLooper = testLooper;

        dependency.injectMockDependency(NotificationMediaManager.class);

        dependency.injectMockDependency(NotificationShadeWindowController.class);

        dependency.injectMockDependency(MediaOutputDialogFactory.class);

        mStatusBarStateController = mock(StatusBarStateController.class);

        mGroupMembershipManager = new NotificationGroupManagerLegacy(

                mStatusBarStateController,