Simplify tests

lukas-krecan · Dec 10, 2022 · 93a2207 · 93a2207
1 parent 6dc67e4
commit 93a2207
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 29 deletions.
diff --git a/...rovider-r2dbc/src/test/java/net/javacrumbs/shedlock/provider/r2dbc/AbstractR2dbcTest.java b/...rovider-r2dbc/src/test/java/net/javacrumbs/shedlock/provider/r2dbc/AbstractR2dbcTest.java
@@ -7,6 +7,7 @@
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import net.javacrumbs.shedlock.support.StorageBasedLockProvider;
 import net.javacrumbs.shedlock.test.support.jdbc.AbstractJdbcLockProviderIntegrationTest;
+import net.javacrumbs.shedlock.test.support.jdbc.DbConfig;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.TestInstance;
@@ -18,9 +19,14 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 abstract class AbstractR2dbcTest extends AbstractJdbcLockProviderIntegrationTest {
+    private final DbConfig dbConfig;
 
     private ConnectionFactory connectionFactory;
 
+    AbstractR2dbcTest(DbConfig dbConfig) {
+        this.dbConfig = dbConfig;
+    }
+
     @BeforeAll
     public void startDb() {
         getDbConfig().startDb();
@@ -70,4 +76,9 @@ protected ConnectionFactory connectionFactory() {
     protected boolean usePool() {
         return true;
     }
+
+    @Override
+    public DbConfig getDbConfig() {
+        return dbConfig;
+    }
 }
diff --git a/...st/java/net/javacrumbs/shedlock/provider/r2dbc/MariaR2dbcLockProviderIntegrationTest.java b/...st/java/net/javacrumbs/shedlock/provider/r2dbc/MariaR2dbcLockProviderIntegrationTest.java
@@ -15,16 +15,13 @@
  */
 package net.javacrumbs.shedlock.provider.r2dbc;
 
-import net.javacrumbs.shedlock.test.support.jdbc.DbConfig;
 import net.javacrumbs.shedlock.test.support.jdbc.MariaDbConfig;
 import org.junit.jupiter.api.Disabled;
 
 @Disabled("No R2DBC 1.0.0 compatible driver")
 public class MariaR2dbcLockProviderIntegrationTest extends AbstractR2dbcTest {
-    private static final DbConfig dbConfig = new MariaDbConfig();
 
-    @Override
-    protected DbConfig getDbConfig() {
-        return dbConfig;
+    public MariaR2dbcLockProviderIntegrationTest() {
+        super(new MariaDbConfig());
     }
 }
diff --git a/...st/java/net/javacrumbs/shedlock/provider/r2dbc/MsSqlR2dbcLockProviderIntegrationTest.java b/...st/java/net/javacrumbs/shedlock/provider/r2dbc/MsSqlR2dbcLockProviderIntegrationTest.java
@@ -15,16 +15,12 @@
  */
 package net.javacrumbs.shedlock.provider.r2dbc;
 
-import net.javacrumbs.shedlock.test.support.jdbc.DbConfig;
 import net.javacrumbs.shedlock.test.support.jdbc.MsSqlServerConfig;
 import org.junit.jupiter.api.Disabled;
 
 @Disabled("Maven build does not finish when enabled")
 public class MsSqlR2dbcLockProviderIntegrationTest extends AbstractR2dbcTest {
-    private static final DbConfig dbConfig = new MsSqlServerConfig();
-
-    @Override
-    protected DbConfig getDbConfig() {
-        return dbConfig;
+    public MsSqlR2dbcLockProviderIntegrationTest() {
+        super(new MsSqlServerConfig());
     }
 }
diff --git a/...st/java/net/javacrumbs/shedlock/provider/r2dbc/MySqlR2dbcLockProviderIntegrationTest.java b/...st/java/net/javacrumbs/shedlock/provider/r2dbc/MySqlR2dbcLockProviderIntegrationTest.java
@@ -15,14 +15,10 @@
  */
 package net.javacrumbs.shedlock.provider.r2dbc;
 
-import net.javacrumbs.shedlock.test.support.jdbc.DbConfig;
 import net.javacrumbs.shedlock.test.support.jdbc.MySqlConfig;
 
 public class MySqlR2dbcLockProviderIntegrationTest extends AbstractR2dbcTest {
-    private static final DbConfig dbConfig = new MySqlConfig();
-
-    @Override
-    protected DbConfig getDbConfig() {
-        return dbConfig;
+    public MySqlR2dbcLockProviderIntegrationTest() {
+        super(new MySqlConfig());
     }
 }
diff --git a/...t/java/net/javacrumbs/shedlock/provider/r2dbc/OracleR2dbcLockProviderIntegrationTest.java b/...t/java/net/javacrumbs/shedlock/provider/r2dbc/OracleR2dbcLockProviderIntegrationTest.java
@@ -15,15 +15,11 @@
  */
 package net.javacrumbs.shedlock.provider.r2dbc;
 
-import net.javacrumbs.shedlock.test.support.jdbc.DbConfig;
 import net.javacrumbs.shedlock.test.support.jdbc.OracleServerConfig;
 
 public class OracleR2dbcLockProviderIntegrationTest extends AbstractR2dbcTest {
-    private static final DbConfig dbConfig = new OracleServerConfig();
-
-    @Override
-    protected DbConfig getDbConfig() {
-        return dbConfig;
+    public OracleR2dbcLockProviderIntegrationTest() {
+        super(new OracleServerConfig());
     }
 
     @Override

diff --git a/...java/net/javacrumbs/shedlock/provider/r2dbc/PostgresR2dbcLockProviderIntegrationTest.java b/...java/net/javacrumbs/shedlock/provider/r2dbc/PostgresR2dbcLockProviderIntegrationTest.java
@@ -15,14 +15,10 @@
  */
 package net.javacrumbs.shedlock.provider.r2dbc;
 
-import net.javacrumbs.shedlock.test.support.jdbc.DbConfig;
 import net.javacrumbs.shedlock.test.support.jdbc.PostgresConfig;
 
 public class PostgresR2dbcLockProviderIntegrationTest extends AbstractR2dbcTest {
-    private static final DbConfig dbConfig = new PostgresConfig();
-
-    @Override
-    protected DbConfig getDbConfig() {
-        return dbConfig;
+    public PostgresR2dbcLockProviderIntegrationTest() {
+        super(new PostgresConfig());
     }
 }