You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by ro...@apache.org on 2024/03/31 11:16:17 UTC
(pekko-persistence-jdbc) branch main updated: chore: fix deprecated IntegrationTest (#165)
This is an automated email from the ASF dual-hosted git repository.
roiocam pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-persistence-jdbc.git
The following commit(s) were added to refs/heads/main by this push:
new 4dcaddb chore: fix deprecated IntegrationTest (#165)
4dcaddb is described below
commit 4dcaddb5da6f4917524ca24a8ac8ce8faecfb140
Author: AndyChen(Jingzhang) <iR...@gmail.com>
AuthorDate: Sun Mar 31 19:16:12 2024 +0800
chore: fix deprecated IntegrationTest (#165)
* chore: fix deprecated IntegrationTest
* rollback artifact id
* fix ci check
---
.github/workflows/checks.yml | 4 ++--
.github/workflows/mysql-tests.yml | 2 +-
.github/workflows/oracle-tests.yml | 2 +-
.github/workflows/postgres-tests.yml | 2 +-
.github/workflows/sqlserver-tests.yml | 2 +-
build.sbt | 18 ++++++++++++++----
.../jdbc/integration/AllPersistenceIdsTest.scala | 0
.../integration/CurrentEventsByPersistenceIdTest.scala | 0
.../jdbc/integration/CurrentEventsByTagTest.scala | 0
.../jdbc/integration/CurrentPersistenceIdsTest.scala | 0
.../jdbc/integration/EventAdapterTest.scala | 0
.../jdbc/integration/EventsByPersistenceIdTest.scala | 0
.../persistence/jdbc/integration/EventsByTagTest.scala | 0
.../jdbc/integration/HardDeleteQueryTest.scala | 0
.../jdbc/integration/JdbcJournalPerfSpec.scala | 0
.../persistence/jdbc/integration/JdbcJournalSpec.scala | 0
.../jdbc/integration/JdbcSnapshotStoreSpec.scala | 0
.../JournalDaoStreamMessagesMemoryTest.scala | 0
.../jdbc/integration/JournalSequenceActorTest.scala | 0
.../PostgresDurableStateStorePluginSpec.scala | 0
...PostgresScalaJdbcDurableStateChangesByTagTest.scala | 0
.../StoreOnlySerializableMessagesTest.scala | 0
.../migrator/integration/JournalMigratorTest.scala | 0
.../migrator/integration/SnapshotMigratorTest.scala | 0
24 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index c1f14a7..3edacb4 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -67,8 +67,8 @@ jobs:
uses: coursier/cache-action@v6
- name: Compile all code with fatal warnings for Java 11, Scala 2.12, Scala 2.13 and Scala 3
- # Run locally with: sbt 'clean ; +Test/compile ; +It/compile'
- run: sbt "; +Test/compile; +It/compile"
+ # Run locally with: sbt 'clean ; +Test/compile'
+ run: sbt "; +Test/compile"
check-docs:
name: Check Docs
diff --git a/.github/workflows/mysql-tests.yml b/.github/workflows/mysql-tests.yml
index d440524..d6c40f5 100644
--- a/.github/workflows/mysql-tests.yml
+++ b/.github/workflows/mysql-tests.yml
@@ -47,7 +47,7 @@ jobs:
run: ./scripts/launch-mysql.sh
- name: Run Integration tests for ${{ matrix.name }}
- run: sbt "++2.13 It/testOnly org.apache.pekko.persistence.jdbc.integration.MySQL*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
+ run: sbt "++2.13 integration/testOnly org.apache.pekko.persistence.jdbc.integration.MySQL*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
- name: Print logs on failure
if: ${{ failure() }}
diff --git a/.github/workflows/oracle-tests.yml b/.github/workflows/oracle-tests.yml
index 15527e8..f6a33d7 100644
--- a/.github/workflows/oracle-tests.yml
+++ b/.github/workflows/oracle-tests.yml
@@ -47,7 +47,7 @@ jobs:
run: ./scripts/launch-oracle.sh
- name: Run Integration tests for ${{ matrix.name }}
- run: sbt "++2.13 It/testOnly org.apache.pekko.persistence.jdbc.integration.Oracle*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
+ run: sbt "++2.13 integration/testOnly org.apache.pekko.persistence.jdbc.integration.Oracle*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
- name: Print logs on failure
if: ${{ failure() }}
diff --git a/.github/workflows/postgres-tests.yml b/.github/workflows/postgres-tests.yml
index 6cf5f47..05950a9 100644
--- a/.github/workflows/postgres-tests.yml
+++ b/.github/workflows/postgres-tests.yml
@@ -47,7 +47,7 @@ jobs:
run: ./scripts/launch-postgres.sh
- name: Run Integration tests for ${{ matrix.name }}
- run: sbt "++2.13 It/testOnly org.apache.pekko.persistence.jdbc.integration.Postgres*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
+ run: sbt "++2.13 integration/testOnly org.apache.pekko.persistence.jdbc.integration.Postgres*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
- name: Print logs on failure
if: ${{ failure() }}
diff --git a/.github/workflows/sqlserver-tests.yml b/.github/workflows/sqlserver-tests.yml
index 75a5959..a8e6911 100644
--- a/.github/workflows/sqlserver-tests.yml
+++ b/.github/workflows/sqlserver-tests.yml
@@ -47,7 +47,7 @@ jobs:
run: ./scripts/launch-sqlserver.sh
- name: Run Integration tests for ${{ matrix.name }}
- run: sbt "++2.13 It/testOnly org.apache.pekko.persistence.jdbc.integration.SqlServer*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
+ run: sbt "++2.13 integration/testOnly org.apache.pekko.persistence.jdbc.integration.SqlServer*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
- name: Print logs on failure
if: ${{ failure() }}
diff --git a/build.sbt b/build.sbt
index 0b51334..e46f85e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -33,8 +33,6 @@ lazy val core = project
.in(file("core"))
.enablePlugins(MimaPlugin, ReproducibleBuildsPlugin)
.disablePlugins(SitePlugin)
- .configs(IntegrationTest.extend(Test))
- .settings(Defaults.itSettings)
.settings(
name := "pekko-persistence-jdbc",
libraryDependencies ++= Dependencies.Libraries,
@@ -42,11 +40,16 @@ lazy val core = project
mimaPreviousArtifacts := Set(
organization.value %% name.value % mimaCompareVersion))
+lazy val integration = project
+ .in(file("integration-test"))
+ .settings(name := "pekko-persistence-jdbc-integration", libraryDependencies ++= Dependencies.Libraries)
+ .settings(publish / skip := true, doc / sources := Seq.empty, Test / fork := true)
+ .disablePlugins(MimaPlugin, SitePlugin)
+ .dependsOn(core % "compile->compile;test->test")
+
lazy val migrator = project
.in(file("migrator"))
.disablePlugins(SitePlugin, MimaPlugin, ReproducibleBuildsPlugin)
- .configs(IntegrationTest.extend(Test))
- .settings(Defaults.itSettings)
.settings(
name := "pekko-persistence-jdbc-migrator",
libraryDependencies ++= Dependencies.Migration ++ Dependencies.Libraries,
@@ -54,6 +57,13 @@ lazy val migrator = project
publish / skip := true)
.dependsOn(core % "compile->compile;test->test")
+lazy val migratorIntegration = project
+ .in(file("migrator-integration-test"))
+ .settings(name := "pekko-persistence-jdbc-migrator-integration", libraryDependencies ++= Dependencies.Libraries)
+ .settings(publish / skip := true, doc / sources := Seq.empty, Test / fork := true)
+ .disablePlugins(MimaPlugin, SitePlugin)
+ .dependsOn(core % "compile->compile;test->test")
+
lazy val themeSettings = Seq(
pekkoParadoxGithub := Some("https://github.com/apache/pekko-persistence-jdbc"))
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/AllPersistenceIdsTest.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/AllPersistenceIdsTest.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/AllPersistenceIdsTest.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/AllPersistenceIdsTest.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/CurrentEventsByPersistenceIdTest.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/CurrentEventsByPersistenceIdTest.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/CurrentEventsByPersistenceIdTest.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/CurrentEventsByPersistenceIdTest.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/CurrentEventsByTagTest.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/CurrentEventsByTagTest.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/CurrentEventsByTagTest.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/CurrentEventsByTagTest.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/CurrentPersistenceIdsTest.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/CurrentPersistenceIdsTest.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/CurrentPersistenceIdsTest.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/CurrentPersistenceIdsTest.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/EventAdapterTest.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/EventAdapterTest.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/EventAdapterTest.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/EventAdapterTest.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/EventsByPersistenceIdTest.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/EventsByPersistenceIdTest.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/EventsByPersistenceIdTest.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/EventsByPersistenceIdTest.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/EventsByTagTest.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/EventsByTagTest.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/EventsByTagTest.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/EventsByTagTest.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/HardDeleteQueryTest.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/HardDeleteQueryTest.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/HardDeleteQueryTest.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/HardDeleteQueryTest.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalPerfSpec.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalPerfSpec.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalPerfSpec.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalPerfSpec.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalSpec.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalSpec.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalSpec.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalSpec.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcSnapshotStoreSpec.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/JdbcSnapshotStoreSpec.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcSnapshotStoreSpec.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/JdbcSnapshotStoreSpec.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JournalDaoStreamMessagesMemoryTest.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/JournalDaoStreamMessagesMemoryTest.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JournalDaoStreamMessagesMemoryTest.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/JournalDaoStreamMessagesMemoryTest.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JournalSequenceActorTest.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/JournalSequenceActorTest.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JournalSequenceActorTest.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/JournalSequenceActorTest.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/PostgresDurableStateStorePluginSpec.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/PostgresDurableStateStorePluginSpec.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/PostgresDurableStateStorePluginSpec.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/PostgresDurableStateStorePluginSpec.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/PostgresScalaJdbcDurableStateChangesByTagTest.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/PostgresScalaJdbcDurableStateChangesByTagTest.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/PostgresScalaJdbcDurableStateChangesByTagTest.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/PostgresScalaJdbcDurableStateChangesByTagTest.scala
diff --git a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/StoreOnlySerializableMessagesTest.scala b/integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/StoreOnlySerializableMessagesTest.scala
similarity index 100%
rename from core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/StoreOnlySerializableMessagesTest.scala
rename to integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/integration/StoreOnlySerializableMessagesTest.scala
diff --git a/migrator/src/it/scala/org/apache/pekko/persistence/jdbc/migrator/integration/JournalMigratorTest.scala b/migrator-integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/integration/JournalMigratorTest.scala
similarity index 100%
rename from migrator/src/it/scala/org/apache/pekko/persistence/jdbc/migrator/integration/JournalMigratorTest.scala
rename to migrator-integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/integration/JournalMigratorTest.scala
diff --git a/migrator/src/it/scala/org/apache/pekko/persistence/jdbc/migrator/integration/SnapshotMigratorTest.scala b/migrator-integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/integration/SnapshotMigratorTest.scala
similarity index 100%
rename from migrator/src/it/scala/org/apache/pekko/persistence/jdbc/migrator/integration/SnapshotMigratorTest.scala
rename to migrator-integration-test/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/integration/SnapshotMigratorTest.scala
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org