diff --git a/build.gradle b/build.gradle index 415d9d6a..8d124444 100644 --- a/build.gradle +++ b/build.gradle @@ -410,8 +410,6 @@ project('spring-statemachine-uml') { testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts') testCompile 'io.projectreactor:reactor-test' testCompile 'org.springframework:spring-test' - testCompile 'org.hamcrest:hamcrest-core' - testCompile 'org.hamcrest:hamcrest-library' testCompile("org.junit.jupiter:junit-jupiter-api") testCompile("org.junit.jupiter:junit-jupiter-engine") testCompile 'org.awaitility:awaitility' diff --git a/spring-statemachine-uml/src/test/java/org/springframework/statemachine/uml/UmlStateMachineModelFactoryTests.java b/spring-statemachine-uml/src/test/java/org/springframework/statemachine/uml/UmlStateMachineModelFactoryTests.java index 4c52becb..a321832b 100644 --- a/spring-statemachine-uml/src/test/java/org/springframework/statemachine/uml/UmlStateMachineModelFactoryTests.java +++ b/spring-statemachine-uml/src/test/java/org/springframework/statemachine/uml/UmlStateMachineModelFactoryTests.java @@ -15,12 +15,7 @@ */ package org.springframework.statemachine.uml; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; +import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.statemachine.TestUtils.doSendEventAndConsumeAll; import static org.springframework.statemachine.TestUtils.doStartAndAssert; @@ -68,16 +63,16 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { UmlStateMachineModelFactory builder = new UmlStateMachineModelFactory(model1); builder.registerAction("action1", new LatchAction()); builder.setBeanFactory(context); - assertThat(model1.exists(), is(true)); + assertThat(model1.exists()).isTrue(); StateMachineModel stateMachineModel = builder.build(); - assertThat(stateMachineModel, notNullValue()); + assertThat(stateMachineModel).isNotNull(); Collection> stateDatas = stateMachineModel.getStatesData().getStateData(); - assertThat(stateDatas.size(), is(2)); + assertThat(stateDatas.size()).isEqualTo(2); for (StateData stateData : stateDatas) { if (stateData.getState().equals("S1")) { - assertThat(stateData.isInitial(), is(true)); + assertThat(stateData.isInitial()).isTrue(); } else if (stateData.getState().equals("S2")) { - assertThat(stateData.isInitial(), is(false)); + assertThat(stateData.isInitial()).isFalse(); } else { throw new IllegalArgumentException(); } @@ -92,16 +87,16 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { resolver.registerAction("action1", new LatchAction()); UmlStateMachineModelFactory builder = new UmlStateMachineModelFactory(model1); builder.setStateMachineComponentResolver(resolver); - assertThat(model1.exists(), is(true)); + assertThat(model1.exists()).isTrue(); StateMachineModel stateMachineModel = builder.build(); - assertThat(stateMachineModel, notNullValue()); + assertThat(stateMachineModel).isNotNull(); Collection> stateDatas = stateMachineModel.getStatesData().getStateData(); - assertThat(stateDatas.size(), is(2)); + assertThat(stateDatas.size()).isEqualTo(2); for (StateData stateData : stateDatas) { if (stateData.getState().equals("S1")) { - assertThat(stateData.isInitial(), is(true)); + assertThat(stateData.isInitial()).isTrue(); } else if (stateData.getState().equals("S2")) { - assertThat(stateData.isInitial(), is(false)); + assertThat(stateData.isInitial()).isFalse(); } else { throw new IllegalArgumentException(); } @@ -114,24 +109,24 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { Resource model1 = new ClassPathResource("org/springframework/statemachine/uml/simple-submachine.uml"); UmlStateMachineModelFactory builder = new UmlStateMachineModelFactory(model1); builder.setBeanFactory(context); - assertThat(model1.exists(), is(true)); + assertThat(model1.exists()).isTrue(); StateMachineModel stateMachineModel = builder.build(); - assertThat(stateMachineModel, notNullValue()); + assertThat(stateMachineModel).isNotNull(); Collection> stateDatas = stateMachineModel.getStatesData().getStateData(); - assertThat(stateDatas.size(), is(4)); + assertThat(stateDatas.size()).isEqualTo(4); for (StateData stateData : stateDatas) { if (stateData.getState().equals("S1")) { - assertThat(stateData.isInitial(), is(true)); - assertThat(stateData.getParent(), nullValue()); + assertThat(stateData.isInitial()).isTrue(); + assertThat(stateData.getParent()).isNull(); } else if (stateData.getState().equals("S2")) { - assertThat(stateData.isInitial(), is(false)); - assertThat(stateData.getParent(), nullValue()); + assertThat(stateData.isInitial()).isFalse(); + assertThat(stateData.getParent()).isNull(); } else if (stateData.getState().equals("S11")) { - assertThat(stateData.isInitial(), is(true)); - assertThat(stateData.getParent(), is("S1")); + assertThat(stateData.isInitial()).isTrue(); + assertThat(stateData.getParent()).isEqualTo("S1"); } else if (stateData.getState().equals("S12")) { - assertThat(stateData.isInitial(), is(false)); - assertThat(stateData.getParent(), is("S1")); + assertThat(stateData.isInitial()).isFalse(); + assertThat(stateData.getParent()).isEqualTo("S1"); } else { throw new IllegalArgumentException(); } @@ -144,24 +139,24 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { Resource model1 = new ClassPathResource("org/springframework/statemachine/uml/simple-root-regions.uml"); UmlStateMachineModelFactory builder = new UmlStateMachineModelFactory(model1); builder.setBeanFactory(context); - assertThat(model1.exists(), is(true)); + assertThat(model1.exists()).isTrue(); StateMachineModel stateMachineModel = builder.build(); - assertThat(stateMachineModel, notNullValue()); + assertThat(stateMachineModel).isNotNull(); Collection> stateDatas = stateMachineModel.getStatesData().getStateData(); - assertThat(stateDatas.size(), is(4)); + assertThat(stateDatas.size()).isEqualTo(4); for (StateData stateData : stateDatas) { if (stateData.getState().equals("S1")) { - assertThat(stateData.isInitial(), is(true)); - assertThat(stateData.getRegion(), notNullValue()); + assertThat(stateData.isInitial()).isTrue(); + assertThat(stateData.getRegion()).isNotNull(); } else if (stateData.getState().equals("S2")) { - assertThat(stateData.isInitial(), is(false)); - assertThat(stateData.getRegion(), notNullValue()); + assertThat(stateData.isInitial()).isFalse(); + assertThat(stateData.getRegion()).isNotNull(); } else if (stateData.getState().equals("S3")) { - assertThat(stateData.isInitial(), is(true)); - assertThat(stateData.getRegion(), notNullValue()); + assertThat(stateData.isInitial()).isTrue(); + assertThat(stateData.getRegion()).isNotNull(); } else if (stateData.getState().equals("S4")) { - assertThat(stateData.isInitial(), is(false)); - assertThat(stateData.getRegion(), notNullValue()); + assertThat(stateData.isInitial()).isFalse(); + assertThat(stateData.getRegion()).isNotNull(); } else { throw new IllegalArgumentException(); } @@ -174,20 +169,20 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { Resource model1 = new ClassPathResource("org/springframework/statemachine/uml/simple-flat-end.uml"); UmlStateMachineModelFactory builder = new UmlStateMachineModelFactory(model1); builder.setBeanFactory(context); - assertThat(model1.exists(), is(true)); + assertThat(model1.exists()).isTrue(); StateMachineModel stateMachineModel = builder.build(); - assertThat(stateMachineModel, notNullValue()); + assertThat(stateMachineModel).isNotNull(); Collection> stateDatas = stateMachineModel.getStatesData().getStateData(); - assertThat(stateDatas.size(), is(3)); + assertThat(stateDatas.size()).isEqualTo(3); for (StateData stateData : stateDatas) { if (stateData.getState().equals("S1")) { - assertThat(stateData.isInitial(), is(true)); - assertThat(stateData.isEnd(), is(false)); + assertThat(stateData.isInitial()).isTrue(); + assertThat(stateData.isEnd()).isFalse(); } else if (stateData.getState().equals("S2")) { - assertThat(stateData.isInitial(), is(false)); - assertThat(stateData.isEnd(), is(false)); + assertThat(stateData.isInitial()).isFalse(); + assertThat(stateData.isEnd()).isFalse(); } else if (stateData.getState().equals("S3")) { - assertThat(stateData.isEnd(), is(true)); + assertThat(stateData.isEnd()).isTrue(); } else { throw new IllegalArgumentException(); } @@ -200,36 +195,36 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { Resource model1 = new ClassPathResource("org/springframework/statemachine/uml/simple-entryexit.uml"); UmlStateMachineModelFactory builder = new UmlStateMachineModelFactory(model1); builder.setBeanFactory(context); - assertThat(model1.exists(), is(true)); + assertThat(model1.exists()).isTrue(); StateMachineModel stateMachineModel = builder.build(); - assertThat(stateMachineModel, notNullValue()); + assertThat(stateMachineModel).isNotNull(); Collection> stateDatas = stateMachineModel.getStatesData().getStateData(); - assertThat(stateDatas.size(), is(8)); + assertThat(stateDatas.size()).isEqualTo(8); for (StateData stateData : stateDatas) { if (stateData.getState().equals("S1")) { - assertThat(stateData.isInitial(), is(true)); + assertThat(stateData.isInitial()).isTrue(); } else if (stateData.getState().equals("S2")) { - assertThat(stateData.isInitial(), is(false)); + assertThat(stateData.isInitial()).isFalse(); } else if (stateData.getState().equals("S21")) { - assertThat(stateData.isInitial(), is(true)); + assertThat(stateData.isInitial()).isTrue(); } else if (stateData.getState().equals("S22")) { - assertThat(stateData.isInitial(), is(false)); + assertThat(stateData.isInitial()).isFalse(); } else if (stateData.getState().equals("S3")) { - assertThat(stateData.isInitial(), is(false)); + assertThat(stateData.isInitial()).isFalse(); } else if (stateData.getState().equals("S4")) { - assertThat(stateData.isInitial(), is(false)); + assertThat(stateData.isInitial()).isFalse(); } else if (stateData.getState().equals("ENTRY")) { - assertThat(stateData.isInitial(), is(false)); - assertThat(stateData.getPseudoStateKind(), is(PseudoStateKind.ENTRY)); + assertThat(stateData.isInitial()).isFalse(); + assertThat(stateData.getPseudoStateKind()).isEqualTo(PseudoStateKind.ENTRY); } else if (stateData.getState().equals("EXIT")) { - assertThat(stateData.getPseudoStateKind(), is(PseudoStateKind.EXIT)); - assertThat(stateData.isInitial(), is(false)); + assertThat(stateData.getPseudoStateKind()).isEqualTo(PseudoStateKind.EXIT); + assertThat(stateData.isInitial()).isFalse(); } else { throw new IllegalArgumentException(); } } - assertThat(stateMachineModel.getTransitionsData().getEntrys().size(), is(1)); - assertThat(stateMachineModel.getTransitionsData().getExits().size(), is(1)); + assertThat(stateMachineModel.getTransitionsData().getEntrys().size()).isEqualTo(1); + assertThat(stateMachineModel.getTransitionsData().getExits().size()).isEqualTo(1); } @Test @@ -241,10 +236,10 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { LatchAction action1 = context.getBean("action1", LatchAction.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), contains("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(action1.latch.await(2, TimeUnit.SECONDS), is(true)); - assertThat(stateMachine.getState().getIds(), contains("S2")); + assertThat(action1.latch.await(2, TimeUnit.SECONDS)).isTrue(); + assertThat(stateMachine.getState().getIds()).contains("S2"); } @Test @@ -255,11 +250,11 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), contains("S1", "S11")); + assertThat(stateMachine.getState().getIds()).contains("S1", "S11"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), contains("S1", "S12")); + assertThat(stateMachine.getState().getIds()).contains("S1", "S12"); doSendEventAndConsumeAll(stateMachine, "E2"); - assertThat(stateMachine.getState().getIds(), contains("S2")); + assertThat(stateMachine.getState().getIds()).contains("S2"); } @Test @@ -270,11 +265,11 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1", "S3")); + assertThat(stateMachine.getState().getIds()).contains("S1", "S3"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S3")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S3"); doSendEventAndConsumeAll(stateMachine, "E2"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S4")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S4"); } @Test @@ -285,11 +280,11 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E3"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S22")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S22"); doSendEventAndConsumeAll(stateMachine, "E4"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S4")); + assertThat(stateMachine.getState().getIds()).contains("S4"); } @Test @@ -299,9 +294,9 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, MessageBuilder.withPayload("E1").setHeader("choice", "s2").build()); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2")); + assertThat(stateMachine.getState().getIds()).contains("S2"); } @Test @@ -311,9 +306,9 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, MessageBuilder.withPayload("E1").setHeader("choice", "s3").build()); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S3")); + assertThat(stateMachine.getState().getIds()).contains("S3"); } @Test @@ -323,9 +318,9 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S4")); + assertThat(stateMachine.getState().getIds()).contains("S4"); } @Test @@ -335,9 +330,9 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, MessageBuilder.withPayload("E1").setHeader("choice", "s2").build()); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2")); + assertThat(stateMachine.getState().getIds()).contains("S2"); } @Test @@ -347,13 +342,13 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("SI")); + assertThat(stateMachine.getState().getIds()).contains("SI"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S20", "S30")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S20", "S30"); doSendEventAndConsumeAll(stateMachine, "E2"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21", "S30")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21", "S30"); doSendEventAndConsumeAll(stateMachine, "E3"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("SF")); + assertThat(stateMachine.getState().getIds()).contains("SF"); } @Test @@ -363,13 +358,13 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("SI")); + assertThat(stateMachine.getState().getIds()).contains("SI"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S20", "S30")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S20", "S30"); doSendEventAndConsumeAll(stateMachine, "E2"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21", "S30")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21", "S30"); doSendEventAndConsumeAll(stateMachine, "E3"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S4")); + assertThat(stateMachine.getState().getIds()).contains("S4"); } @Test @@ -380,13 +375,13 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); stateMachine.getExtendedState().getVariables().put("foo", "bar"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("SI")); + assertThat(stateMachine.getState().getIds()).contains("SI"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S20", "S30")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S20", "S30"); doSendEventAndConsumeAll(stateMachine, "E2"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21", "S30")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21", "S30"); doSendEventAndConsumeAll(stateMachine, "E3"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("SF")); + assertThat(stateMachine.getState().getIds()).contains("SF"); } @Test @@ -396,15 +391,15 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S20")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S20"); doSendEventAndConsumeAll(stateMachine, "E2"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21"); doSendEventAndConsumeAll(stateMachine, "E3"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E4"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21"); } @Test @@ -414,15 +409,15 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21", "S211")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21", "S211"); doSendEventAndConsumeAll(stateMachine, "E2"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21", "S212")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21", "S212"); doSendEventAndConsumeAll(stateMachine, "E3"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E4"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21", "S212")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21", "S212"); } @Test @@ -432,11 +427,11 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2")); + assertThat(stateMachine.getState().getIds()).contains("S2"); doSendEventAndConsumeAll(stateMachine, MessageBuilder.withPayload("E4").setHeader("junction", "s5").build()); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S5")); + assertThat(stateMachine.getState().getIds()).contains("S5"); } @Test @@ -446,11 +441,11 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E2"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S3")); + assertThat(stateMachine.getState().getIds()).contains("S3"); doSendEventAndConsumeAll(stateMachine, MessageBuilder.withPayload("E4").setHeader("junction", "s6").build()); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S6")); + assertThat(stateMachine.getState().getIds()).contains("S6"); } @Test @@ -460,11 +455,11 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E3"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S4")); + assertThat(stateMachine.getState().getIds()).contains("S4"); doSendEventAndConsumeAll(stateMachine, "E4"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S7")); + assertThat(stateMachine.getState().getIds()).contains("S7"); } @Test @@ -479,14 +474,14 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { LatchAction s1Exit = context.getBean("s1Exit", LatchAction.class); LatchAction s2Entry = context.getBean("s2Entry", LatchAction.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2")); - assertThat(e1Action.latch.await(1, TimeUnit.SECONDS), is(true)); - assertThat(s1Exit.latch.await(1, TimeUnit.SECONDS), is(true)); - assertThat(s2Entry.latch.await(1, TimeUnit.SECONDS), is(true)); - assertThat(listener.latch.await(1, TimeUnit.SECONDS), is(true)); - assertThat(stateMachine.getExtendedState().getVariables().get("hellos2do"), is("hellos2dovalue")); + assertThat(stateMachine.getState().getIds()).contains("S2"); + assertThat(e1Action.latch.await(1, TimeUnit.SECONDS)).isTrue(); + assertThat(s1Exit.latch.await(1, TimeUnit.SECONDS)).isTrue(); + assertThat(s2Entry.latch.await(1, TimeUnit.SECONDS)).isTrue(); + assertThat(listener.latch.await(1, TimeUnit.SECONDS)).isTrue(); + assertThat(stateMachine.getExtendedState().getVariables().get("hellos2do")).isEqualTo("hellos2dovalue"); } @Test @@ -494,22 +489,22 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); Resource model1 = new ClassPathResource("org/springframework/statemachine/uml/simple-eventdefer.uml"); UmlStateMachineModelFactory builder = new UmlStateMachineModelFactory(model1); - assertThat(model1.exists(), is(true)); + assertThat(model1.exists()).isTrue(); StateMachineModel stateMachineModel = builder.build(); - assertThat(stateMachineModel, notNullValue()); + assertThat(stateMachineModel).isNotNull(); Collection> stateDatas = stateMachineModel.getStatesData().getStateData(); - assertThat(stateDatas.size(), is(3)); + assertThat(stateDatas.size()).isEqualTo(3); for (StateData stateData : stateDatas) { if (stateData.getState().equals("S1")) { - assertThat(stateData.isInitial(), is(true)); - assertThat(stateData.getDeferred().size(), is(1)); - assertThat(stateData.getDeferred().iterator().next(), is("E2")); + assertThat(stateData.isInitial()).isTrue(); + assertThat(stateData.getDeferred().size()).isEqualTo(1); + assertThat(stateData.getDeferred().iterator().next()).isEqualTo("E2"); } else if (stateData.getState().equals("S2")) { - assertThat(stateData.isInitial(), is(false)); - assertThat(stateData.getDeferred().size(), is(0)); + assertThat(stateData.isInitial()).isFalse(); + assertThat(stateData.getDeferred().size()).isEqualTo(0); } else if (stateData.getState().equals("S3")) { - assertThat(stateData.isInitial(), is(false)); - assertThat(stateData.getDeferred().size(), is(0)); + assertThat(stateData.isInitial()).isFalse(); + assertThat(stateData.getDeferred().size()).isEqualTo(0); } else { throw new IllegalArgumentException(); } @@ -521,21 +516,21 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); Resource model1 = new ClassPathResource("org/springframework/statemachine/uml/simple-transitiontypes.uml"); UmlStateMachineModelFactory builder = new UmlStateMachineModelFactory(model1); - assertThat(model1.exists(), is(true)); + assertThat(model1.exists()).isTrue(); StateMachineModel stateMachineModel = builder.build(); - assertThat(stateMachineModel, notNullValue()); + assertThat(stateMachineModel).isNotNull(); Collection> stateDatas = stateMachineModel.getStatesData().getStateData(); Collection> transitionDatas = stateMachineModel.getTransitionsData().getTransitions(); - assertThat(stateDatas.size(), is(2)); - assertThat(transitionDatas.size(), is(4)); + assertThat(stateDatas.size()).isEqualTo(2); + assertThat(transitionDatas.size()).isEqualTo(4); for (TransitionData transitionData : transitionDatas) { if (transitionData.getEvent() != null) { if (transitionData.getEvent().equals("E1")) { - assertThat(transitionData.getKind(), is(TransitionKind.EXTERNAL)); + assertThat(transitionData.getKind()).isEqualTo(TransitionKind.EXTERNAL); } else if (transitionData.getEvent().equals("E2")) { - assertThat(transitionData.getKind(), is(TransitionKind.LOCAL)); + assertThat(transitionData.getKind()).isEqualTo(TransitionKind.LOCAL); } else if (transitionData.getEvent().equals("E3")) { - assertThat(transitionData.getKind(), is(TransitionKind.INTERNAL)); + assertThat(transitionData.getKind()).isEqualTo(TransitionKind.INTERNAL); } else { throw new IllegalArgumentException(); } @@ -550,9 +545,9 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E4"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S22")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S22"); } @Test @@ -563,10 +558,10 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { StateMachine stateMachine = context.getBean(StateMachine.class); LatchAction s3Entry = context.getBean("s3Entry", LatchAction.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(s3Entry.latch.await(2, TimeUnit.SECONDS), is(true)); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S3")); + assertThat(s3Entry.latch.await(2, TimeUnit.SECONDS)).isTrue(); + assertThat(stateMachine.getState().getIds()).contains("S3"); } @Test @@ -577,10 +572,10 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { StateMachine stateMachine = context.getBean(StateMachine.class); LatchAction s5Entry = context.getBean("s5Entry", LatchAction.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E2"); - assertThat(s5Entry.latch.await(2, TimeUnit.SECONDS), is(true)); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S5")); + assertThat(s5Entry.latch.await(2, TimeUnit.SECONDS)).isTrue(); + assertThat(stateMachine.getState().getIds()).contains("S5"); } @Test @@ -590,9 +585,9 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); } @Test @@ -602,9 +597,9 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E2"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S3")); + assertThat(stateMachine.getState().getIds()).contains("S3"); } @Test @@ -615,8 +610,8 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { StateMachine stateMachine = context.getBean(StateMachine.class); LatchAction initialAction = context.getBean("initialAction", LatchAction.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); - assertThat(initialAction.latch.await(1, TimeUnit.SECONDS), is(true)); + assertThat(stateMachine.getState().getIds()).contains("S1"); + assertThat(initialAction.latch.await(1, TimeUnit.SECONDS)).isTrue(); } @Test @@ -627,11 +622,11 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, MessageBuilder.withPayload("E1").setHeader("foo", "bar").build()); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2")); - assertThat(stateMachine.getExtendedState().get("myvar1", String.class), is("myvalue1")); - assertThat(stateMachine.getExtendedState().get("myvar2", String.class), is("myvalue2")); + assertThat(stateMachine.getState().getIds()).contains("S2"); + assertThat(stateMachine.getExtendedState().get("myvar1", String.class)).isEqualTo("myvalue1"); + assertThat(stateMachine.getExtendedState().get("myvar2", String.class)).isEqualTo("myvalue2"); } @Test @@ -642,9 +637,9 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); } @Test @@ -672,15 +667,15 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S20")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S20"); doSendEventAndConsumeAll(stateMachine, "E2"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21", "S30")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21", "S30"); doSendEventAndConsumeAll(stateMachine, "E3"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21", "S31")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21", "S31"); doSendEventAndConsumeAll(stateMachine, "E4"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S3")); + assertThat(stateMachine.getState().getIds()).contains("S3"); } @Test @@ -692,13 +687,13 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { LatchAction e1Action = context.getBean("e1Action", LatchAction.class); LatchAction e2Action = context.getBean("e2Action", LatchAction.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); - assertThat(e1Action.latch.await(1, TimeUnit.SECONDS), is(true)); + assertThat(stateMachine.getState().getIds()).contains("S1"); + assertThat(e1Action.latch.await(1, TimeUnit.SECONDS)).isTrue(); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2")); - assertThat(e2Action.latch.await(1, TimeUnit.SECONDS), is(true)); + assertThat(stateMachine.getState().getIds()).contains("S2"); + assertThat(e2Action.latch.await(1, TimeUnit.SECONDS)).isTrue(); doSendEventAndConsumeAll(stateMachine, "E2"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S3")); + assertThat(stateMachine.getState().getIds()).contains("S3"); } @Test @@ -707,20 +702,20 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.register(Config23.class); context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); - assertThat(stateMachine, notNullValue()); + assertThat(stateMachine).isNotNull(); TestListener listener = new TestListener(); stateMachine.addStateListener(listener); doStartAndAssert(stateMachine); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21"); listener.reset(); doSendEventAndConsumeAll(stateMachine, "E20"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21")); - assertThat(listener.exited.size(), is(2)); - assertThat(listener.entered.size(), is(2)); - assertThat(listener.exited, containsInAnyOrder("S2", "S21")); - assertThat(listener.entered, containsInAnyOrder("S2", "S21")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21"); + assertThat(listener.exited.size()).isEqualTo(2); + assertThat(listener.entered.size()).isEqualTo(2); + assertThat(listener.exited).contains("S2", "S21"); + assertThat(listener.entered).contains("S2", "S21"); } @Test @@ -729,20 +724,20 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.register(Config23.class); context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); - assertThat(stateMachine, notNullValue()); + assertThat(stateMachine).isNotNull(); TestListener listener = new TestListener(); stateMachine.addStateListener(listener); doStartAndAssert(stateMachine); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21"); listener.reset(); doSendEventAndConsumeAll(stateMachine, "E30"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21")); - assertThat(listener.exited.size(), is(1)); - assertThat(listener.entered.size(), is(1)); - assertThat(listener.exited, containsInAnyOrder("S21")); - assertThat(listener.entered, containsInAnyOrder("S21")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21"); + assertThat(listener.exited.size()).isEqualTo(1); + assertThat(listener.entered.size()).isEqualTo(1); + assertThat(listener.exited).contains("S21"); + assertThat(listener.entered).contains("S21"); } @Test @@ -751,20 +746,20 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.register(Config23.class); context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); - assertThat(stateMachine, notNullValue()); + assertThat(stateMachine).isNotNull(); TestListener listener = new TestListener(); stateMachine.addStateListener(listener); doStartAndAssert(stateMachine); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21"); listener.reset(); doSendEventAndConsumeAll(stateMachine, "E21"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S22")); - assertThat(listener.exited.size(), is(2)); - assertThat(listener.entered.size(), is(2)); - assertThat(listener.exited, containsInAnyOrder("S2", "S21")); - assertThat(listener.entered, containsInAnyOrder("S2", "S22")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S22"); + assertThat(listener.exited.size()).isEqualTo(2); + assertThat(listener.entered.size()).isEqualTo(2); + assertThat(listener.exited).contains("S2", "S21"); + assertThat(listener.entered).contains("S2", "S22"); } @Test @@ -773,20 +768,20 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.register(Config23.class); context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); - assertThat(stateMachine, notNullValue()); + assertThat(stateMachine).isNotNull(); TestListener listener = new TestListener(); stateMachine.addStateListener(listener); doStartAndAssert(stateMachine); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21"); listener.reset(); doSendEventAndConsumeAll(stateMachine, "E31"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S22")); - assertThat(listener.exited.size(), is(1)); - assertThat(listener.entered.size(), is(1)); - assertThat(listener.exited, containsInAnyOrder("S21")); - assertThat(listener.entered, containsInAnyOrder("S22")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S22"); + assertThat(listener.exited.size()).isEqualTo(1); + assertThat(listener.entered.size()).isEqualTo(1); + assertThat(listener.exited).contains("S21"); + assertThat(listener.entered).contains("S22"); } @Test @@ -795,20 +790,20 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.register(Config23.class); context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); - assertThat(stateMachine, notNullValue()); + assertThat(stateMachine).isNotNull(); TestListener listener = new TestListener(); stateMachine.addStateListener(listener); doStartAndAssert(stateMachine); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21"); listener.reset(); doSendEventAndConsumeAll(stateMachine, "E22"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21")); - assertThat(listener.exited.size(), is(2)); - assertThat(listener.entered.size(), is(2)); - assertThat(listener.exited, containsInAnyOrder("S2", "S21")); - assertThat(listener.entered, containsInAnyOrder("S2", "S21")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21"); + assertThat(listener.exited.size()).isEqualTo(2); + assertThat(listener.entered.size()).isEqualTo(2); + assertThat(listener.exited).contains("S2", "S21"); + assertThat(listener.entered).contains("S2", "S21"); } @Test @@ -817,20 +812,20 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.register(Config23.class); context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); - assertThat(stateMachine, notNullValue()); + assertThat(stateMachine).isNotNull(); TestListener listener = new TestListener(); stateMachine.addStateListener(listener); doStartAndAssert(stateMachine); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21"); listener.reset(); doSendEventAndConsumeAll(stateMachine, "E32"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21")); - assertThat(listener.exited.size(), is(1)); - assertThat(listener.entered.size(), is(1)); - assertThat(listener.exited, containsInAnyOrder("S21")); - assertThat(listener.entered, containsInAnyOrder("S21")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21"); + assertThat(listener.exited.size()).isEqualTo(1); + assertThat(listener.entered.size()).isEqualTo(1); + assertThat(listener.exited).contains("S21"); + assertThat(listener.entered).contains("S21"); } @Test @@ -839,28 +834,28 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.register(Config23.class); context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); - assertThat(stateMachine, notNullValue()); + assertThat(stateMachine).isNotNull(); TestListener listener = new TestListener(); stateMachine.addStateListener(listener); doStartAndAssert(stateMachine); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21"); listener.reset(); doSendEventAndConsumeAll(stateMachine, "E21"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S22")); - assertThat(listener.exited.size(), is(2)); - assertThat(listener.entered.size(), is(2)); - assertThat(listener.exited, containsInAnyOrder("S2", "S21")); - assertThat(listener.entered, containsInAnyOrder("S2", "S22")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S22"); + assertThat(listener.exited.size()).isEqualTo(2); + assertThat(listener.entered.size()).isEqualTo(2); + assertThat(listener.exited).contains("S2", "S21"); + assertThat(listener.entered).contains("S2", "S22"); listener.reset(); doSendEventAndConsumeAll(stateMachine, "E23"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S22")); - assertThat(listener.exited.size(), is(2)); - assertThat(listener.entered.size(), is(2)); - assertThat(listener.exited, containsInAnyOrder("S2", "S22")); - assertThat(listener.entered, containsInAnyOrder("S2", "S22")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S22"); + assertThat(listener.exited.size()).isEqualTo(2); + assertThat(listener.entered.size()).isEqualTo(2); + assertThat(listener.exited).contains("S2", "S22"); + assertThat(listener.entered).contains("S2", "S22"); } @Test @@ -869,28 +864,28 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.register(Config23.class); context.refresh(); StateMachine stateMachine = context.getBean(StateMachine.class); - assertThat(stateMachine, notNullValue()); + assertThat(stateMachine).isNotNull(); TestListener listener = new TestListener(); stateMachine.addStateListener(listener); doStartAndAssert(stateMachine); doSendEventAndConsumeAll(stateMachine, "E1"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S21")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S21"); listener.reset(); doSendEventAndConsumeAll(stateMachine, "E31"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S22")); - assertThat(listener.exited.size(), is(1)); - assertThat(listener.entered.size(), is(1)); - assertThat(listener.exited, containsInAnyOrder("S21")); - assertThat(listener.entered, containsInAnyOrder("S22")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S22"); + assertThat(listener.exited.size()).isEqualTo(1); + assertThat(listener.entered.size()).isEqualTo(1); + assertThat(listener.exited).contains("S21"); + assertThat(listener.entered).contains("S22"); listener.reset(); doSendEventAndConsumeAll(stateMachine, "E33"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S22")); - assertThat(listener.exited.size(), is(1)); - assertThat(listener.entered.size(), is(1)); - assertThat(listener.exited, containsInAnyOrder("S22")); - assertThat(listener.entered, containsInAnyOrder("S22")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S22"); + assertThat(listener.exited.size()).isEqualTo(1); + assertThat(listener.entered.size()).isEqualTo(1); + assertThat(listener.exited).contains("S22"); + assertThat(listener.entered).contains("S22"); } @Test @@ -901,11 +896,11 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, "E3"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2", "S22")); + assertThat(stateMachine.getState().getIds()).contains("S2", "S22"); doSendEventAndConsumeAll(stateMachine, "E4"); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S4")); + assertThat(stateMachine.getState().getIds()).contains("S4"); } @Test @@ -914,36 +909,36 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { Resource model1 = new ClassPathResource("org/springframework/statemachine/uml/simple-connectionpointref.uml"); UmlStateMachineModelFactory builder = new UmlStateMachineModelFactory(model1); builder.setBeanFactory(context); - assertThat(model1.exists(), is(true)); + assertThat(model1.exists()).isTrue(); StateMachineModel stateMachineModel = builder.build(); - assertThat(stateMachineModel, notNullValue()); + assertThat(stateMachineModel).isNotNull(); Collection> stateDatas = stateMachineModel.getStatesData().getStateData(); - assertThat(stateDatas.size(), is(8)); + assertThat(stateDatas.size()).isEqualTo(8); for (StateData stateData : stateDatas) { if (stateData.getState().equals("S1")) { - assertThat(stateData.isInitial(), is(true)); + assertThat(stateData.isInitial()).isTrue(); } else if (stateData.getState().equals("S2")) { - assertThat(stateData.isInitial(), is(false)); + assertThat(stateData.isInitial()).isFalse(); } else if (stateData.getState().equals("S21")) { - assertThat(stateData.isInitial(), is(true)); + assertThat(stateData.isInitial()).isTrue(); } else if (stateData.getState().equals("S22")) { - assertThat(stateData.isInitial(), is(false)); + assertThat(stateData.isInitial()).isFalse(); } else if (stateData.getState().equals("S3")) { - assertThat(stateData.isInitial(), is(false)); + assertThat(stateData.isInitial()).isFalse(); } else if (stateData.getState().equals("S4")) { - assertThat(stateData.isInitial(), is(false)); + assertThat(stateData.isInitial()).isFalse(); } else if (stateData.getState().equals("ENTRY")) { - assertThat(stateData.isInitial(), is(false)); - assertThat(stateData.getPseudoStateKind(), is(PseudoStateKind.ENTRY)); + assertThat(stateData.isInitial()).isFalse(); + assertThat(stateData.getPseudoStateKind()).isEqualTo(PseudoStateKind.ENTRY); } else if (stateData.getState().equals("EXIT")) { - assertThat(stateData.getPseudoStateKind(), is(PseudoStateKind.EXIT)); - assertThat(stateData.isInitial(), is(false)); + assertThat(stateData.getPseudoStateKind()).isEqualTo(PseudoStateKind.EXIT); + assertThat(stateData.isInitial()).isFalse(); } else { throw new IllegalArgumentException(); } } - assertThat(stateMachineModel.getTransitionsData().getEntrys().size(), is(1)); - assertThat(stateMachineModel.getTransitionsData().getExits().size(), is(1)); + assertThat(stateMachineModel.getTransitionsData().getEntrys().size()).isEqualTo(1); + assertThat(stateMachineModel.getTransitionsData().getExits().size()).isEqualTo(1); } @Test @@ -958,13 +953,13 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { LatchAction choiceToS4 = context.getBean("choiceToS4", LatchAction.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, MessageBuilder.withPayload("E1").setHeader("choice", "s2").build()); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2")); + assertThat(stateMachine.getState().getIds()).contains("S2"); - assertThat(s1ToChoice.latch.await(1, TimeUnit.SECONDS), is(true)); - assertThat(choiceToS2.latch.await(1, TimeUnit.SECONDS), is(true)); - assertThat(choiceToS4.latch.await(1, TimeUnit.SECONDS), is(false)); + assertThat(s1ToChoice.latch.await(1, TimeUnit.SECONDS)).isTrue(); + assertThat(choiceToS2.latch.await(1, TimeUnit.SECONDS)).isTrue(); + assertThat(choiceToS4.latch.await(1, TimeUnit.SECONDS)).isFalse(); } @Test @@ -979,13 +974,13 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { LatchAction choiceToS4 = context.getBean("choiceToS4", LatchAction.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, MessageBuilder.withPayload("E1").build()); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S4")); + assertThat(stateMachine.getState().getIds()).contains("S4"); - assertThat(s1ToChoice.latch.await(1, TimeUnit.SECONDS), is(true)); - assertThat(choiceToS2.latch.await(1, TimeUnit.SECONDS), is(false)); - assertThat(choiceToS4.latch.await(1, TimeUnit.SECONDS), is(true)); + assertThat(s1ToChoice.latch.await(1, TimeUnit.SECONDS)).isTrue(); + assertThat(choiceToS2.latch.await(1, TimeUnit.SECONDS)).isFalse(); + assertThat(choiceToS4.latch.await(1, TimeUnit.SECONDS)).isTrue(); } @Test @@ -1003,16 +998,16 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { LatchAction choiceToS6 = context.getBean("choiceToS6", LatchAction.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, MessageBuilder.withPayload("E1").setHeader("choice", "choice2").build()); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S6")); + assertThat(stateMachine.getState().getIds()).contains("S6"); - assertThat(s1ToChoice.latch.await(1, TimeUnit.SECONDS), is(true)); - assertThat(choiceToS2.latch.await(1, TimeUnit.SECONDS), is(false)); - assertThat(choiceToS4.latch.await(1, TimeUnit.SECONDS), is(false)); - assertThat(choice1ToChoice2.latch.await(1, TimeUnit.SECONDS), is(true)); - assertThat(choiceToS5.latch.await(1, TimeUnit.SECONDS), is(false)); - assertThat(choiceToS6.latch.await(1, TimeUnit.SECONDS), is(true)); + assertThat(s1ToChoice.latch.await(1, TimeUnit.SECONDS)).isTrue(); + assertThat(choiceToS2.latch.await(1, TimeUnit.SECONDS)).isFalse(); + assertThat(choiceToS4.latch.await(1, TimeUnit.SECONDS)).isFalse(); + assertThat(choice1ToChoice2.latch.await(1, TimeUnit.SECONDS)).isTrue(); + assertThat(choiceToS5.latch.await(1, TimeUnit.SECONDS)).isFalse(); + assertThat(choiceToS6.latch.await(1, TimeUnit.SECONDS)).isTrue(); } @Test @@ -1027,13 +1022,13 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { LatchAction choiceToS4 = context.getBean("choiceToS4", LatchAction.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, MessageBuilder.withPayload("E1").setHeader("choice", "s2").build()); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2")); + assertThat(stateMachine.getState().getIds()).contains("S2"); - assertThat(s1ToChoice.latch.await(1, TimeUnit.SECONDS), is(true)); - assertThat(choiceToS2.latch.await(1, TimeUnit.SECONDS), is(true)); - assertThat(choiceToS4.latch.await(1, TimeUnit.SECONDS), is(false)); + assertThat(s1ToChoice.latch.await(1, TimeUnit.SECONDS)).isTrue(); + assertThat(choiceToS2.latch.await(1, TimeUnit.SECONDS)).isTrue(); + assertThat(choiceToS4.latch.await(1, TimeUnit.SECONDS)).isFalse(); } @Test @@ -1048,13 +1043,13 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { LatchAction choiceToS4 = context.getBean("choiceToS4", LatchAction.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, MessageBuilder.withPayload("E1").build()); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S4")); + assertThat(stateMachine.getState().getIds()).contains("S4"); - assertThat(s1ToChoice.latch.await(1, TimeUnit.SECONDS), is(true)); - assertThat(choiceToS2.latch.await(1, TimeUnit.SECONDS), is(false)); - assertThat(choiceToS4.latch.await(1, TimeUnit.SECONDS), is(true)); + assertThat(s1ToChoice.latch.await(1, TimeUnit.SECONDS)).isTrue(); + assertThat(choiceToS2.latch.await(1, TimeUnit.SECONDS)).isFalse(); + assertThat(choiceToS4.latch.await(1, TimeUnit.SECONDS)).isTrue(); } @Test @@ -1072,16 +1067,16 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { LatchAction choiceToS6 = context.getBean("choiceToS6", LatchAction.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, MessageBuilder.withPayload("E1").setHeader("choice", "choice2").build()); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S6")); + assertThat(stateMachine.getState().getIds()).contains("S6"); - assertThat(s1ToChoice.latch.await(1, TimeUnit.SECONDS), is(true)); - assertThat(choiceToS2.latch.await(1, TimeUnit.SECONDS), is(false)); - assertThat(choiceToS4.latch.await(1, TimeUnit.SECONDS), is(false)); - assertThat(choice1ToChoice2.latch.await(1, TimeUnit.SECONDS), is(true)); - assertThat(choiceToS5.latch.await(1, TimeUnit.SECONDS), is(false)); - assertThat(choiceToS6.latch.await(1, TimeUnit.SECONDS), is(true)); + assertThat(s1ToChoice.latch.await(1, TimeUnit.SECONDS)).isTrue(); + assertThat(choiceToS2.latch.await(1, TimeUnit.SECONDS)).isFalse(); + assertThat(choiceToS4.latch.await(1, TimeUnit.SECONDS)).isFalse(); + assertThat(choice1ToChoice2.latch.await(1, TimeUnit.SECONDS)).isTrue(); + assertThat(choiceToS5.latch.await(1, TimeUnit.SECONDS)).isFalse(); + assertThat(choiceToS6.latch.await(1, TimeUnit.SECONDS)).isTrue(); } @Test @@ -1089,19 +1084,19 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); Resource model = new ClassPathResource("org/springframework/statemachine/uml/pseudostate-in-submachine.uml"); UmlStateMachineModelFactory builder = new UmlStateMachineModelFactory(model); - assertThat(model.exists(), is(true)); + assertThat(model.exists()).isTrue(); StateMachineModel stateMachineModel = builder.build(); - assertThat(stateMachineModel, notNullValue()); + assertThat(stateMachineModel).isNotNull(); Collection> stateDatas = stateMachineModel.getStatesData().getStateData(); - assertThat(stateDatas.size(), is(4)); + assertThat(stateDatas.size()).isEqualTo(4); StateData choiceStateData = stateDatas.stream() .filter(sd -> "CHOICE".equals(sd.getState())) .findFirst() .get(); - assertThat(choiceStateData, notNullValue()); - assertThat(choiceStateData.getParent(), is("S1")); + assertThat(choiceStateData).isNotNull(); + assertThat(choiceStateData.getParent()).isEqualTo("S1"); } @Test @@ -1109,19 +1104,19 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { context.refresh(); Resource model = new ClassPathResource("org/springframework/statemachine/uml/pseudostate-in-submachineref.uml"); UmlStateMachineModelFactory builder = new UmlStateMachineModelFactory(model); - assertThat(model.exists(), is(true)); + assertThat(model.exists()).isTrue(); StateMachineModel stateMachineModel = builder.build(); - assertThat(stateMachineModel, notNullValue()); + assertThat(stateMachineModel).isNotNull(); Collection> stateDatas = stateMachineModel.getStatesData().getStateData(); - assertThat(stateDatas.size(), is(4)); + assertThat(stateDatas.size()).isEqualTo(4); StateData choiceStateData = stateDatas.stream() .filter(sd -> "CHOICE".equals(sd.getState())) .findFirst() .get(); - assertThat(choiceStateData, notNullValue()); - assertThat(choiceStateData.getParent(), is("S1")); + assertThat(choiceStateData).isNotNull(); + assertThat(choiceStateData.getParent()).isEqualTo("S1"); } @Test @@ -1132,10 +1127,10 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests { StateMachine stateMachine = context.getBean(StateMachine.class); doStartAndAssert(stateMachine); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1")); + assertThat(stateMachine.getState().getIds()).contains("S1"); doSendEventAndConsumeAll(stateMachine, MessageBuilder.withPayload("E1").build()); - assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2")); - assertThat(stateMachine.getExtendedState().get("key", String.class), is("value")); + assertThat(stateMachine.getState().getIds()).contains("S2"); + assertThat(stateMachine.getExtendedState().get("key", String.class)).isEqualTo("value"); } @Configuration