From c1d241928ce23b868ea0ab8bdda076a832080720 Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Sat, 5 Sep 2026 13:08:12 +0200
Subject: [PATCH] Rename maxAttemptsReached() to maxElapsedTimeReached() and
 organize tests

---
 .../util/backoff/ExponentialBackOffTests.java | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/util/backoff/ExponentialBackOffTests.java b/spring-core/src/test/java/org/springframework/util/backoff/ExponentialBackOffTests.java
index e7e58cb33cf..bdc2b79a9b5 100644
--- a/spring-core/src/test/java/org/springframework/util/backoff/ExponentialBackOffTests.java
+++ b/spring-core/src/test/java/org/springframework/util/backoff/ExponentialBackOffTests.java
@@ -79,7 +79,17 @@ class ExponentialBackOffTests {
 	}
 
 	@Test
-	void maxAttemptsReached() {
+	void maxIntervalReachedImmediately() {
+		ExponentialBackOff backOff = new ExponentialBackOff(1000L, 2.0);
+		backOff.setMaxInterval(50L);
+
+		BackOffExecution execution = backOff.start();
+		assertThat(execution.nextBackOff()).isEqualTo(50L);
+		assertThat(execution.nextBackOff()).isEqualTo(50L);
+	}
+
+	@Test
+	void maxElapsedTimeReached() {
 		ExponentialBackOff backOff = new ExponentialBackOff(2000L, 2.0);
 		backOff.setMaxElapsedTime(4000L);
 
@@ -90,6 +100,19 @@ class ExponentialBackOffTests {
 		assertThat(execution.nextBackOff()).isEqualTo(BackOffExecution.STOP);
 	}
 
+	@Test
+	void maxAttempts() {
+		ExponentialBackOff backOff = new ExponentialBackOff();
+		backOff.setInitialInterval(1000L);
+		backOff.setMultiplier(2.0);
+		backOff.setMaxInterval(10000L);
+		backOff.setMaxAttempts(6);
+		List<Long> delays = new ArrayList<>();
+		BackOffExecution execution = backOff.start();
+		IntStream.range(0, 7).forEach(i -> delays.add(execution.nextBackOff()));
+		assertThat(delays).containsExactly(1000L, 2000L, 4000L, 8000L, 10000L, 10000L, BackOffExecution.STOP);
+	}
+
 	@Test
 	void startReturnsDifferentInstances() {
 		ExponentialBackOff backOff = new ExponentialBackOff();
@@ -128,16 +151,6 @@ class ExponentialBackOffTests {
 		assertThatNoException().isThrownBy(execution::nextBackOff);
 	}
 
-	@Test
-	void maxIntervalReachedImmediately() {
-		ExponentialBackOff backOff = new ExponentialBackOff(1000L, 2.0);
-		backOff.setMaxInterval(50L);
-
-		BackOffExecution execution = backOff.start();
-		assertThat(execution.nextBackOff()).isEqualTo(50L);
-		assertThat(execution.nextBackOff()).isEqualTo(50L);
-	}
-
 	@Test
 	void toStringContent() {
 		ExponentialBackOff backOff = new ExponentialBackOff(2000L, 2.0);
@@ -159,17 +172,4 @@ class ExponentialBackOffTests {
 		assertThat(execution).asString().isEqualTo("ExponentialBackOffExecution[currentInterval=4000ms, multiplier=2.0, attempts=2]");
 	}
 
-	@Test
-	void maxAttempts() {
-		ExponentialBackOff backOff = new ExponentialBackOff();
-		backOff.setInitialInterval(1000L);
-		backOff.setMultiplier(2.0);
-		backOff.setMaxInterval(10000L);
-		backOff.setMaxAttempts(6);
-		List<Long> delays = new ArrayList<>();
-		BackOffExecution execution = backOff.start();
-		IntStream.range(0, 7).forEach(i -> delays.add(execution.nextBackOff()));
-		assertThat(delays).containsExactly(1000L, 2000L, 4000L, 8000L, 10000L, 10000L, BackOffExecution.STOP);
-	}
-
 }