diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-01-09 14:32:20 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-01-09 14:32:20 +0100 |
commit | 0ed9be219adf8a20ba2cba323c6a8c76f73e2b3d (patch) | |
tree | 6e5fc67b1e965d0f1f43997fd3a3569c493d7e3d | |
parent | 56e4da2b50a1259ee194ded3c860e873e863bba9 (diff) |
Use less/greater hamcrest matchers.
-rw-r--r-- | messagebus/pom.xml | 6 | ||||
-rw-r--r-- | messagebus/src/test/java/com/yahoo/messagebus/network/local/LocalNetworkTest.java | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/messagebus/pom.xml b/messagebus/pom.xml index a3ae2fb54c2..37a1c681497 100644 --- a/messagebus/pom.xml +++ b/messagebus/pom.xml @@ -19,6 +19,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/local/LocalNetworkTest.java b/messagebus/src/test/java/com/yahoo/messagebus/network/local/LocalNetworkTest.java index d9f8b05e4e9..d8345180952 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/network/local/LocalNetworkTest.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/network/local/LocalNetworkTest.java @@ -15,6 +15,8 @@ import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.number.OrderingComparison.lessThan; +import static org.hamcrest.number.OrderingComparison.greaterThanOrEqualTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; @@ -109,8 +111,8 @@ public class LocalNetworkTest { assertEquals(ErrorCode.TIMEOUT, res.getError().getCode()); assertTrue(res.getError().getMessage().endsWith("Timed out in sendQ")); long end = System.currentTimeMillis(); - assertTrue(end - start >= TIMEOUT); - assertTrue(end - start < 2*TIMEOUT); + assertThat(end, greaterThanOrEqualTo(start+TIMEOUT)); + assertThat(end, lessThan(start+2*TIMEOUT)); msg = serverB.messages.poll(60, TimeUnit.SECONDS); assertThat(msg, instanceOf(SimpleMessage.class)); |