github/quartz-manager
1
0
Fork 0
mirror of https://github.com/fabioformosa/quartz-manager.git synced 2026-05-14 22:00:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

#62 fixed the job class name in the TriggerFiredBundleDTO

Browse Source
This commit is contained in:
Fabio Formosa
2022-12-03 16:21:13 +01:00
parent 6348bac11a
commit 98b5d0e37a
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/exceptions/TriggerNotFoundException.java
View File

@@ -1,8 +1,5 @@
package it.fabioformosa.quartzmanager.api.exceptions; package it.fabioformosa.quartzmanager.api.exceptions;
import lombok.ToString;
@ToString
public class TriggerNotFoundException extends Exception { public class TriggerNotFoundException extends Exception {
public TriggerNotFoundException(String name) { public TriggerNotFoundException(String name) {
super("Trigger with name " + name + " not found!"); super("Trigger with name " + name + " not found!");

2
quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebSocketProgressNotifier.java
View File

@@ -43,7 +43,7 @@ public class WebSocketProgressNotifier implements WebhookSender<TriggerFiredBund
JobDetail jobDetail = jobExecutionContext.getJobDetail(); JobDetail jobDetail = jobExecutionContext.getJobDetail();
triggerFiredBundleDTO.setJobKey(jobDetail.getKey().getName()); triggerFiredBundleDTO.setJobKey(jobDetail.getKey().getName());
triggerFiredBundleDTO.setJobClass(trigger.getClass().getSimpleName()); triggerFiredBundleDTO.setJobClass(jobDetail.getJobClass().getName());
return triggerFiredBundleDTO; return triggerFiredBundleDTO;
} }

18
quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/jobs/SampleJobTest.java
View File

@@ -12,7 +12,7 @@ import org.mockito.Mockito;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.quartz.*; import org.quartz.*;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat;
class SampleJobTest { class SampleJobTest {
@@ -47,8 +47,19 @@ class SampleJobTest {
Mockito.when(jobExecutionContext.getJobDetail()).thenReturn(jobDetail); Mockito.when(jobExecutionContext.getJobDetail()).thenReturn(jobDetail);
sampleJob.execute(jobExecutionContext); sampleJob.execute(jobExecutionContext);
Mockito.verify(webSocketLogsNotifier).send(any(LogRecord.class)); Mockito.verify(webSocketLogsNotifier).send(argThat(actualLogRecord -> {
Mockito.verify(webSocketProgressNotifier).send(any(TriggerFiredBundleDTO.class)); Assertions.assertThat(actualLogRecord.getMessage()).isEqualTo("Hello!");
Assertions.assertThat(actualLogRecord.getType()).isEqualTo(LogRecord.LogType.INFO);
Assertions.assertThat(actualLogRecord.getDate()).isNotNull();
Assertions.assertThat(actualLogRecord.getThreadName()).isNotNull();
return true;
}));
Mockito.verify(webSocketProgressNotifier).send(argThat(triggerFiredBundleDTO -> {
Assertions.assertThat(triggerFiredBundleDTO.getJobKey()).isEqualTo("test-job");
Assertions.assertThat(triggerFiredBundleDTO.getRepeatCount()).isEqualTo(6);
Assertions.assertThat(triggerFiredBundleDTO.getJobClass()).isEqualTo(SampleJob.class.getName());
return true;
}));
} }
@Test @Test
@@ -57,6 +68,7 @@ class SampleJobTest {
LogRecord logRecord = sampleJob.doIt(jobExecutionContext); LogRecord logRecord = sampleJob.doIt(jobExecutionContext);
Assertions.assertThat(logRecord.getMessage()).isEqualTo("Hello!"); Assertions.assertThat(logRecord.getMessage()).isEqualTo("Hello!");
Assertions.assertThat(logRecord.getType()).isEqualTo(LogRecord.LogType.INFO); Assertions.assertThat(logRecord.getType()).isEqualTo(LogRecord.LogType.INFO);
Assertions.assertThat(logRecord.getDate()).isNotNull();
} }
} }