Merge pull request #1253 from amergey/main

unit test refactoring (ease support of test container)
quartz-scheduler · Nov 6, 2024 · 94c890f · 94c890f
2 parents 08fb8ff + d519029
commit 94c890f
Show file tree

Hide file tree

Showing 27 changed files with 258 additions and 233 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -15,8 +15,7 @@ commonjVersion = 1.0
 
 junitVersion = 4.13.2
 junitPlatformVersion = 5.11.3
-#derbyVersion = 10.15.2.0
-derbyVersion = 10.8.2.2
+derbyVersion = 10.15.2.0
 
 # For nexus-publish plugin
 sonatypeUsername = OVERRIDE_ME

diff --git a/quartz/build.gradle b/quartz/build.gradle
@@ -41,7 +41,6 @@ dependencies {
     testImplementation(platform("org.junit:junit-bom:5.11.3"))
     testImplementation 'org.junit.jupiter:junit-jupiter-engine'
     testImplementation 'org.junit.jupiter:junit-jupiter-params'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params'
     testImplementation 'org.mockito:mockito-core:5.14.2'
     testImplementation 'org.testcontainers:mssqlserver:1.20.3'
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.8.1.jre11'

diff --git a/quartz/src/test/java/org/quartz/FlakyJdbcSchedulerTest.java b/quartz/src/test/java/org/quartz/FlakyJdbcSchedulerTest.java
@@ -7,6 +7,7 @@
 import org.quartz.impl.SchedulerRepository;
 import org.quartz.impl.jdbcjobstore.JdbcQuartzTestUtilities;
 import org.quartz.impl.jdbcjobstore.JobStoreTX;
+import org.quartz.impl.jdbcjobstore.JdbcQuartzTestUtilities.DatabaseType;
 import org.quartz.simpl.SimpleThreadPool;
 import org.quartz.utils.ConnectionProvider;
 import org.quartz.utils.DBConnectionManager;
@@ -156,7 +157,7 @@ private class FlakyConnectionProvider implements ConnectionProvider {
         private FlakyConnectionProvider(String name) throws SQLException {
             this.delegateName = "delegate_" + name;
             this.safeThread = Thread.currentThread();
-            JdbcQuartzTestUtilities.createDatabase(delegateName);
+            JdbcQuartzTestUtilities.createDatabase(delegateName, DatabaseType.DERBY);
         }
 
         @Override
@@ -176,8 +177,8 @@ public Connection getConnection() throws SQLException {
         @Override
         public void shutdown() throws SQLException {
             DBConnectionManager.getInstance().shutdown(delegateName);
-            JdbcQuartzTestUtilities.destroyDatabase(delegateName);
-            JdbcQuartzTestUtilities.shutdownDatabase();
+            JdbcQuartzTestUtilities.destroyDatabase(delegateName, DatabaseType.DERBY);
+            JdbcQuartzTestUtilities.shutdownDatabase(delegateName, DatabaseType.DERBY);
         }
 
         @Override

diff --git a/quartz/src/test/java/org/quartz/JdbcSchedulerTest.java b/quartz/src/test/java/org/quartz/JdbcSchedulerTest.java
@@ -22,19 +22,24 @@
 import org.quartz.impl.SchedulerRepository;
 import org.quartz.impl.jdbcjobstore.JdbcQuartzTestUtilities;
 import org.quartz.impl.jdbcjobstore.JobStoreTX;
+import org.quartz.impl.jdbcjobstore.JdbcQuartzTestUtilities.DatabaseType;
 import org.quartz.simpl.SimpleThreadPool;
 
 public class JdbcSchedulerTest extends AbstractSchedulerTest {
+
+    protected DatabaseType getDatabaseType() {
+        return DatabaseType.DERBY;
+    }
 
     @Override
     protected Scheduler createScheduler(String name, int threadPoolSize) throws SchedulerException {
         try {
-            JdbcQuartzTestUtilities.createDatabase(name + "Database");
+            JdbcQuartzTestUtilities.createDatabase(name + getDatabaseType().name(), getDatabaseType());
         } catch (SQLException e) {
             throw new AssertionError(e);
         }
         JobStoreTX jobStore = new JobStoreTX();
-        jobStore.setDataSource(name + "Database");
+        jobStore.setDataSource(name + getDatabaseType().name());
         jobStore.setTablePrefix("QRTZ_");
         jobStore.setInstanceId("AUTO");
         DirectSchedulerFactory.getInstance().createScheduler(name + "Scheduler", "AUTO", new SimpleThreadPool(threadPoolSize, Thread.NORM_PRIORITY), jobStore);

diff --git a/quartz/src/test/java/org/quartz/core/QTZ385Test.java b/quartz/src/test/java/org/quartz/core/QTZ385Test.java
@@ -37,6 +37,7 @@
 import org.quartz.impl.DirectSchedulerFactory;
 import org.quartz.impl.jdbcjobstore.JdbcQuartzTestUtilities;
 import org.quartz.impl.jdbcjobstore.JobStoreTX;
+import org.quartz.impl.jdbcjobstore.JdbcQuartzTestUtilities.DatabaseType;
 import org.quartz.integrations.tests.HelloJob;
 import org.quartz.listeners.JobListenerSupport;
 import org.quartz.simpl.SimpleThreadPool;
@@ -61,7 +62,7 @@ class QTZ385Test {
 
   @Test
   void testShutdownOrdering() throws SchedulerException, SQLException, InterruptedException, BrokenBarrierException {
-    JdbcQuartzTestUtilities.createDatabase("testShutdownOrdering");
+    JdbcQuartzTestUtilities.createDatabase("testShutdownOrdering", DatabaseType.DERBY);
     try {
       final CyclicBarrier barrier = new CyclicBarrier(2);
       final JobStoreTX realJobStore = new JobStoreTX();
@@ -131,7 +132,7 @@ public void jobToBeExecuted(JobExecutionContext context) {
         recovery.shutdown(true);
       }
     } finally {
-      JdbcQuartzTestUtilities.destroyDatabase("testShutdownOrdering");
+        JdbcQuartzTestUtilities.destroyDatabase("testShutdownOrdering", DatabaseType.DERBY);
     }
   }
 

diff --git a/quartz/src/test/java/org/quartz/core/RecoverJobsTest.java b/quartz/src/test/java/org/quartz/core/RecoverJobsTest.java
@@ -21,7 +21,7 @@
 import org.quartz.impl.DirectSchedulerFactory;
 import org.quartz.impl.jdbcjobstore.JdbcQuartzTestUtilities;
 import org.quartz.impl.jdbcjobstore.JobStoreTX;
-
+import org.quartz.impl.jdbcjobstore.JdbcQuartzTestUtilities.DatabaseType;
 import org.quartz.*;
 import org.quartz.listeners.JobListenerSupport;
 import org.quartz.simpl.SimpleThreadPool;
@@ -46,7 +46,7 @@ public class RecoverJobsTest {
     @Test
     void testRecoveringRepeatJobWhichIsFiredAndMisfiredAtTheSameTime() throws SchedulerException, SQLException, InterruptedException {
         String dsName = "recoverJobsTest";
-        JdbcQuartzTestUtilities.createDatabase(dsName);
+        JdbcQuartzTestUtilities.createDatabase(dsName, DatabaseType.DERBY);
         try {
             final JobStoreTX jobStore = new JobStoreTX();
             jobStore.setDataSource(dsName);
@@ -130,7 +130,7 @@ public void jobToBeExecuted(JobExecutionContext context) {
 
            assertTrue(isJobRecovered.get());
         } finally {
-            JdbcQuartzTestUtilities.destroyDatabase(dsName);
+            JdbcQuartzTestUtilities.destroyDatabase(dsName, DatabaseType.DERBY);
         }
     }
 

diff --git a/quartz/src/test/java/org/quartz/impl/jdbcjobstore/DeleteNonExistsJobTest.java b/quartz/src/test/java/org/quartz/impl/jdbcjobstore/DeleteNonExistsJobTest.java
@@ -16,14 +16,14 @@
  */
 package org.quartz.impl.jdbcjobstore;
 
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.quartz.*;
 import org.quartz.impl.DirectSchedulerFactory;
 import org.quartz.impl.SchedulerRepository;
+import org.quartz.impl.jdbcjobstore.JdbcQuartzTestUtilities.DatabaseType;
 import org.quartz.simpl.SimpleThreadPool;
 import org.quartz.utils.DBConnectionManager;
 import org.slf4j.Logger;
@@ -45,7 +45,7 @@ public class DeleteNonExistsJobTest {
 
     @BeforeAll
     public static void beforeClass() throws Exception {
-        JdbcQuartzTestUtilities.createDatabase(DB_NAME);
+        JdbcQuartzTestUtilities.createDatabase(DB_NAME, DatabaseType.DERBY);
     }
 
     @BeforeEach
@@ -55,9 +55,10 @@ public void beforeTest() throws Exception {
         jobStore.setDataSource(DB_NAME);
         jobStore.setTablePrefix("QRTZ_");
         jobStore.setInstanceId("AUTO");
-        DirectSchedulerFactory.getInstance().createScheduler(SCHEDULER_NAME, "AUTO", new SimpleThreadPool(4, Thread.NORM_PRIORITY), jobStore);
+        DirectSchedulerFactory.getInstance().createScheduler(SCHEDULER_NAME, "AUTO",
+                new SimpleThreadPool(4, Thread.NORM_PRIORITY), jobStore);
         scheduler = SchedulerRepository.getInstance().lookup(SCHEDULER_NAME);
-        //scheduler.start(); // Do not start scheduler to produce the defect case.
+        // scheduler.start(); // Do not start scheduler to produce the defect case.
     }
 
     private void resetDatabaseData() throws Exception {
@@ -97,8 +98,7 @@ void deleteJobDetailOnly() throws Exception {
     void deleteJobDetailWithTrigger() throws Exception {
         JobDetail jobDetail = JobBuilder.newJob(TestJob.class).withIdentity("testjob2").storeDurably().build();
         Trigger trigger = TriggerBuilder.newTrigger().withIdentity("testjob2")
-                .withSchedule(CronScheduleBuilder.cronSchedule("* * * * * ?"))
-                .build();
+                .withSchedule(CronScheduleBuilder.cronSchedule("* * * * * ?")).build();
         scheduler.scheduleJob(jobDetail, trigger);
         modifyStoredJobClassName();
 
@@ -109,8 +109,7 @@ void deleteJobDetailWithTrigger() throws Exception {
     void deleteTrigger() throws Exception {
         JobDetail jobDetail = JobBuilder.newJob(TestJob.class).withIdentity("testjob3").storeDurably().build();
         Trigger trigger = TriggerBuilder.newTrigger().withIdentity("testjob3")
-                .withSchedule(CronScheduleBuilder.cronSchedule("* * * * * ?"))
-                .build();
+                .withSchedule(CronScheduleBuilder.cronSchedule("* * * * * ?")).build();
         scheduler.scheduleJob(jobDetail, trigger);
         modifyStoredJobClassName();
 
@@ -121,8 +120,7 @@ void deleteTrigger() throws Exception {
     void replaceJobDetail() throws Exception {
         JobDetail jobDetail = JobBuilder.newJob(TestJob.class).withIdentity("testjob3").storeDurably().build();
         Trigger trigger = TriggerBuilder.newTrigger().withIdentity("testjob3")
-                .withSchedule(CronScheduleBuilder.cronSchedule("* * * * * ?"))
-                .build();
+                .withSchedule(CronScheduleBuilder.cronSchedule("* * * * * ?")).build();
         scheduler.scheduleJob(jobDetail, trigger);
         modifyStoredJobClassName();
 

diff --git a/quartz/src/test/java/org/quartz/impl/jdbcjobstore/JdbcJobStoreTest.java b/quartz/src/test/java/org/quartz/impl/jdbcjobstore/JdbcJobStoreTest.java
@@ -20,42 +20,50 @@
 import java.util.HashMap;
 
 import org.quartz.AbstractJobStoreTest;
+import org.quartz.impl.jdbcjobstore.JdbcQuartzTestUtilities.DatabaseType;
 import org.quartz.spi.JobStore;
 
 public class JdbcJobStoreTest extends AbstractJobStoreTest {
 
-	private HashMap<String, JobStoreSupport> stores = new HashMap<String, JobStoreSupport>();
-
-    void testNothing() {
-        // nothing
+    private HashMap<String, JobStoreSupport> stores = new HashMap<String, JobStoreSupport>();
+
+    protected DatabaseType getDatabaseType() {
+        return DatabaseType.DERBY;
+    }
+
+    private String name(String prefix) {
+        return prefix + "_" + getDatabaseType().name();
     }
 
     @Override
-    protected JobStore createJobStore(String name) {
+    protected JobStore createJobStore(String prefix) {
+        String name = name(prefix);
         try {
-            JdbcQuartzTestUtilities.createDatabase(name);
+            JdbcQuartzTestUtilities.createDatabase(name, getDatabaseType());
             JobStoreTX jdbcJobStore = new JobStoreTX();
             jdbcJobStore.setDataSource(name);
             jdbcJobStore.setTablePrefix("QRTZ_");
-            jdbcJobStore.setInstanceId("SINGLE_NODE_TEST");
+            jdbcJobStore.setInstanceId("SINGLE_NODE_TEST_" + getDatabaseType().name());
             jdbcJobStore.setInstanceName(name);
             jdbcJobStore.setUseDBLocks(true);
+            jdbcJobStore.setDriverDelegateClass(getDatabaseType().getDelegateClassName());
 
             stores.put(name, jdbcJobStore);
-            
+
             return jdbcJobStore;
-        } catch (SQLException e) {
+        } catch (Exception e) {
             throw new AssertionError(e);
         }
     }
 
     @Override
-    protected void destroyJobStore(String name) {
+    protected void destroyJobStore(String prefix) {
+        String name = name(prefix);
         try {
-        	JobStoreSupport jdbcJobStore = stores.remove(name);
-        	jdbcJobStore.shutdown();
-        	
-            JdbcQuartzTestUtilities.destroyDatabase(name);
+            JobStoreSupport jdbcJobStore = stores.remove(name);
+            jdbcJobStore.shutdown();
+
+            JdbcQuartzTestUtilities.destroyDatabase(name, getDatabaseType());
         } catch (SQLException e) {
             throw new AssertionError(e);
         }

diff --git a/quartz/src/test/java/org/quartz/impl/jdbcjobstore/JdbcQuartzMSSQLUtilities.java b/quartz/src/test/java/org/quartz/impl/jdbcjobstore/JdbcQuartzMSSQLUtilities.java