diff --git a/app/src/main/java/eu/darken/capod/reaction/core/popup/PopUpReaction.kt b/app/src/main/java/eu/darken/capod/reaction/core/popup/PopUpReaction.kt index 94de514d..d07e4743 100644 --- a/app/src/main/java/eu/darken/capod/reaction/core/popup/PopUpReaction.kt +++ b/app/src/main/java/eu/darken/capod/reaction/core/popup/PopUpReaction.kt @@ -290,8 +290,8 @@ class PopUpReaction @Inject constructor( DualApplePods.LidState.CLOSED -> CasePopUpDecision( shouldShow = false, shouldHide = true, - shouldResetCooldown = false, - reason = "Lid CLOSED, refreshing cooldown", + shouldResetCooldown = true, + reason = "Lid CLOSED, resetting cooldown", ) else -> CasePopUpDecision( diff --git a/app/src/test/java/eu/darken/capod/reaction/core/popup/PopUpReactionLogicTest.kt b/app/src/test/java/eu/darken/capod/reaction/core/popup/PopUpReactionLogicTest.kt index a7657e25..1ffe63bd 100644 --- a/app/src/test/java/eu/darken/capod/reaction/core/popup/PopUpReactionLogicTest.kt +++ b/app/src/test/java/eu/darken/capod/reaction/core/popup/PopUpReactionLogicTest.kt @@ -36,11 +36,10 @@ class PopUpReactionLogicTest : BaseTest() { private fun evaluate( currentLidState: DualApplePods.LidState?, lastShownTime: Instant? = null, - at: Instant = now, ) = popUpReaction.evaluateCasePopUp( currentLidState = currentLidState, lastShownTime = lastShownTime, - now = at, + now = now, cooldownDuration = cooldown, ) @@ -82,39 +81,11 @@ class PopUpReactionLogicTest : BaseTest() { } @Test - fun `lid CLOSED - should NOT show, should hide, should NOT reset cooldown`() { + fun `lid CLOSED - should NOT show, should hide, should reset cooldown`() { val decision = evaluate(currentLidState = DualApplePods.LidState.CLOSED) decision.shouldShow shouldBe false decision.shouldHide shouldBe true - decision.shouldResetCooldown shouldBe false - } - - @Test - fun `lid CLOSED followed by residual OPEN within cooldown - should NOT show`() { - val closeDecision = evaluate(currentLidState = DualApplePods.LidState.CLOSED) - closeDecision.shouldHide shouldBe true - closeDecision.shouldResetCooldown shouldBe false - - val residualOpenDecision = evaluate( - currentLidState = DualApplePods.LidState.OPEN, - lastShownTime = now, - at = now.plusMillis(500), - ) - residualOpenDecision.shouldShow shouldBe false - } - - @Test - fun `lid CLOSED then OPEN after cooldown elapsed - should show`() { - val closeDecision = evaluate(currentLidState = DualApplePods.LidState.CLOSED) - closeDecision.shouldHide shouldBe true - closeDecision.shouldResetCooldown shouldBe false - - val reopenDecision = evaluate( - currentLidState = DualApplePods.LidState.OPEN, - lastShownTime = now, - at = now.plus(cooldown), - ) - reopenDecision.shouldShow shouldBe true + decision.shouldResetCooldown shouldBe true } @Test