aboutsummaryrefslogtreecommitdiffstats
path: root/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java
diff options
context:
space:
mode:
Diffstat (limited to 'testutil/src/main/java/com/yahoo/test/TotalOrderTester.java')
-rw-r--r--testutil/src/main/java/com/yahoo/test/TotalOrderTester.java12
1 files changed, 5 insertions, 7 deletions
diff --git a/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java b/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java
index d9acd845428..05a8545d606 100644
--- a/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java
+++ b/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java
@@ -1,10 +1,8 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.hamcrest.Matchers.lessThanOrEqualTo;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
* TotalOrderTester implements a total order test for OrderTester
@@ -24,14 +22,14 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
public class TotalOrderTester<T extends Comparable<T>> extends OrderTester<T> {
protected void lessTest(T a, T b) throws AssertionError {
- assertThat(a + " must be less than " + b, a.compareTo(b), lessThanOrEqualTo(-1));
+ assertTrue(a + " must be less than " + b, a.compareTo(b) <= -1);
}
protected void greaterTest(T a, T b) throws AssertionError {
- assertThat(a + " must be greater than " + b, a.compareTo(b), greaterThanOrEqualTo(1));
+ assertTrue(a + " must be greater than " + b, a.compareTo(b) >= 1);
}
protected void equalTest(T a, T b) throws AssertionError {
- assertThat(a + " must be compared equal to " + b, a.compareTo(b), is(0));
+ assertEquals(a + " must be compared equal to " + b, 0, a.compareTo(b));
}
}