From 878b33c56fcf998f3b40df288a06cd9251bc205b Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 21 Nov 2023 11:29:09 +0100 Subject: [PATCH] Further polish LruContextCacheTests See gh-31640 --- .../test/context/cache/LruContextCacheTests.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/spring-test/src/test/java/org/springframework/test/context/cache/LruContextCacheTests.java b/spring-test/src/test/java/org/springframework/test/context/cache/LruContextCacheTests.java index 819b020f1281..1b816f821ca6 100644 --- a/spring-test/src/test/java/org/springframework/test/context/cache/LruContextCacheTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/cache/LruContextCacheTests.java @@ -16,19 +16,19 @@ package org.springframework.test.context.cache; +import java.util.Arrays; import java.util.List; -import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.context.MergedContextConfiguration; -import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.as; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.InstanceOfAssertFactories.map; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -157,16 +157,14 @@ private static MergedContextConfiguration config(Class clazz) { @SuppressWarnings("unchecked") private static void assertCacheContents(DefaultContextCache cache, String... expectedNames) { - - assertThat(cache).extracting("contextMap", as(InstanceOfAssertFactories.map(MergedContextConfiguration.class, ApplicationContext.class))) - .satisfies((contextMap) -> { - // @formatter:off + assertThat(cache).extracting("contextMap", as(map(MergedContextConfiguration.class, ApplicationContext.class))) + .satisfies(contextMap -> { List actualNames = contextMap.keySet().stream() - .map(cfg -> cfg.getClasses()[0]) + .map(MergedContextConfiguration::getClasses) + .flatMap(Arrays::stream) .map(Class::getSimpleName) .toList(); - // @formatter:on - assertThat(actualNames).isEqualTo(asList(expectedNames)); + assertThat(actualNames).containsExactly(expectedNames); }); }