add a test that could generate negative with the old code.

heremaps · Oct 21, 2022 · 3fd8ec1 · 3fd8ec1
1 parent 3afd7d8
commit 3fd8ec1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/.../src/main/java/com/here/account/oauth2/retry/Socket5xxExponentialRandomBackoffPolicy.java b/.../src/main/java/com/here/account/oauth2/retry/Socket5xxExponentialRandomBackoffPolicy.java
@@ -52,6 +52,7 @@ public boolean shouldRetry(RetryContext retryContext) {
     public int getNextRetryIntervalMillis(RetryContext retryContext){
         int retryCount = retryContext.getRetryCount();
         int factor = Math.min(1 << (Math.min(retryCount, 30)), maxRetryFactor);
-        return  retryIntervalMillis * ThreadLocalRandom.current().nextInt(factor);
+        long value = ((long) retryIntervalMillis) * ThreadLocalRandom.current().nextInt(factor);
+        return (int) Math.min(Integer.MAX_VALUE, value);
     }
 }
diff --git a/.../test/java/com/here/account/oauth2/retry/Socket5xxExponentialRandomBackoffPolicyTest.java b/.../test/java/com/here/account/oauth2/retry/Socket5xxExponentialRandomBackoffPolicyTest.java
@@ -22,6 +22,18 @@ public void setUp() {
                         maxRetryFactor);
     }
 
+    @Test
+    public void test_largeRetryCount_notNegative() {
+        for (int j = 0; j < 10; j++) {
+            RetryContext retryContext = new RetryContext();
+            for (int i = 0; i < 40; i++) {
+                retryContext.incrementRetryCount();
+                int nextRetryIntervalMillis = socket5xxExponentialRandomBackoffPolicy.getNextRetryIntervalMillis(retryContext);
+                assertTrue("i=" + i + ", retryContext.getRetryCount()=" + retryContext.getRetryCount() + ", nextRetryIntervalMillis was negative " + nextRetryIntervalMillis, nextRetryIntervalMillis >= 0);
+            }
+        }
+    }
+
     @Test
     public void test_shouldRetry() {
         HttpProvider.HttpResponse httpResponse = Mockito.mock(HttpProvider.HttpResponse.class);