Polish Tests

Issue gh-16251

Author: jzheaux

oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderTests.java

@@ -60,7 +60,6 @@
 
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCache;
-import org.springframework.cache.support.SimpleValueWrapper;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.http.HttpStatus;
@@ -664,7 +663,7 @@ public void decodeWhenCacheThenStoreRetrievedJwkSetToCache() {
 				.build();
 		// @formatter:on
 		jwtDecoder.decode(SIGNED_JWT);
-		assertThat(cache.get(JWK_SET_URI, String.class)).isEqualTo(JWK_SET);
+		assertThat(cache.get(JWK_SET_URI).get()).isEqualTo(JWK_SET);
 		ArgumentCaptor<RequestEntity> requestEntityCaptor = ArgumentCaptor.forClass(RequestEntity.class);
 		verify(restOperations).exchange(requestEntityCaptor.capture(), eq(String.class));
 		verifyNoMoreInteractions(restOperations);
@@ -685,7 +684,7 @@ public void decodeWhenCacheStoredThenAbleToRetrieveJwkSetFromCache() {
 				.build();
 		// @formatter:on
 		jwtDecoder1.decode(SIGNED_JWT);
-		assertThat(cache.get(JWK_SET_URI, String.class)).isEqualTo(JWK_SET);
+		assertThat(cache.get(JWK_SET_URI).get()).isEqualTo(JWK_SET);
 		verify(restOperations).exchange(any(RequestEntity.class), eq(String.class));
 
 		// @formatter:off
@@ -702,29 +701,25 @@ public void decodeWhenCacheStoredThenAbleToRetrieveJwkSetFromCache() {
 	@Test
 	public void decodeWhenCacheThenRetrieveFromCache() throws Exception {
 		RestOperations restOperations = mock(RestOperations.class);
-		Cache cache = mock(Cache.class);
-		given(cache.get(eq(JWK_SET_URI), eq(String.class))).willReturn(JWK_SET);
-		given(cache.get(eq(JWK_SET_URI))).willReturn(mock(Cache.ValueWrapper.class));
+		Cache cache = new ConcurrentMapCache("cache");
+		cache.put(JWK_SET_URI, JWK_SET);
 		// @formatter:off
 		NimbusJwtDecoder jwtDecoder = NimbusJwtDecoder.withJwkSetUri(JWK_SET_URI)
 				.cache(cache)
 				.restOperations(restOperations)
 				.build();
 		// @formatter:on
 		jwtDecoder.decode(SIGNED_JWT);
-		verify(cache).get(eq(JWK_SET_URI), eq(String.class));
-		verify(cache, times(2)).get(eq(JWK_SET_URI));
-		verifyNoMoreInteractions(cache);
+		assertThat(cache.get(JWK_SET_URI).get()).isSameAs(JWK_SET);
 		verifyNoInteractions(restOperations);
 	}
 
 	// gh-11621
 	@Test
 	public void decodeWhenCacheAndUnknownKidShouldTriggerFetchOfJwkSet() throws JOSEException {
 		RestOperations restOperations = mock(RestOperations.class);
-		Cache cache = mock(Cache.class);
-		given(cache.get(eq(JWK_SET_URI), eq(String.class))).willReturn(JWK_SET);
-		given(cache.get(eq(JWK_SET_URI))).willReturn(new SimpleValueWrapper(JWK_SET));
+		Cache cache = new ConcurrentMapCache("cache");
+		cache.put(JWK_SET_URI, JWK_SET);
 		given(restOperations.exchange(any(RequestEntity.class), eq(String.class)))
 			.willReturn(new ResponseEntity<>(NEW_KID_JWK_SET, HttpStatus.OK));
 
@@ -794,19 +789,16 @@ public void decodeWhenCacheIsConfiguredAndValueLoaderErrorsThenThrowsJwtExceptio
 	@Test
 	public void decodeWhenCacheIsConfiguredAndParseFailsOnCachedValueThenExceptionIgnored() {
 		RestOperations restOperations = mock(RestOperations.class);
-		Cache cache = mock(Cache.class);
-		given(cache.get(eq(JWK_SET_URI), eq(String.class))).willReturn(JWK_SET);
-		given(cache.get(eq(JWK_SET_URI))).willReturn(mock(Cache.ValueWrapper.class));
+		Cache cache = new ConcurrentMapCache("cache");
+		cache.put(JWK_SET_URI, JWK_SET);
 		// @formatter:off
 		NimbusJwtDecoder jwtDecoder = NimbusJwtDecoder.withJwkSetUri(JWK_SET_URI)
 				.cache(cache)
 				.restOperations(restOperations)
 				.build();
 		// @formatter:on
 		jwtDecoder.decode(SIGNED_JWT);
-		verify(cache).get(eq(JWK_SET_URI), eq(String.class));
-		verify(cache, times(2)).get(eq(JWK_SET_URI));
-		verifyNoMoreInteractions(cache);
+		assertThat(cache.get(JWK_SET_URI).get()).isSameAs(JWK_SET);
 		verifyNoInteractions(restOperations);
 
 	}