Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove test falkiness" into sc-v2-dev am: f4590668aa

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16494982

Change-Id: I6a9dea317314379188d45990c0b6efa2f414c833
This commit is contained in:
Lucas Dupin
2021-12-17 05:29:34 +00:00
committed by Automerger Merge Worker
parent 0f71b8886e f4590668aa
commit a6b14edb73
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/tests/src/com/android/systemui/media/MediaHierarchyManagerTest.kt
View File

@@ -22,6 +22,7 @@ import android.testing.TestableLooper
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.FrameLayout import android.widget.FrameLayout
import androidx.test.filters.SmallTest import androidx.test.filters.SmallTest
import com.android.systemui.R
import com.android.systemui.SysuiTestCase import com.android.systemui.SysuiTestCase
import com.android.systemui.controls.controller.ControlsControllerImplTest.Companion.eq import com.android.systemui.controls.controller.ControlsControllerImplTest.Companion.eq
import com.android.systemui.keyguard.WakefulnessLifecycle import com.android.systemui.keyguard.WakefulnessLifecycle
@@ -82,6 +83,8 @@ class MediaHierarchyManagerTest : SysuiTestCase() {
private lateinit var statusBarKeyguardViewManager: StatusBarKeyguardViewManager private lateinit var statusBarKeyguardViewManager: StatusBarKeyguardViewManager
@Mock @Mock
private lateinit var configurationController: ConfigurationController private lateinit var configurationController: ConfigurationController
@Mock
private lateinit var uniqueObjectHostView: UniqueObjectHostView
@Captor @Captor
private lateinit var wakefullnessObserver: ArgumentCaptor<(WakefulnessLifecycle.Observer)> private lateinit var wakefullnessObserver: ArgumentCaptor<(WakefulnessLifecycle.Observer)>
@Captor @Captor
@@ -94,6 +97,8 @@ class MediaHierarchyManagerTest : SysuiTestCase() {
@Before @Before
fun setup() { fun setup() {
context.getOrCreateTestableResources().addOverride(
R.bool.config_use_split_notification_shade, false)
mediaFrame = FrameLayout(context) mediaFrame = FrameLayout(context)
`when`(mediaCarouselController.mediaFrame).thenReturn(mediaFrame) `when`(mediaCarouselController.mediaFrame).thenReturn(mediaFrame)
mediaHiearchyManager = MediaHierarchyManager( mediaHiearchyManager = MediaHierarchyManager(
@@ -124,7 +129,7 @@ class MediaHierarchyManagerTest : SysuiTestCase() {
private fun setupHost(host: MediaHost, location: Int) { private fun setupHost(host: MediaHost, location: Int) {
`when`(host.location).thenReturn(location) `when`(host.location).thenReturn(location)
`when`(host.currentBounds).thenReturn(Rect()) `when`(host.currentBounds).thenReturn(Rect())
`when`(host.hostView).thenReturn(UniqueObjectHostView(context)) `when`(host.hostView).thenReturn(uniqueObjectHostView)
`when`(host.visible).thenReturn(true) `when`(host.visible).thenReturn(true)
mediaHiearchyManager.register(host) mediaHiearchyManager.register(host)
} }