From 3d4c1b9d28075c706a1f954899eaa55dc58d0487 Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Sat, 28 Nov 2020 14:51:34 +0000 Subject: [PATCH] Port cluster tests to assertj --- build.gradle | 2 -- ...LeaderZookeeperStateMachineEnsembleTests.java | 16 +++++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index ab2ef4a1..729ac6e0 100644 --- a/build.gradle +++ b/build.gradle @@ -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' diff --git a/spring-statemachine-cluster/src/test/java/org/springframework/statemachine/cluster/LeaderZookeeperStateMachineEnsembleTests.java b/spring-statemachine-cluster/src/test/java/org/springframework/statemachine/cluster/LeaderZookeeperStateMachineEnsembleTests.java index 3bbbf807..38e2437c 100644 --- a/spring-statemachine-cluster/src/test/java/org/springframework/statemachine/cluster/LeaderZookeeperStateMachineEnsembleTests.java +++ b/spring-statemachine-cluster/src/test/java/org/springframework/statemachine/cluster/LeaderZookeeperStateMachineEnsembleTests.java @@ -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 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 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