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

Merge "Fix ControlsProviderLifecycleManagerTest" into rvc-dev am: 20dd6a2631

Browse Source 
Change-Id: Iac3c4a16ad7d40c90a4fa46a1cce3833bdb06fe2
This commit is contained in:
Automerger Merge Worker
2020-03-04 00:19:48 +00:00
parent 16c872ce5c 20dd6a2631
commit afd90a1806
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlsProviderLifecycleManagerTest.kt
View File

@@ -97,19 +97,25 @@ class ControlsProviderLifecycleManagerTest : SysuiTestCase() {
@Test @Test
fun testBindService() { fun testBindService() {
manager.bindService() manager.bindService()
executor.runAllReady()
assertTrue(mContext.isBound(componentName)) assertTrue(mContext.isBound(componentName))
} }
@Test @Test
fun testUnbindService() { fun testUnbindService() {
manager.bindService() manager.bindService()
executor.runAllReady()
manager.unbindService() manager.unbindService()
executor.runAllReady()
assertFalse(mContext.isBound(componentName)) assertFalse(mContext.isBound(componentName))
} }
@Test @Test
fun testMaybeBindAndLoad() { fun testMaybeBindAndLoad() {
manager.maybeBindAndLoad(subscriberService) manager.maybeBindAndLoad(subscriberService)
executor.runAllReady()
verify(service).load(subscriberService) verify(service).load(subscriberService)
@@ -119,14 +125,17 @@ class ControlsProviderLifecycleManagerTest : SysuiTestCase() {
@Test @Test
fun testMaybeUnbind_bindingAndCallback() { fun testMaybeUnbind_bindingAndCallback() {
manager.maybeBindAndLoad(subscriberService) manager.maybeBindAndLoad(subscriberService)
executor.runAllReady()
manager.unbindService() manager.unbindService()
executor.runAllReady()
assertFalse(mContext.isBound(componentName)) assertFalse(mContext.isBound(componentName))
} }
@Test @Test
fun testMaybeBindAndLoad_timeout() { fun testMaybeBindAndLoad_timeout() {
manager.maybeBindAndLoad(subscriberService) manager.maybeBindAndLoad(subscriberService)
executor.runAllReady()
executor.advanceClockToLast() executor.advanceClockToLast()
executor.runAllReady() executor.runAllReady()
@@ -138,6 +147,7 @@ class ControlsProviderLifecycleManagerTest : SysuiTestCase() {
fun testMaybeBindAndSubscribe() { fun testMaybeBindAndSubscribe() {
val list = listOf("TEST_ID") val list = listOf("TEST_ID")
manager.maybeBindAndSubscribe(list) manager.maybeBindAndSubscribe(list)
executor.runAllReady()
assertTrue(mContext.isBound(componentName)) assertTrue(mContext.isBound(componentName))
verify(service).subscribe(list, subscriberService) verify(service).subscribe(list, subscriberService)
@@ -148,6 +158,7 @@ class ControlsProviderLifecycleManagerTest : SysuiTestCase() {
val controlId = "TEST_ID" val controlId = "TEST_ID"
val action = ControlAction.ERROR_ACTION val action = ControlAction.ERROR_ACTION
manager.maybeBindAndSendAction(controlId, action) manager.maybeBindAndSendAction(controlId, action)
executor.runAllReady()
assertTrue(mContext.isBound(componentName)) assertTrue(mContext.isBound(componentName))
verify(service).action(eq(controlId), capture(wrapperCaptor), verify(service).action(eq(controlId), capture(wrapperCaptor),