Spring/spring-statemachine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Port data tests to assertj

Browse Source
This commit is contained in:
Janne Valkealahti
2020-11-28 14:43:55 +00:00
parent d19b5d298a
commit 2fa227985c
4 changed files with 97 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
spring-statemachine-data/redis/src/test/java/org/springframework/statemachine/data/redis/RedisRepositoryTests.java
View File

@@ -15,9 +15,7 @@
*/
package org.springframework.statemachine.data.redis;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.statemachine.TestUtils.doSendEventAndConsumeAll;
import static org.springframework.statemachine.TestUtils.doStartAndAssert;
import static org.springframework.statemachine.TestUtils.resolveMachine;
@@ -73,18 +71,18 @@ public class RedisRepositoryTests extends AbstractRepositoryTests {
RedisStateRepository stateRepository = context.getBean(RedisStateRepository.class);
RedisTransitionRepository transitionRepository = context.getBean(RedisTransitionRepository.class);
assertThat(stateRepository.count(), is(3l));
assertThat(transitionRepository.count(), is(3l));
assertThat(stateRepository.count()).isEqualTo(3l);
assertThat(transitionRepository.count()).isEqualTo(3l);
List<RedisRepositoryState> states = new ArrayList<>();
stateRepository.findAll().iterator().forEachRemaining(states::add);
List<RedisRepositoryTransition> transitions = new ArrayList<>();
transitionRepository.findAll().iterator().forEachRemaining(transitions::add);
assertThat(states.size(), is(3));
assertThat(transitions.size(), is(3));
assertThat(states).hasSize(3);
assertThat(transitions).hasSize(3);
RedisRepositoryTransition transition1 = transitions.get(0);
assertThat(transition1.getSource(), notNullValue());
assertThat(transition1.getTarget(), notNullValue());
assertThat(transition1.getSource()).isNotNull();
assertThat(transition1.getTarget()).isNotNull();
}
@Test
@@ -95,27 +93,27 @@ public class RedisRepositoryTests extends AbstractRepositoryTests {
RedisStateRepository statesRepository = context.getBean(RedisStateRepository.class);
RedisRepositoryState stateS1 = new RedisRepositoryState("S1");
RedisRepositoryState stateS2 = new RedisRepositoryState("S2");
assertThat(statesRepository.count(), is(0l));
assertThat(statesRepository.count()).isEqualTo(0l);
statesRepository.save(stateS1);
statesRepository.save(stateS2);
assertThat(statesRepository.count(), is(2l));
assertThat(statesRepository.count()).isEqualTo(2l);
RedisTransitionRepository transitionsRepository = context.getBean(RedisTransitionRepository.class);
RedisRepositoryTransition transition = new RedisRepositoryTransition(stateS1, stateS2, "E1");
transition.setKind(TransitionKind.EXTERNAL);
transitionsRepository.save(transition);
assertThat(statesRepository.count(), is(2l));
assertThat(statesRepository.count()).isEqualTo(2l);
RedisRepositoryTransition transition2 = transitionsRepository.findAll().iterator().next();
assertThat(transition2.getSource().getState(), is("S1"));
assertThat(transition2.getTarget().getState(), is("S2"));
assertThat(transition2.getEvent(), is("E1"));
assertThat(transition2.getKind(), is(TransitionKind.EXTERNAL));
assertThat(transition2.getSource().getState()).isEqualTo("S1");
assertThat(transition2.getTarget().getState()).isEqualTo("S2");
assertThat(transition2.getEvent()).isEqualTo("E1");
assertThat(transition2.getKind()).isEqualTo(TransitionKind.EXTERNAL);
List<RedisRepositoryState> findByMachineId = statesRepository.findByMachineId("");
assertThat(findByMachineId.size(), is(2));
assertThat(findByMachineId).hasSize(2);
context.close();
}
@@ -127,11 +125,11 @@ public class RedisRepositoryTests extends AbstractRepositoryTests {
StateMachine<String, String> stateMachine = resolveMachine(context);
doStartAndAssert(stateMachine);
assertThat(stateMachine.getState().getId(), is("S1"));
assertThat(stateMachine.getState().getId()).isEqualTo("S1");
doSendEventAndConsumeAll(stateMachine, "E1");
assertThat(stateMachine.getState().getId(), is("S2"));
assertThat(stateMachine.getState().getId()).isEqualTo("S2");
doSendEventAndConsumeAll(stateMachine, "E2");
assertThat(stateMachine.getState().getId(), is("S1"));
assertThat(stateMachine.getState().getId()).isEqualTo("S1");
}
@Test
@@ -141,11 +139,11 @@ public class RedisRepositoryTests extends AbstractRepositoryTests {
StateMachine<PersistTestStates, PersistTestEvents> stateMachine = resolveMachine(context);
doStartAndAssert(stateMachine);
assertThat(stateMachine.getState().getId(), is(PersistTestStates.S1));
assertThat(stateMachine.getState().getId()).isEqualTo(PersistTestStates.S1);
doSendEventAndConsumeAll(stateMachine, PersistTestEvents.E1);
assertThat(stateMachine.getState().getId(), is(PersistTestStates.S2));
assertThat(stateMachine.getState().getId()).isEqualTo(PersistTestStates.S2);
doSendEventAndConsumeAll(stateMachine, PersistTestEvents.E2);
assertThat(stateMachine.getState().getId(), is(PersistTestStates.S1));
assertThat(stateMachine.getState().getId()).isEqualTo(PersistTestStates.S1);
}
@Override