Commit 8dbec616 by hoangtc Committed by Oliver Woodman

Use isAtLeast() instead of (>=) to make the tests clearer.

Replace assertThat(a >= b).isTrue() with assertThat(a).isAtLeast(b) because it
reads more natural, and in case the assertion fails, it will print out the
actual values to help debugging.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=201371993
parent 62ee13b1
...@@ -1393,7 +1393,7 @@ public final class ExoPlayerTest { ...@@ -1393,7 +1393,7 @@ public final class ExoPlayerTest {
.build() .build()
.start() .start()
.blockUntilEnded(TIMEOUT_MS); .blockUntilEnded(TIMEOUT_MS);
assertThat(target.positionMs >= 50).isTrue(); assertThat(target.positionMs).isAtLeast(50L);
} }
@Test @Test
...@@ -1413,7 +1413,7 @@ public final class ExoPlayerTest { ...@@ -1413,7 +1413,7 @@ public final class ExoPlayerTest {
.build() .build()
.start() .start()
.blockUntilEnded(TIMEOUT_MS); .blockUntilEnded(TIMEOUT_MS);
assertThat(target.positionMs >= 50).isTrue(); assertThat(target.positionMs).isAtLeast(50L);
} }
@Test @Test
...@@ -1435,8 +1435,8 @@ public final class ExoPlayerTest { ...@@ -1435,8 +1435,8 @@ public final class ExoPlayerTest {
.build() .build()
.start() .start()
.blockUntilEnded(TIMEOUT_MS); .blockUntilEnded(TIMEOUT_MS);
assertThat(target50.positionMs >= 50).isTrue(); assertThat(target50.positionMs).isAtLeast(50L);
assertThat(target80.positionMs >= 80).isTrue(); assertThat(target80.positionMs).isAtLeast(80L);
assertThat(target80.positionMs).isAtLeast(target50.positionMs); assertThat(target80.positionMs).isAtLeast(target50.positionMs);
} }
...@@ -1459,8 +1459,8 @@ public final class ExoPlayerTest { ...@@ -1459,8 +1459,8 @@ public final class ExoPlayerTest {
.build() .build()
.start() .start()
.blockUntilEnded(TIMEOUT_MS); .blockUntilEnded(TIMEOUT_MS);
assertThat(target1.positionMs >= 50).isTrue(); assertThat(target1.positionMs).isAtLeast(50L);
assertThat(target2.positionMs >= 50).isTrue(); assertThat(target2.positionMs).isAtLeast(50L);
} }
@Test @Test
...@@ -1481,7 +1481,7 @@ public final class ExoPlayerTest { ...@@ -1481,7 +1481,7 @@ public final class ExoPlayerTest {
.build() .build()
.start() .start()
.blockUntilEnded(TIMEOUT_MS); .blockUntilEnded(TIMEOUT_MS);
assertThat(target.positionMs >= 50).isTrue(); assertThat(target.positionMs).isAtLeast(50L);
} }
@Test @Test
...@@ -1545,7 +1545,7 @@ public final class ExoPlayerTest { ...@@ -1545,7 +1545,7 @@ public final class ExoPlayerTest {
.build() .build()
.start() .start()
.blockUntilEnded(TIMEOUT_MS); .blockUntilEnded(TIMEOUT_MS);
assertThat(target.positionMs >= 50).isTrue(); assertThat(target.positionMs).isAtLeast(50L);
} }
@Test @Test
...@@ -1565,7 +1565,7 @@ public final class ExoPlayerTest { ...@@ -1565,7 +1565,7 @@ public final class ExoPlayerTest {
.build() .build()
.start() .start()
.blockUntilEnded(TIMEOUT_MS); .blockUntilEnded(TIMEOUT_MS);
assertThat(target.positionMs >= 50).isTrue(); assertThat(target.positionMs).isAtLeast(50L);
} }
@Test @Test
...@@ -1631,7 +1631,7 @@ public final class ExoPlayerTest { ...@@ -1631,7 +1631,7 @@ public final class ExoPlayerTest {
.start() .start()
.blockUntilEnded(TIMEOUT_MS); .blockUntilEnded(TIMEOUT_MS);
assertThat(target.messageCount).isEqualTo(1); assertThat(target.messageCount).isEqualTo(1);
assertThat(target.positionMs >= 50).isTrue(); assertThat(target.positionMs).isAtLeast(50L);
} }
@Test @Test
...@@ -1660,7 +1660,7 @@ public final class ExoPlayerTest { ...@@ -1660,7 +1660,7 @@ public final class ExoPlayerTest {
.start() .start()
.blockUntilEnded(TIMEOUT_MS); .blockUntilEnded(TIMEOUT_MS);
assertThat(target.messageCount).isEqualTo(2); assertThat(target.messageCount).isEqualTo(2);
assertThat(target.positionMs >= 50).isTrue(); assertThat(target.positionMs).isAtLeast(50L);
} }
@Test @Test
...@@ -1694,7 +1694,7 @@ public final class ExoPlayerTest { ...@@ -1694,7 +1694,7 @@ public final class ExoPlayerTest {
.build() .build()
.start() .start()
.blockUntilEnded(TIMEOUT_MS); .blockUntilEnded(TIMEOUT_MS);
assertThat(target.positionMs >= 50).isTrue(); assertThat(target.positionMs).isAtLeast(50L);
assertThat(target.windowIndex).isEqualTo(1); assertThat(target.windowIndex).isEqualTo(1);
} }
...@@ -1716,7 +1716,7 @@ public final class ExoPlayerTest { ...@@ -1716,7 +1716,7 @@ public final class ExoPlayerTest {
.start() .start()
.blockUntilEnded(TIMEOUT_MS); .blockUntilEnded(TIMEOUT_MS);
assertThat(target.windowIndex).isEqualTo(2); assertThat(target.windowIndex).isEqualTo(2);
assertThat(target.positionMs >= 50).isTrue(); assertThat(target.positionMs).isAtLeast(50L);
} }
@Test @Test
...@@ -1737,7 +1737,7 @@ public final class ExoPlayerTest { ...@@ -1737,7 +1737,7 @@ public final class ExoPlayerTest {
.start() .start()
.blockUntilEnded(TIMEOUT_MS); .blockUntilEnded(TIMEOUT_MS);
assertThat(target.windowIndex).isEqualTo(2); assertThat(target.windowIndex).isEqualTo(2);
assertThat(target.positionMs >= 50).isTrue(); assertThat(target.positionMs).isAtLeast(50L);
} }
@Test @Test
...@@ -1774,7 +1774,7 @@ public final class ExoPlayerTest { ...@@ -1774,7 +1774,7 @@ public final class ExoPlayerTest {
.build() .build()
.start() .start()
.blockUntilEnded(TIMEOUT_MS); .blockUntilEnded(TIMEOUT_MS);
assertThat(target.positionMs >= 50).isTrue(); assertThat(target.positionMs).isAtLeast(50L);
assertThat(target.windowIndex).isEqualTo(0); assertThat(target.windowIndex).isEqualTo(0);
} }
......
...@@ -186,7 +186,7 @@ public class TestUtil { ...@@ -186,7 +186,7 @@ public class TestUtil {
*/ */
public static void assertBitmapsAreSimilar( public static void assertBitmapsAreSimilar(
Bitmap expectedBitmap, Bitmap actualBitmap, double psnrThresholdDb) { Bitmap expectedBitmap, Bitmap actualBitmap, double psnrThresholdDb) {
assertThat(getPsnr(expectedBitmap, actualBitmap) >= psnrThresholdDb).isTrue(); assertThat(getPsnr(expectedBitmap, actualBitmap)).isAtLeast(psnrThresholdDb);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment