From 2c4805530fefe2316fa606b436d75e04f7ab80ca Mon Sep 17 00:00:00 2001 From: evgeny Date: Wed, 28 Oct 2026 14:27:22 +0100 Subject: [PATCH] Require confirmed cleanup in existing ringtone lifecycle tests --- .../chat/data/AlertPlaybackLifecycleTest.kt | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/tools/chatgui-android/router-tests/src/test/kotlin/com/utun/chat/data/AlertPlaybackLifecycleTest.kt b/tools/chatgui-android/router-tests/src/test/kotlin/com/utun/chat/data/AlertPlaybackLifecycleTest.kt index 858d11dee..792c3975e 100644 --- a/tools/chatgui-android/router-tests/src/test/kotlin/com/utun/chat/data/AlertPlaybackLifecycleTest.kt +++ b/tools/chatgui-android/router-tests/src/test/kotlin/com/utun/chat/data/AlertPlaybackLifecycleTest.kt @@ -38,6 +38,10 @@ class AlertPlaybackLifecycleTest { } @After fun release() { + RingtoneManager.created.forEach { it.failures = emptySet() } + MediaPlayer.created.forEach { it.failures = emptySet() } + audio.failAbandon = false; audio.abandonResult = AudioManager.AUDIOFOCUS_REQUEST_GRANTED + context.vibrator?.failCancel = false ringtone.stop() CallRingback.stop() MediaPlayer.created.forEach { it.complete() } @@ -267,7 +271,11 @@ class AlertPlaybackLifecycleTest { RingtoneManager.nextFailures = setOf("stop") ringtone.play() repeat(3) { ringtone.stop() } - assertEquals(1, RingtoneManager.created.single().stopCalls) + val sound = RingtoneManager.created.single() + assertEquals(3, sound.stopCalls) + assertTrue(sound.playing) + sound.failures = emptySet(); repeat(3) { ringtone.stop() } + assertEquals(4, sound.stopCalls); assertFalse(sound.playing) assertEquals(1, vibration.cancelCalls) diagnostic("ringtone stop failed") } @@ -337,7 +345,10 @@ class AlertPlaybackLifecycleTest { repeat(3) { ringtone.stop() } Looper.getMainLooper().advanceBy(10_000) assertEquals(1, vibration.pulseAttempts) - assertEquals(1, vibration.cancelCalls) + assertEquals(3, vibration.cancelCalls) + vibration.failCancel = false; repeat(3) { ringtone.stop() } + assertEquals(4, vibration.cancelCalls) + assertFalse(vibration.active) diagnostic("vibration cancel failed") } @@ -453,14 +464,19 @@ class AlertPlaybackLifecycleTest { } } - @Test fun legacyReleaseAndAbandonFailuresAreLoggedWithoutRetainingOwners() { + @Test fun legacyReleaseAndAbandonFailuresAreRetriedUntilConfirmed() { Build.VERSION.SDK_INT = 26 MediaPlayer.nextFailures = setOf("release") audio.failAbandon = true ringtone.play() repeat(3) { ringtone.stop() } - assertEquals(1, MediaPlayer.created.single().releaseCalls) - assertEquals(1, audio.abandoned.size) + val sound = MediaPlayer.created.single() + assertEquals(3, sound.releaseCalls) + assertEquals(3, audio.abandoned.size) + sound.failures = emptySet(); audio.failAbandon = false + repeat(3) { ringtone.stop() } + assertEquals(4, sound.releaseCalls); assertTrue(sound.released) + assertEquals(4, audio.abandoned.size); assertTrue(audio.focusOwners.isEmpty()) assertEquals(1, vibration.cancelCalls) diagnostic("player release failed") diagnostic("abandon focus failed")