Skip to content

Extend and improve some test cases #36018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vincentstradiot wants to merge 1 commit into
base: main
Choose a base branch
from
+57 −4
Open

Extend and improve some test cases #36018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ void containsWithEnumeration() {
assertThat(CollectionUtils.contains(Collections.enumeration(List.of()), "myElement")).isFalse();

List<String> list = Arrays.asList("myElement", null);
Enumeration<String> enumeration = Collections.enumeration(list);
assertThat(CollectionUtils.contains(enumeration, "myElement")).isTrue();
assertThat(CollectionUtils.contains(enumeration, null)).isTrue();
assertThat(CollectionUtils.contains(Collections.enumeration(list), "myElement")).isTrue();
assertThat(CollectionUtils.contains(Collections.enumeration(list), null)).isTrue();
assertThat(CollectionUtils.contains(Collections.enumeration(list), "nonExistingElement")).isFalse();
}

@Test
Expand Down
47 changes: 46 additions & 1 deletion spring-core/src/test/java/org/springframework/util/ExponentialBackOffTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void maxIntervalReached() {
}

@Test
void maxAttemptsReached() {
void maxElapsedTimeReached() {
ExponentialBackOff backOff = new ExponentialBackOff(2000L, 2.0);
backOff.setMaxElapsedTime(4000L);

Expand Down Expand Up @@ -162,4 +162,49 @@ void maxAttempts() {
assertThat(delays).containsExactly(1000L, 2000L, 4000L, 8000L, 10000L, 10000L, BackOffExecution.STOP);
}

@Test
void withJitter_ThenJitterIsApplied() {
// GIVEN
ExponentialBackOff backOff = new ExponentialBackOff();
backOff.setInitialInterval(1000L);
backOff.setJitter(100L);
backOff.setMaxInterval(20000L);
backOff.setMultiplier(2.0);

BackOffExecution execution = backOff.start();

// WHEN
List<Long> delays = IntStream.range(0, 7).mapToObj(i -> execution.nextBackOff()).toList();

// THEN
assertThat(delays).hasSize(7);
assertThat(delays)
.withFailMessage("Jitter was not applied")
.isNotEqualTo(List.of(1000L, 2000L, 4000L, 8000L, 16000L, 20000L, 20000L));
}

@Test
void withJitter_ThenDelaysStayInExpectedRanges() {
// GIVEN
ExponentialBackOff backOff = new ExponentialBackOff();
backOff.setInitialInterval(1000L);
backOff.setJitter(100L); // 10% of initial interval
backOff.setMaxInterval(20000L);
backOff.setMultiplier(2.0);

BackOffExecution execution = backOff.start();

// WHEN
List<Long> delays = IntStream.range(0, 7).mapToObj(i -> execution.nextBackOff()).toList();

// THEN
assertThat(delays.get(0)).isBetween(1000L, 1100L); // 1000 + 10% (never below initial interval)
assertThat(delays.get(1)).isBetween(1800L, 2200L); // 2000 +/- 10%
assertThat(delays.get(2)).isBetween(3600L, 4400L); // 4000 +/- 10%
assertThat(delays.get(3)).isBetween(7200L, 8800L); // 8000 +/- 10%
assertThat(delays.get(4)).isBetween(14400L, 17600L); // 16000 +/- 10%
assertThat(delays.get(5)).isBetween(18000L, 20000L); // 20000 - 10% (max interval)
assertThat(delays.get(6)).isBetween(18000L, 20000L); // 20000 - 10% (max interval)
}

}
8 changes: 8 additions & 0 deletions spring-core/src/test/java/org/springframework/util/comparator/BooleanComparatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,36 @@ class BooleanComparatorTests {
void shouldCompareWithTrueLow() {
Comparator<Boolean> c = new BooleanComparator(true);
assertThat(c.compare(true, false)).isLessThan(0);
assertThat(c.compare(false, true)).isGreaterThan(0);
assertThat(c.compare(Boolean.TRUE, Boolean.TRUE)).isEqualTo(0);
assertThat(c.compare(Boolean.FALSE, Boolean.FALSE)).isEqualTo(0);
}

@Test
void shouldCompareWithTrueHigh() {
Comparator<Boolean> c = new BooleanComparator(false);
assertThat(c.compare(true, false)).isGreaterThan(0);
assertThat(c.compare(false, true)).isLessThan(0);
assertThat(c.compare(Boolean.TRUE, Boolean.TRUE)).isEqualTo(0);
assertThat(c.compare(Boolean.FALSE, Boolean.FALSE)).isEqualTo(0);
}

@Test
void shouldCompareFromTrueLow() {
Comparator<Boolean> c = BooleanComparator.TRUE_LOW;
assertThat(c.compare(true, false)).isLessThan(0);
assertThat(c.compare(false, true)).isGreaterThan(0);
assertThat(c.compare(Boolean.TRUE, Boolean.TRUE)).isEqualTo(0);
assertThat(c.compare(Boolean.FALSE, Boolean.FALSE)).isEqualTo(0);
}

@Test
void shouldCompareFromTrueHigh() {
Comparator<Boolean> c = BooleanComparator.TRUE_HIGH;
assertThat(c.compare(true, false)).isGreaterThan(0);
assertThat(c.compare(false, true)).isLessThan(0);
assertThat(c.compare(Boolean.TRUE, Boolean.TRUE)).isEqualTo(0);
assertThat(c.compare(Boolean.FALSE, Boolean.FALSE)).isEqualTo(0);
}

}