From bd1d6492fc616af05b2d069d2df2cfbaea647f4c Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Sun, 18 Oct 2020 17:03:30 +0100 Subject: [PATCH] Testplan array contains should discard order - Replace contains with containsInAnyOrder for asserts. - Forward port #883 --- .../statemachine/test/StateMachineTestPlan.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-statemachine-test/src/main/java/org/springframework/statemachine/test/StateMachineTestPlan.java b/spring-statemachine-test/src/main/java/org/springframework/statemachine/test/StateMachineTestPlan.java index 7afd95b4..9ac507e8 100644 --- a/spring-statemachine-test/src/main/java/org/springframework/statemachine/test/StateMachineTestPlan.java +++ b/spring-statemachine-test/src/main/java/org/springframework/statemachine/test/StateMachineTestPlan.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ package org.springframework.statemachine.test; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.is; @@ -241,7 +240,7 @@ public class StateMachineTestPlan { for (State s : listener.getStateEntered()) { states.add(s.getId()); } - assertThat(step.expectStatesEntrered, contains(states.toArray())); + assertThat(step.expectStatesEntrered, containsInAnyOrder(states.toArray())); } } @@ -251,7 +250,7 @@ public class StateMachineTestPlan { for (State s : listener.getStateExited()) { states.add(s.getId()); } - assertThat(step.expectStatesExited, contains(states.toArray())); + assertThat(step.expectStatesExited, containsInAnyOrder(states.toArray())); } }