Skip to content

Commit a5b9c0f

Browse files
committed
Merge pull request #19193 from dreis2211
* pr/19193: Increase cache ttl in CachingOperationInvokerTests Closes gh-19193
2 parents bc53fe0 + 20ff764 commit a5b9c0f

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvokerTests.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.boot.actuate.endpoint.invoker.cache;
1818

1919
import java.security.Principal;
20+
import java.time.Duration;
2021
import java.util.Arrays;
2122
import java.util.Collections;
2223
import java.util.HashMap;
@@ -48,6 +49,8 @@
4849
*/
4950
public class CachingOperationInvokerTests {
5051

52+
private static final long CACHE_TTL = Duration.ofHours(1).toMillis();
53+
5154
@Test
5255
public void createInstanceWithTtlSetToZero() {
5356
assertThatIllegalArgumentException()
@@ -73,7 +76,7 @@ public void cacheInTtlWithMonoResponse() {
7376
MonoOperationInvoker.invocations = 0;
7477
MonoOperationInvoker target = new MonoOperationInvoker();
7578
InvocationContext context = new InvocationContext(mock(SecurityContext.class), Collections.emptyMap());
76-
CachingOperationInvoker invoker = new CachingOperationInvoker(target, 500L);
79+
CachingOperationInvoker invoker = new CachingOperationInvoker(target, CACHE_TTL);
7780
Object response = ((Mono<?>) invoker.invoke(context)).block();
7881
Object cachedResponse = ((Mono<?>) invoker.invoke(context)).block();
7982
assertThat(MonoOperationInvoker.invocations).isEqualTo(1);
@@ -85,7 +88,7 @@ public void cacheInTtlWithFluxResponse() {
8588
FluxOperationInvoker.invocations = 0;
8689
FluxOperationInvoker target = new FluxOperationInvoker();
8790
InvocationContext context = new InvocationContext(mock(SecurityContext.class), Collections.emptyMap());
88-
CachingOperationInvoker invoker = new CachingOperationInvoker(target, 500L);
91+
CachingOperationInvoker invoker = new CachingOperationInvoker(target, CACHE_TTL);
8992
Object response = ((Flux<?>) invoker.invoke(context)).blockLast();
9093
Object cachedResponse = ((Flux<?>) invoker.invoke(context)).blockLast();
9194
assertThat(FluxOperationInvoker.invocations).isEqualTo(1);
@@ -97,7 +100,7 @@ private void assertCacheIsUsed(Map<String, Object> parameters) {
97100
Object expected = new Object();
98101
InvocationContext context = new InvocationContext(mock(SecurityContext.class), parameters);
99102
given(target.invoke(context)).willReturn(expected);
100-
CachingOperationInvoker invoker = new CachingOperationInvoker(target, 500L);
103+
CachingOperationInvoker invoker = new CachingOperationInvoker(target, CACHE_TTL);
101104
Object response = invoker.invoke(context);
102105
assertThat(response).isSameAs(expected);
103106
verify(target, times(1)).invoke(context);
@@ -114,7 +117,7 @@ public void targetAlwaysInvokedWithParameters() {
114117
parameters.put("something", null);
115118
InvocationContext context = new InvocationContext(mock(SecurityContext.class), parameters);
116119
given(target.invoke(context)).willReturn(new Object());
117-
CachingOperationInvoker invoker = new CachingOperationInvoker(target, 500L);
120+
CachingOperationInvoker invoker = new CachingOperationInvoker(target, CACHE_TTL);
118121
invoker.invoke(context);
119122
invoker.invoke(context);
120123
invoker.invoke(context);
@@ -129,7 +132,7 @@ public void targetAlwaysInvokedWithPrincipal() {
129132
given(securityContext.getPrincipal()).willReturn(mock(Principal.class));
130133
InvocationContext context = new InvocationContext(securityContext, parameters);
131134
given(target.invoke(context)).willReturn(new Object());
132-
CachingOperationInvoker invoker = new CachingOperationInvoker(target, 500L);
135+
CachingOperationInvoker invoker = new CachingOperationInvoker(target, CACHE_TTL);
133136
invoker.invoke(context);
134137
invoker.invoke(context);
135138
invoker.invoke(context);

0 commit comments

Comments
 (0)