Repository: jclouds Updated Branches: refs/heads/master 6046fc925 -> 64553eda5
JCLOUDS-1340: Improve BackoffLimitedRetryHandlerTest asserts These emit a more specific error message. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/64553eda Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/64553eda Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/64553eda Branch: refs/heads/master Commit: 64553eda5f38e8fe8b805fd4d350e833107f6670 Parents: 6046fc9 Author: Andrew Gaul <[email protected]> Authored: Mon Sep 11 11:18:08 2017 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon Sep 11 13:13:39 2017 -0700 ---------------------------------------------------------------------- .../BackoffLimitedRetryHandlerTest.java | 26 +++++++------------- 1 file changed, 9 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/64553eda/core/src/test/java/org/jclouds/http/handlers/BackoffLimitedRetryHandlerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/http/handlers/BackoffLimitedRetryHandlerTest.java b/core/src/test/java/org/jclouds/http/handlers/BackoffLimitedRetryHandlerTest.java index f4f66ea..59bda90 100644 --- a/core/src/test/java/org/jclouds/http/handlers/BackoffLimitedRetryHandlerTest.java +++ b/core/src/test/java/org/jclouds/http/handlers/BackoffLimitedRetryHandlerTest.java @@ -16,9 +16,9 @@ */ package org.jclouds.http.handlers; +import static org.assertj.core.api.Assertions.assertThat; import static org.jclouds.reflect.Reflection2.method; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; import java.io.IOException; @@ -52,32 +52,27 @@ public class BackoffLimitedRetryHandlerTest { long startTime = System.nanoTime(); handler.imposeBackoffExponentialDelay(period, 2, 1, 5, "TEST FAILURE: 1"); long elapsedTime = (System.nanoTime() - startTime) / 1000000; - assert elapsedTime >= period - 1 : elapsedTime; - assertTrue(elapsedTime < period + acceptableDelay); + assertThat(elapsedTime).isBetween(period, period + acceptableDelay); startTime = System.nanoTime(); handler.imposeBackoffExponentialDelay(period, 2, 2, 5, "TEST FAILURE: 2"); elapsedTime = (System.nanoTime() - startTime) / 1000000; - assert elapsedTime >= period * 4 - 1 : elapsedTime; - assertTrue(elapsedTime < period * 9); + assertThat(elapsedTime).isBetween(period * 4, period * 9); startTime = System.nanoTime(); handler.imposeBackoffExponentialDelay(period, 2, 3, 5, "TEST FAILURE: 3"); elapsedTime = (System.nanoTime() - startTime) / 1000000; - assert elapsedTime >= period * 9 - 1 : elapsedTime; - assertTrue(elapsedTime < period * 10); + assertThat(elapsedTime).isBetween(period * 9, period * 10); startTime = System.nanoTime(); handler.imposeBackoffExponentialDelay(period, 2, 4, 5, "TEST FAILURE: 4"); elapsedTime = (System.nanoTime() - startTime) / 1000000; - assert elapsedTime >= period * 10 - 1 : elapsedTime; - assertTrue(elapsedTime < period * 11); + assertThat(elapsedTime).isBetween(period * 10, period * 11); startTime = System.nanoTime(); handler.imposeBackoffExponentialDelay(period, 2, 5, 5, "TEST FAILURE: 5"); elapsedTime = (System.nanoTime() - startTime) / 1000000; - assert elapsedTime >= period * 10 - 1 : elapsedTime; - assertTrue(elapsedTime < period * 11); + assertThat(elapsedTime).isBetween(period * 10, period * 11); } @@ -89,8 +84,7 @@ public class BackoffLimitedRetryHandlerTest { long startTime = System.nanoTime(); handler.imposeBackoffExponentialDelay(period, 2, 1, 5, "TEST FAILURE: 1"); long elapsedTime = (System.nanoTime() - startTime) / 1000000; - assert elapsedTime >= period - 1 : elapsedTime; - assertTrue(elapsedTime < period + acceptableDelay); + assertThat(elapsedTime).isBetween(period, period + acceptableDelay); } @Test @@ -101,8 +95,7 @@ public class BackoffLimitedRetryHandlerTest { long startTime = System.nanoTime(); handler.imposeBackoffExponentialDelay(period, 2, 1, 5, "TEST FAILURE: 1"); long elapsedTime = (System.nanoTime() - startTime) / 1000000; - assert elapsedTime >= period - 1 : elapsedTime; - assertTrue(elapsedTime < period + acceptableDelay); + assertThat(elapsedTime).isBetween(period, period + acceptableDelay); } @Test @@ -113,8 +106,7 @@ public class BackoffLimitedRetryHandlerTest { long startTime = System.nanoTime(); handler.imposeBackoffExponentialDelay(period, 2, 1, 5, "TEST FAILURE: 1"); long elapsedTime = (System.nanoTime() - startTime) / 1000000; - assert elapsedTime >= period - 1 : elapsedTime; - assertTrue(elapsedTime < period + acceptableDelay); + assertThat(elapsedTime).isBetween(period, period + acceptableDelay); } @Test
