From 382569a1a282549ebe40fbc77f1b2a7284933116 Mon Sep 17 00:00:00 2001 From: Dana Dahlstrom Date: Wed, 7 Dec 2016 17:10:26 +0300 Subject: [PATCH] Test Comparable IteratorPosition using assertThat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … which makes failure messages (and maybe assertion code) more readable, and avoids http://errorprone.info/bugpattern/SelfComparison. --- .../com/intellij/util/containers/HashSetQueueTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/util/testSrc/com/intellij/util/containers/HashSetQueueTest.java b/platform/util/testSrc/com/intellij/util/containers/HashSetQueueTest.java index 152ec60f3b39..8a8606722d22 100644 --- a/platform/util/testSrc/com/intellij/util/containers/HashSetQueueTest.java +++ b/platform/util/testSrc/com/intellij/util/containers/HashSetQueueTest.java @@ -23,6 +23,8 @@ import junit.framework.TestCase; import java.util.ArrayList; import java.util.Iterator; +import static org.assertj.core.api.Assertions.assertThat; + public class HashSetQueueTest extends TestCase { private final Assertion CHECK = new Assertion(); private final HashSetQueue myQueue = new HashSetQueue<>(); @@ -150,15 +152,15 @@ public class HashSetQueueTest extends TestCase { } HashSetQueue.PositionalIterator.IteratorPosition nextPos = position.next(); - assertTrue(position.compareTo(nextPos) < 0); - assertTrue(position.compareTo(position) == 0); - assertTrue(nextPos.compareTo(position) > 0); + assertThat(position).isLessThan(nextPos); + assertThat(position).isEqualByComparingTo(position); + assertThat(nextPos).isGreaterThan(position); assertSame(o, nextPos.peek()); assertNull(nextPos.next()); HashSetQueue.PositionalIterator.IteratorPosition nextPos2 = position.next(); - assertTrue(nextPos2.compareTo(nextPos) == 0); + assertThat(nextPos2).isEqualByComparingTo(nextPos); assertSame(o, nextPos2.peek()); assertTrue(iterator.hasNext());