test: Simplified `InMemoryWithMongoDbStorageIT`

[demos/kafka/chat] / src / test / java / de / juplo / kafka / chat / backend / InMemoryWithMongoDbStorageIT.java

diff --git a/src/test/java/de/juplo/kafka/chat/backend/InMemoryWithMongoDbStorageIT.java b/src/test/java/de/juplo/kafka/chat/backend/InMemoryWithMongoDbStorageIT.java
index a0dab37..7055af5 100644 (file)
--- a/src/test/java/de/juplo/kafka/chat/backend/InMemoryWithMongoDbStorageIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/InMemoryWithMongoDbStorageIT.java
@@ -1,9 +1,9 @@
-package de.juplo.kafka.chat.backend.persistence;
+package de.juplo.kafka.chat.backend;
 
-import de.juplo.kafka.chat.backend.persistence.InMemoryWithMongoDbStorageIT.DataSourceInitializer;
-import de.juplo.kafka.chat.backend.persistence.storage.mongodb.ChatRoomRepository;
-import de.juplo.kafka.chat.backend.persistence.storage.mongodb.MessageRepository;
-import de.juplo.kafka.chat.backend.persistence.storage.mongodb.MongoDbStorageStrategy;
+import de.juplo.kafka.chat.backend.implementation.StorageStrategy;
+import de.juplo.kafka.chat.backend.storage.mongodb.ChatRoomRepository;
+import de.juplo.kafka.chat.backend.storage.mongodb.MessageRepository;
+import de.juplo.kafka.chat.backend.storage.mongodb.MongoDbStorageStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -11,13 +11,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo;
 import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.test.context.support.TestPropertySourceUtils;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.MongoDBContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -29,7 +27,6 @@ import java.time.Clock;
 @ExtendWith({SpringExtension.class})
 @EnableAutoConfiguration
 @AutoConfigureDataMongo
-@ContextConfiguration(initializers = DataSourceInitializer.class)
 @Slf4j
 public class InMemoryWithMongoDbStorageIT extends AbstractInMemoryStorageIT
 {
@@ -59,13 +56,9 @@ public class InMemoryWithMongoDbStorageIT extends AbstractInMemoryStorageIT
     @Bean
     MongoDbStorageStrategy storageStrategy(
         ChatRoomRepository chatRoomRepository,
-        MessageRepository messageRepository,
-        Clock clock)
+        MessageRepository messageRepository)
     {
-      return new MongoDbStorageStrategy(
-          chatRoomRepository,
-          messageRepository,
-          chatRoomId -> 0);
+      return new MongoDbStorageStrategy(chatRoomRepository, messageRepository);
     }
 
     @Bean
@@ -75,32 +68,15 @@ public class InMemoryWithMongoDbStorageIT extends AbstractInMemoryStorageIT
     }
   }
 
-  private static final int MONGODB_PORT = 27017;
-
   @Container
-  private static final GenericContainer CONTAINER =
-      new GenericContainer("mongo:6")
-          .withExposedPorts(MONGODB_PORT);
-
-  public static class DataSourceInitializer
-      implements ApplicationContextInitializer<ConfigurableApplicationContext>
-  {
-    @Override
-    public void initialize(ConfigurableApplicationContext applicationContext)
-    {
-      TestPropertySourceUtils.addInlinedPropertiesToEnvironment(
-          applicationContext,
-          "spring.data.mongodb.host=localhost",
-          "spring.data.mongodb.port=" + CONTAINER.getMappedPort(MONGODB_PORT),
-          "spring.data.mongodb.database=test");
-    }
-  }
+  @ServiceConnection
+  private static final GenericContainer MONGODB = new MongoDBContainer("mongo:6");
 
   @BeforeEach
   void setUpLogging()
   {
     Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(log);
-    CONTAINER.followOutput(logConsumer);
+    MONGODB.followOutput(logConsumer);
     chatRoomRepository.deleteAll();
     messageRepository.deleteAll();
   }