diff options
| author | 2024-12-17 10:42:27 -0500 | |
|---|---|---|
| committer | 2024-12-17 10:44:48 -0500 | |
| commit | 8cdd93020d671df462ee74eec09562a05b35edfc (patch) | |
| tree | 33c4acdab167cad4f77fa803432708b9e3938023 | |
| parent | 283ce2504567f6a26cbb11730c3b25dcce974c5d (diff) | |
Fix package names of tests
Bug: 384385736
Test: presubmit
Flag: TEST_ONLY
Change-Id: I678ed31ce22cd523b0a84189e401db69fc7ce871
| -rw-r--r-- | packages/SystemUI/multivalentTests/src/com/android/systemui/controls/ui/ControlActionCoordinatorImplTest.kt (renamed from packages/SystemUI/multivalentTests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt) | 73 | ||||
| -rw-r--r-- | packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/homecontrols/HomeControlsComponentInteractorTest.kt (renamed from packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/homecontrols/system/domain/interactor/HomeControlsComponentInteractorTest.kt) | 0 | ||||
| -rw-r--r-- | packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/EditModeButtonViewModelTest.kt (renamed from packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/toolbar/EditModeButtonViewModelTest.kt) | 0 | ||||
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt (renamed from packages/SystemUI/tests/src/com/android/systemui/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt) | 24 |
4 files changed, 36 insertions, 61 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/controls/ui/ControlActionCoordinatorImplTest.kt index 928514657257..c8661cf59051 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/controls/ui/ControlActionCoordinatorImplTest.kt @@ -16,9 +16,9 @@ package com.android.systemui.controls.ui +import android.view.HapticFeedbackConstants import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest -import android.view.HapticFeedbackConstants import com.android.systemui.SysuiTestCase import com.android.systemui.broadcast.BroadcastSender 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.util.concurrency.DelayableExecutor import com.android.wm.shell.taskview.TaskViewFactory +import java.util.Optional import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -45,31 +46,20 @@ import org.mockito.Mockito.spy import org.mockito.Mockito.verify import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations -import java.util.Optional @SmallTest @RunWith(AndroidJUnit4::class) class ControlActionCoordinatorImplTest : SysuiTestCase() { - @Mock - private lateinit var vibratorHelper: VibratorHelper - @Mock - private lateinit var keyguardStateController: KeyguardStateController - @Mock - private lateinit var bgExecutor: DelayableExecutor - @Mock - private lateinit var uiExecutor: DelayableExecutor - @Mock - private lateinit var activityStarter: ActivityStarter - @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 + @Mock private lateinit var vibratorHelper: VibratorHelper + @Mock private lateinit var keyguardStateController: KeyguardStateController + @Mock private lateinit var bgExecutor: DelayableExecutor + @Mock private lateinit var uiExecutor: DelayableExecutor + @Mock private lateinit var activityStarter: ActivityStarter + @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 { fun <T> any(): T = Mockito.any<T>() @@ -89,18 +79,21 @@ class ControlActionCoordinatorImplTest : SysuiTestCase() { controlsSettingsRepository.setAllowActionOnTrivialControlsInLockscreen(true) controlsSettingsRepository.setCanShowControlsInLockscreen(true) - coordinator = spy(ControlActionCoordinatorImpl( - mContext, - bgExecutor, - uiExecutor, - activityStarter, - broadcastSender, - keyguardStateController, - taskViewFactory, - metricsLogger, - vibratorHelper, - controlsSettingsRepository, - )) + coordinator = + spy( + ControlActionCoordinatorImpl( + mContext, + bgExecutor, + uiExecutor, + activityStarter, + broadcastSender, + keyguardStateController, + taskViewFactory, + metricsLogger, + vibratorHelper, + controlsSettingsRepository, + ) + ) coordinator.activityContext = mContext `when`(cvh.cws.ci.controlId).thenReturn(ID) @@ -198,19 +191,15 @@ class ControlActionCoordinatorImplTest : SysuiTestCase() { fun drag_isEdge_performsSegmentTickHaptics() { coordinator.drag(cvh, true) - verify(vibratorHelper).performHapticFeedback( - any(), - eq(HapticFeedbackConstants.SEGMENT_TICK) - ) + verify(vibratorHelper) + .performHapticFeedback(any(), eq(HapticFeedbackConstants.SEGMENT_TICK)) } @Test fun drag_isNotEdge_performsFrequentTickHaptics() { coordinator.drag(cvh, false) - verify(vibratorHelper).performHapticFeedback( - any(), - eq(HapticFeedbackConstants.SEGMENT_FREQUENT_TICK) - ) + verify(vibratorHelper) + .performHapticFeedback(any(), eq(HapticFeedbackConstants.SEGMENT_FREQUENT_TICK)) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/homecontrols/system/domain/interactor/HomeControlsComponentInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/homecontrols/HomeControlsComponentInteractorTest.kt index c950523f7854..c950523f7854 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/homecontrols/system/domain/interactor/HomeControlsComponentInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/homecontrols/HomeControlsComponentInteractorTest.kt diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/toolbar/EditModeButtonViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/EditModeButtonViewModelTest.kt index a8e390c25a4d..a8e390c25a4d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/toolbar/EditModeButtonViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/EditModeButtonViewModelTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt index 1184a76d54ff..eb19a9c2528d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt @@ -81,7 +81,7 @@ import platform.test.runner.parameterized.Parameters @OptIn(ExperimentalCoroutinesApi::class) @FlakyTest( 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 @RunWith(ParameterizedAndroidJunit4::class) @@ -93,11 +93,7 @@ class KeyguardQuickAffordanceInteractorSceneContainerTest : SysuiTestCase() { private val DRAWABLE = mock<Icon> { whenever(this.contentDescription) - .thenReturn( - ContentDescription.Resource( - res = CONTENT_DESCRIPTION_RESOURCE_ID, - ) - ) + .thenReturn(ContentDescription.Resource(res = CONTENT_DESCRIPTION_RESOURCE_ID)) } private const val CONTENT_DESCRIPTION_RESOURCE_ID = 1337 @@ -273,13 +269,7 @@ class KeyguardQuickAffordanceInteractorSceneContainerTest : SysuiTestCase() { context = context, userFileManager = mock<UserFileManager>().apply { - whenever( - getSharedPreferences( - anyString(), - anyInt(), - anyInt(), - ) - ) + whenever(getSharedPreferences(anyString(), anyInt(), anyInt())) .thenReturn(FakeSharedPreferences()) }, userTracker = userTracker, @@ -316,9 +306,7 @@ class KeyguardQuickAffordanceInteractorSceneContainerTest : SysuiTestCase() { underTest = KeyguardQuickAffordanceInteractor( keyguardInteractor = - KeyguardInteractorFactory.create( - featureFlags = featureFlags, - ) + KeyguardInteractorFactory.create(featureFlags = featureFlags) .keyguardInteractor, shadeInteractor = kosmos.shadeInteractor, lockPatternUtils = lockPatternUtils, @@ -350,9 +338,7 @@ class KeyguardQuickAffordanceInteractorSceneContainerTest : SysuiTestCase() { homeControls.setState( lockScreenState = - KeyguardQuickAffordanceConfig.LockScreenState.Visible( - icon = DRAWABLE, - ) + KeyguardQuickAffordanceConfig.LockScreenState.Visible(icon = DRAWABLE) ) homeControls.onTriggeredResult = if (startActivity) { |