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

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

Merge "[SB][Chip] Port more tests to @Enable/@DisableChipsModernization." into main

parents 771967b6 effc020f

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/call/ui/viewmodel/CallChipViewModelTest.kt

+8 −8
Original line number Original line Diff line number Diff line
@@ -35,14 +35,14 @@ import com.android.systemui.statusbar.chips.ui.model.ColorsModel 
import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

import com.android.systemui.statusbar.core.StatusBarConnectedDisplays

import com.android.systemui.statusbar.core.StatusBarConnectedDisplays

import com.android.systemui.statusbar.core.StatusBarRootModernization

import com.android.systemui.statusbar.notification.data.model.activeNotificationModel

import com.android.systemui.statusbar.notification.data.model.activeNotificationModel

import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationListRepository

import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationListRepository

import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationsStore

import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationsStore

import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository

import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository

import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel

import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel

import com.android.systemui.statusbar.notification.shared.CallType

import com.android.systemui.statusbar.notification.shared.CallType

import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.DisableChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.EnableChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.data.repository.ongoingCallRepository

import com.android.systemui.statusbar.phone.ongoingcall.data.repository.ongoingCallRepository

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.inCallModel

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.inCallModel
@@ -314,7 +314,7 @@ class CallChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_inCall_nullIntent_nullClickListener() =

    fun chip_inCall_nullIntent_nullClickListener() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -325,7 +325,7 @@ class CallChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_inCall_positiveStartTime_validIntent_clickListenerLaunchesIntent() =

    fun chip_inCall_positiveStartTime_validIntent_clickListenerLaunchesIntent() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -343,7 +343,7 @@ class CallChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_inCall_zeroStartTime_validIntent_clickListenerLaunchesIntent() =

    fun chip_inCall_zeroStartTime_validIntent_clickListenerLaunchesIntent() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -362,7 +362,7 @@ class CallChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_inCall_nullIntent_noneClickBehavior() =

    fun chip_inCall_nullIntent_noneClickBehavior() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -378,7 +378,7 @@ class CallChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_inCall_positiveStartTime_validIntent_clickBehaviorLaunchesIntent() =

    fun chip_inCall_positiveStartTime_validIntent_clickBehaviorLaunchesIntent() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -403,7 +403,7 @@ class CallChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_inCall_zeroStartTime_validIntent_clickBehaviorLaunchesIntent() =

    fun chip_inCall_zeroStartTime_validIntent_clickBehaviorLaunchesIntent() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModelTest.kt

+10 −12
Original line number Original line Diff line number Diff line
@@ -17,8 +17,6 @@ 
package com.android.systemui.statusbar.chips.screenrecord.ui.viewmodel

package com.android.systemui.statusbar.chips.screenrecord.ui.viewmodel





import android.content.DialogInterface

import android.content.DialogInterface

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.view.View

import android.view.View

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest
@@ -44,10 +42,10 @@ import com.android.systemui.statusbar.chips.ui.model.ColorsModel 
import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipsViewModelTest.Companion.getStopActionFromDialog

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipsViewModelTest.Companion.getStopActionFromDialog

import com.android.systemui.statusbar.core.StatusBarRootModernization

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.statusbar.phone.mockSystemUIDialogFactory

import com.android.systemui.statusbar.phone.mockSystemUIDialogFactory

import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.DisableChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.EnableChipsModernization

import com.android.systemui.testKosmos

import com.android.systemui.testKosmos

import com.android.systemui.util.time.fakeSystemClock

import com.android.systemui.util.time.fakeSystemClock

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

import com.google.common.truth.Truth.assertThat
@@ -282,7 +280,7 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_notProjecting_clickListenerShowsDialog() =

    fun chip_notProjecting_clickListenerShowsDialog() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -299,7 +297,7 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_projectingEntireScreen_clickListenerShowsDialog() =

    fun chip_projectingEntireScreen_clickListenerShowsDialog() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -317,7 +315,7 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_projectingSingleTask_clickListenerShowsDialog() =

    fun chip_projectingSingleTask_clickListenerShowsDialog() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -339,7 +337,7 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_clickListenerHasCujLegacy() =

    fun chip_clickListenerHasCujLegacy() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -359,7 +357,7 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_recordingState_hasClickBehavior() =

    fun chip_recordingState_hasClickBehavior() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -370,7 +368,7 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_notProjecting_expandActionBehaviorShowsDialog() =

    fun chip_notProjecting_expandActionBehaviorShowsDialog() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -386,7 +384,7 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_projectingEntireScreen_expandActionBehaviorShowsDialog() =

    fun chip_projectingEntireScreen_expandActionBehaviorShowsDialog() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -401,7 +399,7 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_projectingSingleTask_expandActionBehaviorShowsDialog() =

    fun chip_projectingSingleTask_expandActionBehaviorShowsDialog() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModelTest.kt

+13 −16
Original line number Original line Diff line number Diff line
@@ -49,10 +49,10 @@ import com.android.systemui.statusbar.chips.ui.model.ColorsModel 
import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipsViewModelTest.Companion.getStopActionFromDialog

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipsViewModelTest.Companion.getStopActionFromDialog

import com.android.systemui.statusbar.core.StatusBarRootModernization

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.statusbar.phone.mockSystemUIDialogFactory

import com.android.systemui.statusbar.phone.mockSystemUIDialogFactory

import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.DisableChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.EnableChipsModernization

import com.android.systemui.testKosmos

import com.android.systemui.testKosmos

import com.android.systemui.util.time.fakeSystemClock

import com.android.systemui.util.time.fakeSystemClock

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

import com.google.common.truth.Truth.assertThat
@@ -506,7 +506,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 




    @Test

    @Test

    @EnableFlags(FLAG_STATUS_BAR_SHOW_AUDIO_ONLY_PROJECTION_CHIP)

    @EnableFlags(FLAG_STATUS_BAR_SHOW_AUDIO_ONLY_PROJECTION_CHIP)

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_noScreen_clickListenerShowsGenericShareDialog() =

    fun chip_noScreen_clickListenerShowsGenericShareDialog() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -527,7 +527,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_entireScreen_clickListenerShowsScreenShareDialog() =

    fun chip_entireScreen_clickListenerShowsScreenShareDialog() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -548,7 +548,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_singleTask_clickListenerShowsScreenShareDialog() =

    fun chip_singleTask_clickListenerShowsScreenShareDialog() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -573,7 +573,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_clickListenerHasCuj() =

    fun chip_clickListenerHasCuj() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -597,7 +597,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_noScreen_hasClickBehavior() =

    fun chip_noScreen_hasClickBehavior() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -609,7 +609,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_entireScreen_hasClickBehavior() =

    fun chip_entireScreen_hasClickBehavior() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -621,7 +621,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_singleTask_hasClickBehavior() =

    fun chip_singleTask_hasClickBehavior() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -637,11 +637,8 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @EnableFlags(

    @EnableFlags(FLAG_STATUS_BAR_SHOW_AUDIO_ONLY_PROJECTION_CHIP)

        FLAG_STATUS_BAR_SHOW_AUDIO_ONLY_PROJECTION_CHIP,

    @EnableChipsModernization

        StatusBarRootModernization.FLAG_NAME,

        StatusBarChipsModernization.FLAG_NAME,

    )

    fun chip_noScreen_clickBehaviorShowsGenericShareDialog() =

    fun chip_noScreen_clickBehaviorShowsGenericShareDialog() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -657,7 +654,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_entireScreen_clickBehaviorShowsScreenShareDialog() =

    fun chip_entireScreen_clickBehaviorShowsScreenShareDialog() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -673,7 +670,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_singleTask_clickBehaviorShowsScreenShareDialog() =

    fun chip_singleTask_clickBehaviorShowsScreenShareDialog() =

        testScope.runTest {

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipViewModelTest.kt

+4 −6
Original line number Original line Diff line number Diff line
@@ -16,8 +16,6 @@ 




package com.android.systemui.statusbar.chips.ui.viewmodel

package com.android.systemui.statusbar.chips.ui.viewmodel





import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.view.View

import android.view.View

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest
@@ -31,9 +29,9 @@ import com.android.systemui.res.R 
import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel.Companion.createDialogLaunchOnClickCallback

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel.Companion.createDialogLaunchOnClickCallback

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel.Companion.createDialogLaunchOnClickListener

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel.Companion.createDialogLaunchOnClickListener

import com.android.systemui.statusbar.core.StatusBarRootModernization

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.DisableChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.EnableChipsModernization

import kotlin.test.Test

import kotlin.test.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith

import org.mockito.ArgumentMatchers.anyBoolean

import org.mockito.ArgumentMatchers.anyBoolean
@@ -64,7 +62,7 @@ class OngoingActivityChipViewModelTest : SysuiTestCase() { 
        mock<Expandable>().apply { whenever(dialogTransitionController(any())).thenReturn(mock()) }

        mock<Expandable>().apply { whenever(dialogTransitionController(any())).thenReturn(mock()) }





    @Test

    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun createDialogLaunchOnClickListener_showsDialogOnClick() {

    fun createDialogLaunchOnClickListener_showsDialogOnClick() {

        val cuj = DialogCuj(Cuj.CUJ_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP, tag = "Test")

        val cuj = DialogCuj(Cuj.CUJ_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP, tag = "Test")

        val clickListener =

        val clickListener =
@@ -82,7 +80,7 @@ class OngoingActivityChipViewModelTest : SysuiTestCase() { 
    }

    }





    @Test

    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun createDialogLaunchOnClickCallback_showsDialogOnClick() {

    fun createDialogLaunchOnClickCallback_showsDialogOnClick() {

        val cuj = DialogCuj(Cuj.CUJ_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP, tag = "Test")

        val cuj = DialogCuj(Cuj.CUJ_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP, tag = "Test")

        val clickCallback =

        val clickCallback =

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/domain/interactor/OngoingCallInteractorTest.kt

+2 −6
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.statusbar.phone.ongoingcall.domain.interactor

package com.android.systemui.statusbar.phone.ongoingcall.domain.interactor





import android.app.PendingIntent

import android.app.PendingIntent

import android.platform.test.annotations.EnableFlags

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.SysuiTestCase
@@ -29,12 +28,10 @@ import com.android.systemui.kosmos.collectLastValue 
import com.android.systemui.kosmos.runTest

import com.android.systemui.kosmos.runTest

import com.android.systemui.kosmos.useUnconfinedTestDispatcher

import com.android.systemui.kosmos.useUnconfinedTestDispatcher

import com.android.systemui.statusbar.StatusBarIconView

import com.android.systemui.statusbar.StatusBarIconView

import com.android.systemui.statusbar.core.StatusBarRootModernization

import com.android.systemui.statusbar.data.repository.fakeStatusBarModeRepository

import com.android.systemui.statusbar.data.repository.fakeStatusBarModeRepository

import com.android.systemui.statusbar.gesture.swipeStatusBarAwayGestureHandler

import com.android.systemui.statusbar.gesture.swipeStatusBarAwayGestureHandler

import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository

import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel

import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel

import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.EnableChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallTestHelper.addOngoingCallState

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallTestHelper.addOngoingCallState

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallTestHelper.removeOngoingCallState

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallTestHelper.removeOngoingCallState
@@ -52,10 +49,9 @@ import org.mockito.kotlin.verify 




@SmallTest

@SmallTest

@RunWith(AndroidJUnit4::class)

@RunWith(AndroidJUnit4::class)

@EnableFlags(StatusBarChipsModernization.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

@EnableChipsModernization

class OngoingCallInteractorTest : SysuiTestCase() {

class OngoingCallInteractorTest : SysuiTestCase() {

    private val kosmos = Kosmos().useUnconfinedTestDispatcher()

    private val kosmos = Kosmos().useUnconfinedTestDispatcher()

    private val repository = kosmos.activeNotificationListRepository

    private val underTest = kosmos.ongoingCallInteractor

    private val underTest = kosmos.ongoingCallInteractor





    @Before

    @Before