WIP - kafka IT-tests moved to separate module

akka · Dec 20, 2023 · 0095faa · 0095faa
1 parent f0311b9
commit 0095faa
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/integration-tests-kafka.yml b/.github/workflows/integration-tests-kafka.yml
@@ -47,7 +47,7 @@ jobs:
           jvm: ${{ matrix.jvmName }}
 
       - name: Run all integration tests with default Scala and Java ${{ matrix.jdkVersion }}
-        run: sbt "akka-projection-kafka-tests/It/test" ${{ matrix.extraOpts }}
+        run: sbt "akka-projection-kafka-integration/test" ${{ matrix.extraOpts }}
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 

diff --git a/...a-tests/src/it/resources/application.conf → ...ation/src/test/resources/application.conf b/...a-tests/src/it/resources/application.conf → ...ation/src/test/resources/application.conf
diff --git a/...a-tests/src/it/resources/logback-test.xml → ...ation/src/test/resources/logback-test.xml b/...a-tests/src/it/resources/logback-test.xml → ...ation/src/test/resources/logback-test.xml
diff --git a/...ction/kafka/KafkaSourceProviderSpec.scala → ...ction/kafka/KafkaSourceProviderSpec.scala b/...ction/kafka/KafkaSourceProviderSpec.scala → ...ction/kafka/KafkaSourceProviderSpec.scala
diff --git a/...akka/projection/kafka/KafkaSpecBase.scala → ...akka/projection/kafka/KafkaSpecBase.scala b/...akka/projection/kafka/KafkaSpecBase.scala → ...akka/projection/kafka/KafkaSpecBase.scala
diff --git a/...gration/KafkaToSlickIntegrationSpec.scala → ...gration/KafkaToSlickIntegrationSpec.scala b/...gration/KafkaToSlickIntegrationSpec.scala → ...gration/KafkaToSlickIntegrationSpec.scala
diff --git a/build.sbt b/build.sbt
@@ -108,24 +108,19 @@ lazy val eventsourced =
 // provides offset storage backed by Kafka managed offset commits
 lazy val kafka =
   Project(id = "akka-projection-kafka", base = file("akka-projection-kafka"))
-    .configs(IntegrationTest)
     .settings(Dependencies.kafka)
     .settings(Scala3.settings)
     .dependsOn(testkit)
     .dependsOn(core)
     .disablePlugins(CiReleasePlugin)
 
-// separated for Scala 3 support in Kafka, while it tests use Slick
-lazy val `kafka-tests` =
-  Project(id = "akka-projection-kafka-tests", base = file("akka-projection-kafka-tests"))
-    .configs(IntegrationTest)
-    .settings(Dependencies.kafkaTests)
-    .settings(Defaults.itSettings)
-    .settings(headerSettings(IntegrationTest))
-    .settings(Defaults.itSettings)
-    .settings(publish / skip := true)
-    .dependsOn(kafka, testkit % "test->it")
-    .dependsOn(slick % "test->test;it->test")
+lazy val kafkaIntegration =
+  Project(id = "akka-projection-kafka-integration", base = file("akka-projection-kafka-integration"))
+    .settings(IntegrationTests.settings)
+    .settings(Dependencies.kafkaIntegration)
+    .dependsOn(kafka, testkit % "test->test")
+    .dependsOn(slick)
+    .dependsOn(slickIntegration % "test->test")
     .disablePlugins(CiReleasePlugin)
 
 // provides source providers for durable state changes
@@ -330,7 +325,6 @@ lazy val root = Project(id = "akka-projection", base = file("."))
     cassandra,
     eventsourced,
     kafka,
-    `kafka-tests`,
     `durable-state`,
     grpc,
     grpcTests,
@@ -345,7 +339,13 @@ lazy val root = Project(id = "akka-projection", base = file("."))
 
 // separate aggregate for integration tests, note that this will create a directory when used (which is then gitignored)
 lazy val integrationTests = Project(id = "akka-projection-integration", base = file("akka-projection-integration"))
-  .aggregate(cassandraIntegration, grpcIntegration, r2dbcIntegration, jdbcIntegration, slickIntegration)
+  .aggregate(
+    cassandraIntegration,
+    grpcIntegration,
+    jdbcIntegration,
+    kafkaIntegration,
+    r2dbcIntegration,
+    slickIntegration)
 
 // check format and headers
 TaskKey[Unit]("verifyCodeFmt") := {

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -204,7 +204,7 @@ object Dependencies {
         Test.akkaStreamTestkit,
         Test.logback)
 
-  val kafkaTests =
+  val kafkaIntegration =
     deps ++= Seq(
         Test.scalatest,
         Test.akkaTypedTestkit,