chore: update Hazelcast and add shutdown to tests

Author: SteKoe

pom.xml

@@ -39,7 +39,7 @@
         <spring-boot.version>3.0.0-M2</spring-boot.version>
         <spring-cloud.version>2022.0.0-M2</spring-cloud.version>
         <wiremock.version>2.32.0</wiremock.version>
-        <hazelcast-tests.version>4.2.4</hazelcast-tests.version>
+        <hazelcast-tests.version>5.1.1</hazelcast-tests.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
         <awaitility.version>4.1.1</awaitility.version>
         <testcontainers.version>1.16.3</testcontainers.version>

spring-boot-admin-server-ui/src/test/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiPropertiesTest.java

@@ -30,30 +30,22 @@
 
 @SpringBootTest(classes = AdminServerUiProperties.class)
 @ExtendWith(SpringExtension.class)
-@TestPropertySource(properties = {
-	"spring.boot.admin.ui.cache.maxAge: -1s",
-	"spring.boot.admin.ui.cache.noCache: true",
-	"spring.boot.admin.ui.cache.noStore: true",
-	"spring.boot.admin.ui.theme.color: #ffffff",
-	"spring.boot.admin.ui.theme.palette.50: #50",
-	"spring.boot.admin.ui.theme.palette.100: #100",
-	"spring.boot.admin.ui.theme.palette.200: #200",
-	"spring.boot.admin.ui.theme.palette.300: #300",
-	"spring.boot.admin.ui.theme.palette.400: #400",
-	"spring.boot.admin.ui.theme.palette.500: #500",
-	"spring.boot.admin.ui.theme.palette.600: #600",
-	"spring.boot.admin.ui.theme.palette.700: #700",
-	"spring.boot.admin.ui.theme.palette.800: #800",
-	"spring.boot.admin.ui.theme.palette.900: #900"
-})
-@EnableConfigurationProperties({AdminServerUiProperties.class})
+@TestPropertySource(properties = { "spring.boot.admin.ui.cache.maxAge: -1s", "spring.boot.admin.ui.cache.noCache: true",
+		"spring.boot.admin.ui.cache.noStore: true", "spring.boot.admin.ui.theme.color: #ffffff",
+		"spring.boot.admin.ui.theme.palette.50: #50", "spring.boot.admin.ui.theme.palette.100: #100",
+		"spring.boot.admin.ui.theme.palette.200: #200", "spring.boot.admin.ui.theme.palette.300: #300",
+		"spring.boot.admin.ui.theme.palette.400: #400", "spring.boot.admin.ui.theme.palette.500: #500",
+		"spring.boot.admin.ui.theme.palette.600: #600", "spring.boot.admin.ui.theme.palette.700: #700",
+		"spring.boot.admin.ui.theme.palette.800: #800", "spring.boot.admin.ui.theme.palette.900: #900" })
+@EnableConfigurationProperties({ AdminServerUiProperties.class })
 class AdminServerUiPropertiesTest implements WithAssertions {
 
 	@Autowired
 	private AdminServerUiProperties adminServerUiProperties;
 
 	@Nested
 	class CacheTest {
+
 		@Test
 		void maxAge() {
 			assertThat(adminServerUiProperties.getCache().getMaxAge()).isEqualTo(Duration.ofSeconds(-1));
@@ -68,17 +60,20 @@ void noCache() {
 		void noStore() {
 			assertThat(adminServerUiProperties.getCache().getNoStore()).isEqualTo(true);
 		}
+
 	}
 
 	@Nested
 	class ThemeTest {
+
 		@Test
 		void color() {
 			assertThat(adminServerUiProperties.getTheme().getColor()).isEqualTo("#ffffff");
 		}
 
 		@Nested
 		class PaletteTest {
+
 			@Test
 			void shades() {
 				AdminServerUiProperties.UiTheme theme = adminServerUiProperties.getTheme();
@@ -95,6 +90,9 @@ void shades() {
 				assertThat(palette.getShade800()).isEqualTo("#800");
 				assertThat(palette.getShade900()).isEqualTo("#900");
 			}
+
 		}
+
 	}
+
 }

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/eventstore/AbstractEventStoreTest.java

@@ -22,6 +22,7 @@
 import java.util.function.Function;
 import java.util.stream.LongStream;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,6 +55,13 @@ public abstract class AbstractEventStoreTest {
 
 	protected abstract InstanceEventStore createStore(int maxLogSizePerAggregate);
 
+	protected abstract void shutdownStore();
+
+	@AfterEach
+	void tearDown() {
+		this.shutdownStore();
+	}
+
 	@Test
 	public void should_store_events() {
 		InstanceEventStore store = createStore(100);

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/eventstore/HazelcastEventStoreTest.java

@@ -21,11 +21,18 @@
 
 public class HazelcastEventStoreTest extends AbstractEventStoreTest {
 
+	HazelcastInstance hazelcast;
+
 	@Override
 	protected InstanceEventStore createStore(int maxLogSizePerAggregate) {
-		HazelcastInstance hazelcast = new TestHazelcastInstanceFactory(1).newHazelcastInstance();
+		hazelcast = new TestHazelcastInstanceFactory(1).newHazelcastInstance();
 		return new HazelcastEventStore(maxLogSizePerAggregate,
 				hazelcast.getMap("testList" + System.currentTimeMillis()));
 	}
 
+	@Override
+	protected void shutdownStore() {
+		this.hazelcast.shutdown();
+	}
+
 }

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/eventstore/HazelcastEventStoreWithClientConfigTest.java

@@ -34,6 +34,8 @@
 @Tag("docker")
 public class HazelcastEventStoreWithClientConfigTest extends AbstractEventStoreTest {
 
+	HazelcastEventStore hazelcastEventStore;
+
 	@Container
 	private static final GenericContainer<?> hazelcastServer = new GenericContainer<>("hazelcast/hazelcast:4.2.2")
 			.withExposedPorts(5701);
@@ -47,7 +49,14 @@ public HazelcastEventStoreWithClientConfigTest() {
 	@Override
 	protected InstanceEventStore createStore(int maxLogSizePerAggregate) {
 		IMap<InstanceId, List<InstanceEvent>> eventLog = this.hazelcast.getMap("testList" + System.currentTimeMillis());
-		return new HazelcastEventStore(maxLogSizePerAggregate, eventLog);
+		hazelcastEventStore = new HazelcastEventStore(maxLogSizePerAggregate, eventLog);
+		return hazelcastEventStore;
+	}
+
+	@Override
+	protected void shutdownStore() {
+		this.hazelcast.shutdown();
+		;
 	}
 
 	private HazelcastInstance createHazelcastInstance() {

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/eventstore/HazelcastEventStoreWithServerConfigTest.java

@@ -52,6 +52,12 @@ protected InstanceEventStore createStore(int maxLogSizePerAggregate) {
 		return new HazelcastEventStore(maxLogSizePerAggregate, eventLogs);
 	}
 
+	@Override
+	protected void shutdownStore() {
+		hazelcast.shutdown();
+		;
+	}
+
 	private HazelcastInstance createHazelcastInstance() {
 		Config config = createHazelcastConfig();
 		return Hazelcast.newHazelcastInstance(config);

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/eventstore/InMemoryEventStoreTest.java

@@ -23,4 +23,9 @@ protected InstanceEventStore createStore(int maxLogSizePerAggregate) {
 		return new InMemoryEventStore(maxLogSizePerAggregate);
 	}
 
+	@Override
+	protected void shutdownStore() {
+		// NOOP;
+	}
+
 }

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/services/AbstractEventHandlerTest.java

@@ -61,7 +61,7 @@ public void should_resubscribe_after_error() {
 
 		StepVerifier.create(eventHandler.getFlux()).expectSubscription()
 				.then(() -> testPublisher.next(firstEvent, errorEvent, secondEvent)).expectNext(firstEvent, secondEvent)
-				.thenCancel().verify(Duration.ofSeconds(1));
+				.thenCancel().verify(Duration.ofSeconds(2));
 	}
 
 	@Test