From 5b4c33ebcc7ca6f8e6720c5cb1b0e1774644d778 Mon Sep 17 00:00:00 2001 From: Laimonas Turauskas Date: Fri, 15 Mar 2024 16:43:37 -0400 Subject: [PATCH] Add more tests around missing cases for transition API. --- .../formula/internal/TransitionUtils.kt | 4 +- .../instacart/formula/TransitionApiTest.kt | 72 +++++++++++++++---- 2 files changed, 61 insertions(+), 15 deletions(-) diff --git a/formula/src/main/java/com/instacart/formula/internal/TransitionUtils.kt b/formula/src/main/java/com/instacart/formula/internal/TransitionUtils.kt index f278b0d6..0abedede 100644 --- a/formula/src/main/java/com/instacart/formula/internal/TransitionUtils.kt +++ b/formula/src/main/java/com/instacart/formula/internal/TransitionUtils.kt @@ -13,7 +13,7 @@ internal object TransitionUtils { /** * Combines only effects transition result with another transition result. */ -internal fun TransitionContext<*, State>.combine( +internal fun combine( result: Transition.Result.OnlyEffects, other: Transition.Result ): Transition.Result { @@ -35,7 +35,7 @@ internal fun TransitionContext<*, State>.combine( /** * Combines stateful result with the result of another transition. */ -internal fun TransitionContext<*, State>.combine( +internal fun combine( result: Transition.Result.Stateful, other: Transition.Result ): Transition.Result { diff --git a/formula/src/test/java/com/instacart/formula/TransitionApiTest.kt b/formula/src/test/java/com/instacart/formula/TransitionApiTest.kt index 28157d77..295d5bcb 100644 --- a/formula/src/test/java/com/instacart/formula/TransitionApiTest.kt +++ b/formula/src/test/java/com/instacart/formula/TransitionApiTest.kt @@ -1,8 +1,10 @@ package com.instacart.formula import com.google.common.truth.Truth +import com.google.common.truth.Truth.assertThat import com.instacart.formula.internal.DelegateTransitionContext import com.instacart.formula.internal.toResult +import com.instacart.formula.test.TestCallback import com.instacart.formula.test.TestListener import org.junit.Test @@ -11,13 +13,32 @@ class TransitionApiTest { @Test fun `none transition`() { val transition = Transition { none() } val result = transition.toResult(DelegateTransitionContext(Unit, 0), Unit) - Truth.assertThat(result).isEqualTo(Transition.Result.None) + assertThat(result).isEqualTo(Transition.Result.None) + } + + @Test fun `none transition has no effects`() { + val result = Transition.Result.None + assertThat(result.effects).isEmpty() + } + + @Test fun `state transition result with effect type but null effect`() { + val result = DelegateTransitionContext(Unit, 0) + .transition(1, Effect.Unconfined, null) + + assertThat(result.state).isEqualTo(1) + assertThat(result.effects).isEmpty() + } + + @Test fun `transition returns null if effect is null`() { + val result = DelegateTransitionContext(Unit, 0) + .transition(Effect.Unconfined, null) + assertThat(result).isEqualTo(Transition.Result.None) } @Test fun `stateful transition`() { val transition = Transition { transition(state + 1) } val result = transition.toResult(DelegateTransitionContext(Unit, 0), Unit).assertStateful() - Truth.assertThat(result.state).isEqualTo(1) + assertThat(result.state).isEqualTo(1) } @Test fun `stateful transition with effects`() { @@ -29,7 +50,7 @@ class TransitionApiTest { } val result = transition.toResult(DelegateTransitionContext(Unit, 0), Unit).assertStateful() - Truth.assertThat(result.state).isEqualTo(1) + assertThat(result.state).isEqualTo(1) result.assertAndExecuteEffects() testListener.assertTimesCalled(1) @@ -54,7 +75,7 @@ class TransitionApiTest { delegate(AddTransition(), 5) } val result = transition.toResult(DelegateTransitionContext(Unit, 0), Unit).assertStateful() - Truth.assertThat(result.state).isEqualTo(5) + assertThat(result.state).isEqualTo(5) } @Test fun `transition combine none transition with stateful transition`() { @@ -63,7 +84,7 @@ class TransitionApiTest { } val result = transition.toResult(DelegateTransitionContext(Unit, 0), Unit).assertStateful() - Truth.assertThat(result.state).isEqualTo(1) + assertThat(result.state).isEqualTo(1) } @Test fun `transition combine only effects transition with stateful transition`() { @@ -74,7 +95,7 @@ class TransitionApiTest { } val result = transition.toResult(DelegateTransitionContext(Unit, 0), Unit).assertStateful() - Truth.assertThat(result.state).isEqualTo(1) + assertThat(result.state).isEqualTo(1) result.assertAndExecuteEffects() testListener.assertTimesCalled(1) @@ -86,7 +107,32 @@ class TransitionApiTest { } val result = transition.toResult(DelegateTransitionContext(Unit, 0), Unit).assertStateful() - Truth.assertThat(result.state).isEqualTo(2) + assertThat(result.state).isEqualTo(2) + } + + @Test fun `combine effect with none`() { + val effect = TestCallback() + val transition = Transition { + transition(effect = effect).andThen { none() } + } + + transition.toResult(DelegateTransitionContext(Unit, 0), Unit).assertAndExecuteEffects() + effect.assertTimesCalled(1) + } + + @Test + fun `combine stateful transition with only effects`() { + val effect = TestCallback() + val transition = Transition { + transition(state + 1).andThen { + transition(effect = effect) + } + } + val result = transition.toResult(DelegateTransitionContext(Unit, 0), Unit).assertStateful() + assertThat(result.state).isEqualTo(1) + result.assertAndExecuteEffects() + + effect.assertTimesCalled(1) } @Test fun `transition combine keeps effect order`() { @@ -97,10 +143,10 @@ class TransitionApiTest { } val result = transition.toResult(DelegateTransitionContext(Unit, 0), Unit).assertStateful() - Truth.assertThat(result.state).isEqualTo(2) + assertThat(result.state).isEqualTo(2) result.assertAndExecuteEffects() - Truth.assertThat(listener.values()).containsExactly(1, 2).inOrder() + assertThat(listener.values()).containsExactly(1, 2).inOrder() } @Test fun `state andThen another stateful result`() { @@ -109,7 +155,7 @@ class TransitionApiTest { } val result = transition.toResult(DelegateTransitionContext(Unit, 0), Unit).assertStateful() - Truth.assertThat(result.state).isEqualTo(3) + assertThat(result.state).isEqualTo(3) } @Test fun `state andThen empty result`() { @@ -119,16 +165,16 @@ class TransitionApiTest { } val result = transition.toResult(DelegateTransitionContext(Unit, 0), Unit).assertStateful() - Truth.assertThat(result.state).isEqualTo(1) + assertThat(result.state).isEqualTo(1) } private fun Transition.Result.assertStateful(): Transition.Result.Stateful { - Truth.assertThat(this).isInstanceOf(Transition.Result.Stateful::class.java) + assertThat(this).isInstanceOf(Transition.Result.Stateful::class.java) return this as Transition.Result.Stateful } private fun Transition.Result.assertAndExecuteEffects() { - Truth.assertThat(effects).isNotEmpty() + assertThat(effects).isNotEmpty() for (effect in effects) { effect.executable() }