Skip to content

Commit

Permalink
Merge pull request #19193 from dreis2211
Browse files Browse the repository at this point in the history
* pr/19193:
  Increase cache ttl in CachingOperationInvokerTests

Closes gh-19193
  • Loading branch information
mbhave committed Dec 5, 2019
2 parents bc53fe0 + 20ff764 commit a5b9c0f
Showing 1 changed file with 8 additions and 5 deletions.
Expand Up @@ -17,6 +17,7 @@
package org.springframework.boot.actuate.endpoint.invoker.cache;

import java.security.Principal;
import java.time.Duration;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
Expand Down Expand Up @@ -48,6 +49,8 @@
*/
public class CachingOperationInvokerTests {

private static final long CACHE_TTL = Duration.ofHours(1).toMillis();

@Test
public void createInstanceWithTtlSetToZero() {
assertThatIllegalArgumentException()
Expand All @@ -73,7 +76,7 @@ public void cacheInTtlWithMonoResponse() {
MonoOperationInvoker.invocations = 0;
MonoOperationInvoker target = new MonoOperationInvoker();
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 cachedResponse = ((Mono<?>) invoker.invoke(context)).block();
assertThat(MonoOperationInvoker.invocations).isEqualTo(1);
Expand All @@ -85,7 +88,7 @@ public void cacheInTtlWithFluxResponse() {
FluxOperationInvoker.invocations = 0;
FluxOperationInvoker target = new FluxOperationInvoker();
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 cachedResponse = ((Flux<?>) invoker.invoke(context)).blockLast();
assertThat(FluxOperationInvoker.invocations).isEqualTo(1);
Expand All @@ -97,7 +100,7 @@ private void assertCacheIsUsed(Map<String, Object> parameters) {
Object expected = new Object();
InvocationContext context = new InvocationContext(mock(SecurityContext.class), parameters);
given(target.invoke(context)).willReturn(expected);
CachingOperationInvoker invoker = new CachingOperationInvoker(target, 500L);
CachingOperationInvoker invoker = new CachingOperationInvoker(target, CACHE_TTL);
Object response = invoker.invoke(context);
assertThat(response).isSameAs(expected);
verify(target, times(1)).invoke(context);
Expand All @@ -114,7 +117,7 @@ public void targetAlwaysInvokedWithParameters() {
parameters.put("something", null);
InvocationContext context = new InvocationContext(mock(SecurityContext.class), parameters);
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);
Expand All @@ -129,7 +132,7 @@ public void targetAlwaysInvokedWithPrincipal() {
given(securityContext.getPrincipal()).willReturn(mock(Principal.class));
InvocationContext context = new InvocationContext(securityContext, parameters);
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);
Expand Down

0 comments on commit a5b9c0f

Please sign in to comment.