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

Port cluster tests to assertj

Browse Source
This commit is contained in:
Janne Valkealahti
2020-11-28 14:51:34 +00:00
parent c4f9d68870
commit 3d4c1b9d28
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -375,8 +375,6 @@ project('spring-statemachine-cluster') {
}
testCompile 'org.apache.curator:curator-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")
testRuntime 'org.apache.logging.log4j:log4j-core'

16
spring-statemachine-cluster/src/test/java/org/springframework/statemachine/cluster/LeaderZookeeperStateMachineEnsembleTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-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.
@@ -15,9 +15,7 @@
*/
package org.springframework.statemachine.cluster;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.is;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -56,15 +54,15 @@ public class LeaderZookeeperStateMachineEnsembleTests extends AbstractZookeeperT
TestEnsembleListener listener = context.getBean(TestEnsembleListener.class);
StateMachine<String, String> machine1 = factory.getStateMachine();
assertThat(machine1.getState().getIds(), contains("S1"));
assertThat(listener.latch.await(2, TimeUnit.SECONDS), is(true));
assertThat(stateMachineEnsemble.getLeader(), is(machine1));
assertThat(machine1.getState().getIds()).containsExactly("S1");
assertThat(listener.latch.await(2, TimeUnit.SECONDS)).isTrue();
assertThat(stateMachineEnsemble.getLeader()).isEqualTo(machine1);
listener.reset(1);
StateMachine<String, String> machine2 = factory.getStateMachine();
stateMachineEnsemble.leave(machine1);
assertThat(listener.latch.await(2, TimeUnit.SECONDS), is(true));
assertThat(stateMachineEnsemble.getLeader(), is(machine2));
assertThat(listener.latch.await(2, TimeUnit.SECONDS)).isTrue();
assertThat(stateMachineEnsemble.getLeader()).isEqualTo(machine2);
}
@Configuration