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

Commit 8cdd9302 authored by David Saff's avatar David Saff
Browse files

Fix package names of tests 

Bug: 384385736
Test: presubmit
Flag: TEST_ONLY
Change-Id: I678ed31ce22cd523b0a84189e401db69fc7ce871
parent 283ce250

packages/SystemUI/multivalentTests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/controls/ui/ControlActionCoordinatorImplTest.kt

+31 −42
Original line number Original line Diff line number Diff line
@@ -16,9 +16,9 @@ 




package com.android.systemui.controls.ui

package com.android.systemui.controls.ui





import android.view.HapticFeedbackConstants

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 android.view.HapticFeedbackConstants

import com.android.systemui.SysuiTestCase

import com.android.systemui.SysuiTestCase

import com.android.systemui.broadcast.BroadcastSender

import com.android.systemui.broadcast.BroadcastSender

import com.android.systemui.controls.ControlsMetricsLogger

import com.android.systemui.controls.ControlsMetricsLogger
@@ -29,6 +29,7 @@ import com.android.systemui.statusbar.VibratorHelper 
import com.android.systemui.statusbar.policy.KeyguardStateController

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

import com.android.systemui.util.concurrency.DelayableExecutor

import com.android.systemui.util.concurrency.DelayableExecutor

import com.android.wm.shell.taskview.TaskViewFactory

import com.android.wm.shell.taskview.TaskViewFactory

import java.util.Optional

import org.junit.Before

import org.junit.Before

import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith
@@ -45,31 +46,20 @@ import org.mockito.Mockito.spy 
import org.mockito.Mockito.verify

import org.mockito.Mockito.verify

import org.mockito.Mockito.`when`

import org.mockito.Mockito.`when`

import org.mockito.MockitoAnnotations

import org.mockito.MockitoAnnotations

import java.util.Optional





@SmallTest

@SmallTest

@RunWith(AndroidJUnit4::class)

@RunWith(AndroidJUnit4::class)

class ControlActionCoordinatorImplTest : SysuiTestCase() {

class ControlActionCoordinatorImplTest : SysuiTestCase() {

    @Mock

    @Mock private lateinit var vibratorHelper: VibratorHelper

    private lateinit var vibratorHelper: VibratorHelper

    @Mock private lateinit var keyguardStateController: KeyguardStateController

    @Mock

    @Mock private lateinit var bgExecutor: DelayableExecutor

    private lateinit var keyguardStateController: KeyguardStateController

    @Mock private lateinit var uiExecutor: DelayableExecutor

    @Mock

    @Mock private lateinit var activityStarter: ActivityStarter

    private lateinit var bgExecutor: DelayableExecutor

    @Mock private lateinit var broadcastSender: BroadcastSender

    @Mock

    @Mock private lateinit var taskViewFactory: Optional<TaskViewFactory>

    private lateinit var uiExecutor: DelayableExecutor

    @Mock(answer = Answers.RETURNS_DEEP_STUBS) private lateinit var cvh: ControlViewHolder

    @Mock

    @Mock private lateinit var metricsLogger: ControlsMetricsLogger

    private lateinit var activityStarter: ActivityStarter

    @Mock private lateinit var controlsSettingsDialogManager: ControlsSettingsDialogManager

    @Mock

    private lateinit var broadcastSender: BroadcastSender

    @Mock

    private lateinit var taskViewFactory: Optional<TaskViewFactory>

    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private lateinit var cvh: ControlViewHolder

    @Mock

    private lateinit var metricsLogger: ControlsMetricsLogger

    @Mock

    private lateinit var controlsSettingsDialogManager: ControlsSettingsDialogManager





    companion object {

    companion object {

        fun <T> any(): T = Mockito.any<T>()

        fun <T> any(): T = Mockito.any<T>()
@@ -89,7 +79,9 @@ class ControlActionCoordinatorImplTest : SysuiTestCase() { 
        controlsSettingsRepository.setAllowActionOnTrivialControlsInLockscreen(true)

        controlsSettingsRepository.setAllowActionOnTrivialControlsInLockscreen(true)

        controlsSettingsRepository.setCanShowControlsInLockscreen(true)

        controlsSettingsRepository.setCanShowControlsInLockscreen(true)





        coordinator = spy(ControlActionCoordinatorImpl(

        coordinator =

            spy(

                ControlActionCoordinatorImpl(

                    mContext,

                    mContext,

                    bgExecutor,

                    bgExecutor,

                    uiExecutor,

                    uiExecutor,
@@ -100,7 +92,8 @@ class ControlActionCoordinatorImplTest : SysuiTestCase() { 
                    metricsLogger,

                    metricsLogger,

                    vibratorHelper,

                    vibratorHelper,

                    controlsSettingsRepository,

                    controlsSettingsRepository,

        ))

                )

            )

        coordinator.activityContext = mContext

        coordinator.activityContext = mContext





        `when`(cvh.cws.ci.controlId).thenReturn(ID)

        `when`(cvh.cws.ci.controlId).thenReturn(ID)
@@ -198,19 +191,15 @@ class ControlActionCoordinatorImplTest : SysuiTestCase() { 
    fun drag_isEdge_performsSegmentTickHaptics() {

    fun drag_isEdge_performsSegmentTickHaptics() {

        coordinator.drag(cvh, true)

        coordinator.drag(cvh, true)





        verify(vibratorHelper).performHapticFeedback(

        verify(vibratorHelper)

            any(),

            .performHapticFeedback(any(), eq(HapticFeedbackConstants.SEGMENT_TICK))

            eq(HapticFeedbackConstants.SEGMENT_TICK)

        )

    }

    }





    @Test

    @Test

    fun drag_isNotEdge_performsFrequentTickHaptics() {

    fun drag_isNotEdge_performsFrequentTickHaptics() {

        coordinator.drag(cvh, false)

        coordinator.drag(cvh, false)





        verify(vibratorHelper).performHapticFeedback(

        verify(vibratorHelper)

            any(),

            .performHapticFeedback(any(), eq(HapticFeedbackConstants.SEGMENT_FREQUENT_TICK))

            eq(HapticFeedbackConstants.SEGMENT_FREQUENT_TICK)

        )

    }

    }

}
 
}

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/homecontrols/system/domain/interactor/HomeControlsComponentInteractorTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/homecontrols/HomeControlsComponentInteractorTest.kt

+0 −0

File moved.

View file

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/toolbar/EditModeButtonViewModelTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/EditModeButtonViewModelTest.kt

+0 −0

File moved.

View file

packages/SystemUI/tests/src/com/android/systemui/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt→packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt

+5 −19
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ import platform.test.runner.parameterized.Parameters 
@OptIn(ExperimentalCoroutinesApi::class)

@OptIn(ExperimentalCoroutinesApi::class)

@FlakyTest(

@FlakyTest(

    bugId = 292574995,

    bugId = 292574995,

    detail = "on certain architectures all permutations with startActivity=true is causing failures"

    detail = "on certain architectures all permutations with startActivity=true is causing failures",

)

)

@SmallTest

@SmallTest

@RunWith(ParameterizedAndroidJunit4::class)

@RunWith(ParameterizedAndroidJunit4::class)
@@ -93,11 +93,7 @@ class KeyguardQuickAffordanceInteractorSceneContainerTest : SysuiTestCase() { 
        private val DRAWABLE =

        private val DRAWABLE =

            mock<Icon> {

            mock<Icon> {

                whenever(this.contentDescription)

                whenever(this.contentDescription)

                    .thenReturn(

                    .thenReturn(ContentDescription.Resource(res = CONTENT_DESCRIPTION_RESOURCE_ID))

                        ContentDescription.Resource(

                            res = CONTENT_DESCRIPTION_RESOURCE_ID,

                        )

                    )

            }

            }

        private const val CONTENT_DESCRIPTION_RESOURCE_ID = 1337

        private const val CONTENT_DESCRIPTION_RESOURCE_ID = 1337
@@ -273,13 +269,7 @@ class KeyguardQuickAffordanceInteractorSceneContainerTest : SysuiTestCase() { 
                context = context,

                context = context,

                userFileManager =

                userFileManager =

                    mock<UserFileManager>().apply {

                    mock<UserFileManager>().apply {

                        whenever(

                        whenever(getSharedPreferences(anyString(), anyInt(), anyInt()))

                                getSharedPreferences(

                                    anyString(),

                                    anyInt(),

                                    anyInt(),

                                )

                            )

                            .thenReturn(FakeSharedPreferences())

                            .thenReturn(FakeSharedPreferences())

                    },

                    },

                userTracker = userTracker,

                userTracker = userTracker,
@@ -316,9 +306,7 @@ class KeyguardQuickAffordanceInteractorSceneContainerTest : SysuiTestCase() { 
        underTest =

        underTest =

            KeyguardQuickAffordanceInteractor(

            KeyguardQuickAffordanceInteractor(

                keyguardInteractor =

                keyguardInteractor =

                    KeyguardInteractorFactory.create(

                    KeyguardInteractorFactory.create(featureFlags = featureFlags)

                            featureFlags = featureFlags,

                        )

                        .keyguardInteractor,

                        .keyguardInteractor,

                shadeInteractor = kosmos.shadeInteractor,

                shadeInteractor = kosmos.shadeInteractor,

                lockPatternUtils = lockPatternUtils,

                lockPatternUtils = lockPatternUtils,
@@ -350,9 +338,7 @@ class KeyguardQuickAffordanceInteractorSceneContainerTest : SysuiTestCase() { 




            homeControls.setState(

            homeControls.setState(

                lockScreenState =

                lockScreenState =

                    KeyguardQuickAffordanceConfig.LockScreenState.Visible(

                    KeyguardQuickAffordanceConfig.LockScreenState.Visible(icon = DRAWABLE)

                        icon = DRAWABLE,

                    )

            )

            )

            homeControls.onTriggeredResult =

            homeControls.onTriggeredResult =

                if (startActivity) {

                if (startActivity) {