diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-04-04 11:48:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-04 11:48:26 +0200 |
commit | 290e299280f90fc122428906e51891fba6c50007 (patch) | |
tree | 3682bdf5fa46734b1d6575bf39e85f2f22fd1533 /testutil/src | |
parent | 64d0102f9931a01d31976e85b585b9e63894f08e (diff) |
Revert "Jonmv/misc 6"
Diffstat (limited to 'testutil/src')
-rw-r--r-- | testutil/src/main/java/com/yahoo/test/OrderTester.java | 6 | ||||
-rw-r--r-- | testutil/src/main/java/com/yahoo/test/TotalOrderTester.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/testutil/src/main/java/com/yahoo/test/OrderTester.java b/testutil/src/main/java/com/yahoo/test/OrderTester.java index cc28ca9f469..4acba4ee7fe 100644 --- a/testutil/src/main/java/com/yahoo/test/OrderTester.java +++ b/testutil/src/main/java/com/yahoo/test/OrderTester.java @@ -15,8 +15,8 @@ import java.util.List; * */ -public abstract class OrderTester<T extends Comparable<? super T>> { - private final ArrayList<List<T>> groups = new ArrayList<>(); +public abstract class OrderTester<T extends Comparable<T>> { + private ArrayList<List<T>> groups = new ArrayList<>(); abstract protected void lessTest(T a, T b); abstract protected void greaterTest(T a, T b); @@ -24,7 +24,7 @@ public abstract class OrderTester<T extends Comparable<? super T>> { @SafeVarargs @SuppressWarnings("varargs") - private OrderTester<T> addGroup(T... group) { + private final OrderTester<T> addGroup(T... group) { groups.add(Arrays.asList(group)); return this; } diff --git a/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java b/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java index e95bc056ba8..850369fbc2e 100644 --- a/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java +++ b/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; * @author Vegard Sjonfjell */ -public class TotalOrderTester<T extends Comparable<? super T>> extends OrderTester<T> { +public class TotalOrderTester<T extends Comparable<T>> extends OrderTester<T> { protected void lessTest(T a, T b) throws AssertionError { assertTrue(a + " must be less than " + b, a.compareTo(b) <= -1); } |