From 05d42f2ee2e14c755841ac781f819abd834b88a5 Mon Sep 17 00:00:00 2001
From: Enno Runne <458526+ennru@users.noreply.github.com>
Date: Thu, 22 Feb 2024 08:27:02 +0100
Subject: [PATCH] Move Kafka per class test to integration tests

---
 .../test/scala/akka/kafka}/ConnectionCheckerSpec.scala   | 4 ++--
 .../src/test/scala/akka/kafka}/MultiConsumerSpec.scala   | 3 ++-
 .../src/test/scala/akka/kafka}/RetentionPeriodSpec.scala | 9 ++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename {tests/src/test/scala/akka/kafka/scaladsl => integrationTests/src/test/scala/akka/kafka}/ConnectionCheckerSpec.scala (97%)
 rename {tests/src/test/scala/akka/kafka/scaladsl => integrationTests/src/test/scala/akka/kafka}/MultiConsumerSpec.scala (98%)
 rename {tests/src/test/scala/akka/kafka/scaladsl => integrationTests/src/test/scala/akka/kafka}/RetentionPeriodSpec.scala (99%)

diff --git a/tests/src/test/scala/akka/kafka/scaladsl/ConnectionCheckerSpec.scala b/integrationTests/src/test/scala/akka/kafka/ConnectionCheckerSpec.scala
similarity index 97%
rename from tests/src/test/scala/akka/kafka/scaladsl/ConnectionCheckerSpec.scala
rename to integrationTests/src/test/scala/akka/kafka/ConnectionCheckerSpec.scala
index 72f741460..b310c1121 100644
--- a/tests/src/test/scala/akka/kafka/scaladsl/ConnectionCheckerSpec.scala
+++ b/integrationTests/src/test/scala/akka/kafka/ConnectionCheckerSpec.scala
@@ -3,9 +3,9 @@
  * Copyright (C) 2016 - 2023 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package akka.kafka.scaladsl
+package akka.kafka
 
-import akka.kafka._
+import akka.kafka.scaladsl.{Consumer, SpecBase}
 import akka.kafka.testkit.KafkaTestkitTestcontainersSettings
 import akka.kafka.testkit.scaladsl.TestcontainersKafkaPerClassLike
 import akka.stream.scaladsl.{Keep, Sink}
diff --git a/tests/src/test/scala/akka/kafka/scaladsl/MultiConsumerSpec.scala b/integrationTests/src/test/scala/akka/kafka/MultiConsumerSpec.scala
similarity index 98%
rename from tests/src/test/scala/akka/kafka/scaladsl/MultiConsumerSpec.scala
rename to integrationTests/src/test/scala/akka/kafka/MultiConsumerSpec.scala
index 2d6fb88ee..11e2a1c81 100644
--- a/tests/src/test/scala/akka/kafka/scaladsl/MultiConsumerSpec.scala
+++ b/integrationTests/src/test/scala/akka/kafka/MultiConsumerSpec.scala
@@ -3,9 +3,10 @@
  * Copyright (C) 2016 - 2023 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package akka.kafka.scaladsl
+package akka.kafka
 
 import akka.Done
+import akka.kafka.scaladsl.SpecBase
 import akka.kafka.testkit.KafkaTestkitTestcontainersSettings
 import akka.kafka.testkit.scaladsl.TestcontainersKafkaPerClassLike
 import akka.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped
diff --git a/tests/src/test/scala/akka/kafka/scaladsl/RetentionPeriodSpec.scala b/integrationTests/src/test/scala/akka/kafka/RetentionPeriodSpec.scala
similarity index 99%
rename from tests/src/test/scala/akka/kafka/scaladsl/RetentionPeriodSpec.scala
rename to integrationTests/src/test/scala/akka/kafka/RetentionPeriodSpec.scala
index a2f3d4ab0..09a713b0b 100644
--- a/tests/src/test/scala/akka/kafka/scaladsl/RetentionPeriodSpec.scala
+++ b/integrationTests/src/test/scala/akka/kafka/RetentionPeriodSpec.scala
@@ -3,21 +3,20 @@
  * Copyright (C) 2016 - 2023 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package akka.kafka.scaladsl
-
-import java.util.concurrent.ConcurrentLinkedQueue
+package akka.kafka
 
 import akka.Done
-import akka.kafka._
+import akka.kafka.scaladsl.{Consumer, SpecBase}
 import akka.kafka.testkit.KafkaTestkitTestcontainersSettings
 import akka.kafka.testkit.scaladsl.TestcontainersKafkaPerClassLike
 import akka.stream.scaladsl.Keep
 import akka.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped
 import akka.stream.testkit.scaladsl.TestSink
 
+import java.util.concurrent.ConcurrentLinkedQueue
+import scala.collection.JavaConverters._
 import scala.concurrent.Await
 import scala.concurrent.duration._
-import scala.collection.JavaConverters._
 
 class RetentionPeriodSpec extends SpecBase with TestcontainersKafkaPerClassLike {
   private final val confluentPlatformVersion = "5.0.0"