From: Kai Moritz <kai@juplo.de>
Date: Mon, 25 Mar 2024 23:01:49 +0000 (+0100)
Subject: test: refactor: Refined naming of `ChatHomeServiceIT` -- ALIGN
X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=c0e9187f7f6ef3c5314f5e2c452007b19a9336bd;p=demos%2Fkafka%2Fchat

test: refactor: Refined naming of `ChatHomeServiceIT` -- ALIGN
---

diff --git a/src/test/java/de/juplo/kafka/chat/backend/domain/AbstractChatHomeServiceIT.java b/src/test/java/de/juplo/kafka/chat/backend/domain/AbstractChatHomeServiceIT.java
index 3be9a35a..1f4bc08d 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/domain/AbstractChatHomeServiceIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/domain/AbstractChatHomeServiceIT.java
@@ -28,9 +28,9 @@ import static pl.rzrz.assertj.reactor.Assertions.assertThat;
     InMemoryServicesConfiguration.class,
     FilesStorageConfiguration.class,
     KafkaServicesConfiguration.class,
-    ChatHomeServiceTest.TestConfiguration.class })
+    AbstractChatHomeServiceIT.TestConfiguration.class })
 @EnableConfigurationProperties(ChatBackendProperties.class)
-public abstract class ChatHomeServiceTest
+public abstract class AbstractChatHomeServiceIT
 {
   @Autowired
   ChatHomeService chatHomeService;
diff --git a/src/test/java/de/juplo/kafka/chat/backend/domain/AbstractChatHomeServiceWithShardsIT.java b/src/test/java/de/juplo/kafka/chat/backend/domain/AbstractChatHomeServiceWithShardsIT.java
index 6d156750..27edcc10 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/domain/AbstractChatHomeServiceWithShardsIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/domain/AbstractChatHomeServiceWithShardsIT.java
@@ -13,7 +13,7 @@ import java.util.UUID;
 import static pl.rzrz.assertj.reactor.Assertions.assertThat;
 
 
-public abstract class ChatHomeServiceWithShardsTest extends ChatHomeServiceTest
+public abstract class AbstractChatHomeServiceWithShardsIT extends AbstractChatHomeServiceIT
 {
   public static final int NUM_SHARDS = 10;
   public static final int OWNED_SHARD = 2;
diff --git a/src/test/java/de/juplo/kafka/chat/backend/implementation/inmemory/ShardedChatHomeServiceWithShardsIT.java b/src/test/java/de/juplo/kafka/chat/backend/implementation/inmemory/ShardedChatHomeServiceWithShardsIT.java
index 95501ad9..293616fc 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/implementation/inmemory/ShardedChatHomeServiceWithShardsIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/implementation/inmemory/ShardedChatHomeServiceWithShardsIT.java
@@ -1,10 +1,10 @@
 package de.juplo.kafka.chat.backend.implementation.inmemory;
 
-import de.juplo.kafka.chat.backend.domain.ChatHomeServiceWithShardsTest;
+import de.juplo.kafka.chat.backend.domain.AbstractChatHomeServiceWithShardsIT;
 import org.springframework.test.context.TestPropertySource;
 
-import static de.juplo.kafka.chat.backend.domain.ChatHomeServiceWithShardsTest.NUM_SHARDS;
-import static de.juplo.kafka.chat.backend.domain.ChatHomeServiceWithShardsTest.OWNED_SHARD;
+import static de.juplo.kafka.chat.backend.domain.AbstractChatHomeServiceWithShardsIT.NUM_SHARDS;
+import static de.juplo.kafka.chat.backend.domain.AbstractChatHomeServiceWithShardsIT.OWNED_SHARD;
 
 
 @TestPropertySource(properties = {
@@ -13,6 +13,6 @@ import static de.juplo.kafka.chat.backend.domain.ChatHomeServiceWithShardsTest.O
     "chat.backend.inmemory.owned-shards=" + OWNED_SHARD,
     "chat.backend.inmemory.storage-strategy=files",
     "chat.backend.inmemory.storage-directory=target/test-classes/data/files" })
-public class ShardedChatHomeServiceTest extends ChatHomeServiceWithShardsTest
+public class ShardedChatHomeServiceWithShardsIT extends AbstractChatHomeServiceWithShardsIT
 {
 }
diff --git a/src/test/java/de/juplo/kafka/chat/backend/implementation/inmemory/SimpleChatHomeServiceIT.java b/src/test/java/de/juplo/kafka/chat/backend/implementation/inmemory/SimpleChatHomeServiceIT.java
index 09369cba..c73ecc39 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/implementation/inmemory/SimpleChatHomeServiceIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/implementation/inmemory/SimpleChatHomeServiceIT.java
@@ -1,6 +1,6 @@
 package de.juplo.kafka.chat.backend.implementation.inmemory;
 
-import de.juplo.kafka.chat.backend.domain.ChatHomeServiceTest;
+import de.juplo.kafka.chat.backend.domain.AbstractChatHomeServiceIT;
 import org.springframework.test.context.TestPropertySource;
 
 
@@ -8,6 +8,6 @@ import org.springframework.test.context.TestPropertySource;
     "chat.backend.inmemory.sharding-strategy=none",
     "chat.backend.inmemory.storage-strategy=files",
     "chat.backend.inmemory.storage-directory=target/test-classes/data/files" })
-public class SimpleChatHomeServiceTest extends ChatHomeServiceTest
+public class SimpleChatHomeServiceIT extends AbstractChatHomeServiceIT
 {
 }
diff --git a/src/test/java/de/juplo/kafka/chat/backend/implementation/kafka/InfoChannelTest.java b/src/test/java/de/juplo/kafka/chat/backend/implementation/kafka/InfoChannelTest.java
index c651a5bd..f8d11cd9 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/implementation/kafka/InfoChannelTest.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/implementation/kafka/InfoChannelTest.java
@@ -6,7 +6,6 @@ import de.juplo.kafka.chat.backend.ChatBackendProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.common.TopicPartition;
 import org.awaitility.Awaitility;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +13,6 @@ import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration;
 import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -23,9 +21,7 @@ import java.time.Clock;
 import java.time.Duration;
 import java.util.List;
 
-import static de.juplo.kafka.chat.backend.domain.ChatHomeServiceWithShardsTest.NUM_SHARDS;
-import static de.juplo.kafka.chat.backend.implementation.kafka.InfoChannelTest.DATA_TOPIC;
-import static de.juplo.kafka.chat.backend.implementation.kafka.InfoChannelTest.INFO_TOPIC;
+import static de.juplo.kafka.chat.backend.implementation.kafka.InfoChannelTest.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
 
@@ -53,6 +49,7 @@ public class InfoChannelTest
 {
   final static String INFO_TOPIC = "INFO_CHANNEL_TEST_INFO";
   final static String DATA_TOPIC = "INFO_CHANNEL_TEST_DATA";
+  final static int NUM_SHARDS = 10;
 
 
   @Autowired
diff --git a/src/test/java/de/juplo/kafka/chat/backend/implementation/kafka/KafkaChatHomeServiceWithShardsIT.java b/src/test/java/de/juplo/kafka/chat/backend/implementation/kafka/KafkaChatHomeServiceWithShardsIT.java
index 1fec5266..de0a6ff1 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/implementation/kafka/KafkaChatHomeServiceWithShardsIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/implementation/kafka/KafkaChatHomeServiceWithShardsIT.java
@@ -1,6 +1,6 @@
 package de.juplo.kafka.chat.backend.implementation.kafka;
 
-import de.juplo.kafka.chat.backend.domain.ChatHomeServiceWithShardsTest;
+import de.juplo.kafka.chat.backend.domain.AbstractChatHomeServiceWithShardsIT;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.common.TopicPartition;
 import org.junit.jupiter.api.BeforeAll;
@@ -16,9 +16,9 @@ import org.springframework.test.context.TestPropertySource;
 
 import java.util.List;
 
-import static de.juplo.kafka.chat.backend.domain.ChatHomeServiceWithShardsTest.NUM_SHARDS;
-import static de.juplo.kafka.chat.backend.implementation.kafka.KafkaChatHomeServiceTest.DATA_TOPIC;
-import static de.juplo.kafka.chat.backend.implementation.kafka.KafkaChatHomeServiceTest.INFO_TOPIC;
+import static de.juplo.kafka.chat.backend.domain.AbstractChatHomeServiceWithShardsIT.NUM_SHARDS;
+import static de.juplo.kafka.chat.backend.implementation.kafka.KafkaChatHomeServiceWithShardsIT.DATA_TOPIC;
+import static de.juplo.kafka.chat.backend.implementation.kafka.KafkaChatHomeServiceWithShardsIT.INFO_TOPIC;
 
 
 @ContextConfiguration(classes = {
@@ -39,7 +39,7 @@ import static de.juplo.kafka.chat.backend.implementation.kafka.KafkaChatHomeServ
     topics = { INFO_TOPIC, DATA_TOPIC },
     partitions = NUM_SHARDS)
 @Slf4j
-public class KafkaChatHomeServiceTest extends ChatHomeServiceWithShardsTest
+public class KafkaChatHomeServiceWithShardsIT extends AbstractChatHomeServiceWithShardsIT
 {
   final static String INFO_TOPIC = "KAFKA_CHAT_HOME_TEST_INFO";
   final static String DATA_TOPIC = "KAFKA_CHAT_HOME_TEST_DATA";
@@ -61,7 +61,7 @@ public class KafkaChatHomeServiceTest extends ChatHomeServiceWithShardsTest
 
 
   @TestConfiguration
-  static class KafkaChatHomeServiceTestConfiguration
+  static class KafkaChatHomeServiceWithShardsITConfiguration
   {
     @Bean
     WorkAssignor infoChannelWorkAssignor()