Commit 20ff7647 authored by dreis2211's avatar dreis2211 Committed by Madhura Bhave

Increase cache ttl in CachingOperationInvokerTests

See gh-19193
parent bc53fe03
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package org.springframework.boot.actuate.endpoint.invoker.cache; package org.springframework.boot.actuate.endpoint.invoker.cache;
import java.security.Principal; import java.security.Principal;
import java.time.Duration;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
...@@ -48,6 +49,8 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; ...@@ -48,6 +49,8 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
*/ */
public class CachingOperationInvokerTests { public class CachingOperationInvokerTests {
private static final long CACHE_TTL = Duration.ofHours(1).toMillis();
@Test @Test
public void createInstanceWithTtlSetToZero() { public void createInstanceWithTtlSetToZero() {
assertThatIllegalArgumentException() assertThatIllegalArgumentException()
...@@ -73,7 +76,7 @@ public class CachingOperationInvokerTests { ...@@ -73,7 +76,7 @@ public class CachingOperationInvokerTests {
MonoOperationInvoker.invocations = 0; MonoOperationInvoker.invocations = 0;
MonoOperationInvoker target = new MonoOperationInvoker(); MonoOperationInvoker target = new MonoOperationInvoker();
InvocationContext context = new InvocationContext(mock(SecurityContext.class), Collections.emptyMap()); InvocationContext context = new InvocationContext(mock(SecurityContext.class), Collections.emptyMap());
CachingOperationInvoker invoker = new CachingOperationInvoker(target, 500L); CachingOperationInvoker invoker = new CachingOperationInvoker(target, CACHE_TTL);
Object response = ((Mono<?>) invoker.invoke(context)).block(); Object response = ((Mono<?>) invoker.invoke(context)).block();
Object cachedResponse = ((Mono<?>) invoker.invoke(context)).block(); Object cachedResponse = ((Mono<?>) invoker.invoke(context)).block();
assertThat(MonoOperationInvoker.invocations).isEqualTo(1); assertThat(MonoOperationInvoker.invocations).isEqualTo(1);
...@@ -85,7 +88,7 @@ public class CachingOperationInvokerTests { ...@@ -85,7 +88,7 @@ public class CachingOperationInvokerTests {
FluxOperationInvoker.invocations = 0; FluxOperationInvoker.invocations = 0;
FluxOperationInvoker target = new FluxOperationInvoker(); FluxOperationInvoker target = new FluxOperationInvoker();
InvocationContext context = new InvocationContext(mock(SecurityContext.class), Collections.emptyMap()); InvocationContext context = new InvocationContext(mock(SecurityContext.class), Collections.emptyMap());
CachingOperationInvoker invoker = new CachingOperationInvoker(target, 500L); CachingOperationInvoker invoker = new CachingOperationInvoker(target, CACHE_TTL);
Object response = ((Flux<?>) invoker.invoke(context)).blockLast(); Object response = ((Flux<?>) invoker.invoke(context)).blockLast();
Object cachedResponse = ((Flux<?>) invoker.invoke(context)).blockLast(); Object cachedResponse = ((Flux<?>) invoker.invoke(context)).blockLast();
assertThat(FluxOperationInvoker.invocations).isEqualTo(1); assertThat(FluxOperationInvoker.invocations).isEqualTo(1);
...@@ -97,7 +100,7 @@ public class CachingOperationInvokerTests { ...@@ -97,7 +100,7 @@ public class CachingOperationInvokerTests {
Object expected = new Object(); Object expected = new Object();
InvocationContext context = new InvocationContext(mock(SecurityContext.class), parameters); InvocationContext context = new InvocationContext(mock(SecurityContext.class), parameters);
given(target.invoke(context)).willReturn(expected); given(target.invoke(context)).willReturn(expected);
CachingOperationInvoker invoker = new CachingOperationInvoker(target, 500L); CachingOperationInvoker invoker = new CachingOperationInvoker(target, CACHE_TTL);
Object response = invoker.invoke(context); Object response = invoker.invoke(context);
assertThat(response).isSameAs(expected); assertThat(response).isSameAs(expected);
verify(target, times(1)).invoke(context); verify(target, times(1)).invoke(context);
...@@ -114,7 +117,7 @@ public class CachingOperationInvokerTests { ...@@ -114,7 +117,7 @@ public class CachingOperationInvokerTests {
parameters.put("something", null); parameters.put("something", null);
InvocationContext context = new InvocationContext(mock(SecurityContext.class), parameters); InvocationContext context = new InvocationContext(mock(SecurityContext.class), parameters);
given(target.invoke(context)).willReturn(new Object()); given(target.invoke(context)).willReturn(new Object());
CachingOperationInvoker invoker = new CachingOperationInvoker(target, 500L); CachingOperationInvoker invoker = new CachingOperationInvoker(target, CACHE_TTL);
invoker.invoke(context); invoker.invoke(context);
invoker.invoke(context); invoker.invoke(context);
invoker.invoke(context); invoker.invoke(context);
...@@ -129,7 +132,7 @@ public class CachingOperationInvokerTests { ...@@ -129,7 +132,7 @@ public class CachingOperationInvokerTests {
given(securityContext.getPrincipal()).willReturn(mock(Principal.class)); given(securityContext.getPrincipal()).willReturn(mock(Principal.class));
InvocationContext context = new InvocationContext(securityContext, parameters); InvocationContext context = new InvocationContext(securityContext, parameters);
given(target.invoke(context)).willReturn(new Object()); given(target.invoke(context)).willReturn(new Object());
CachingOperationInvoker invoker = new CachingOperationInvoker(target, 500L); CachingOperationInvoker invoker = new CachingOperationInvoker(target, CACHE_TTL);
invoker.invoke(context); invoker.invoke(context);
invoker.invoke(context); invoker.invoke(context);
invoker.invoke(context); invoker.invoke(context);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment