diff --git a/pom.xml b/pom.xml
index 9578b967f1cc88bf067d6cd54de5524ec213f2b7..119150f473325a43227941c18f8f792a6e3c7c09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,13 @@
<artifactId>pluto-utils</artifactId>
<version>${pluto.version}</version>
</dependency>
+ <dependency>
+ <groupId>de.itvsh.ozg.pluto</groupId>
+ <artifactId>pluto-command</artifactId>
+ <version>${pluto.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>de.itvsh.ozg.pluto</groupId>
<artifactId>pluto-command</artifactId>
diff --git a/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java b/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
index adaf932520d71d540caf54dc31fcedf655e06778..a4e761b5b7c5afb9d260bd9a471dcd8eef6dd65e 100644
--- a/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
+++ b/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
@@ -47,7 +47,7 @@ class ProcessorEventListener {
.doOnError(cause -> handleError(cause, event.getSource())).onErrorComplete()
.map(result -> addVorgangId(result, event.getSource()))
.subscribe(resultService::processResult));
- } catch (RuntimeException e) { //TODO Test
+ } catch (RuntimeException e) {
handleError(e, event.getSource());
}
}
@@ -89,7 +89,7 @@ class ProcessorEventListener {
}
void publishCommandProcessedEvent(Command command) {
- publisher.publishEvent(new CommandProcessedEvent(command));
+ publisher.publishEvent(new VorgangProcessedEvent(command));
}
void publishCommandFailedEvent(Throwable e, String commandId) {
diff --git a/src/main/java/de/ozgcloud/processor/processor/CommandProcessedEvent.java b/src/main/java/de/ozgcloud/processor/processor/VorgangProcessedEvent.java
similarity index 66%
rename from src/main/java/de/ozgcloud/processor/processor/CommandProcessedEvent.java
rename to src/main/java/de/ozgcloud/processor/processor/VorgangProcessedEvent.java
index 1a6a2bd49a9cca3729dc29c32c31cfa6418de164..55427c7cbeb6d99a01d95826aadd37f64cda624e 100644
--- a/src/main/java/de/ozgcloud/processor/processor/CommandProcessedEvent.java
+++ b/src/main/java/de/ozgcloud/processor/processor/VorgangProcessedEvent.java
@@ -3,11 +3,11 @@ package de.ozgcloud.processor.processor;
import de.itvsh.ozg.pluto.command.Command;
import de.itvsh.ozg.pluto.command.CommandExecutedEvent;
-class CommandProcessedEvent extends CommandExecutedEvent {
+class VorgangProcessedEvent extends CommandExecutedEvent {
private static final long serialVersionUID = 1L;
- public CommandProcessedEvent(Command command) {
+ public VorgangProcessedEvent(Command command) {
super(command);
}
}
diff --git a/src/test/java/de/ozgcloud/processor/command/CommandTestFactory.java b/src/test/java/de/ozgcloud/processor/command/CommandTestFactory.java
deleted file mode 100644
index 094ae02779aa568a18066fea966b4108164d3073..0000000000000000000000000000000000000000
--- a/src/test/java/de/ozgcloud/processor/command/CommandTestFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.ozgcloud.processor.command;
-
-import de.ozgcloud.processor.vorgang.VorgangTestFactory;
-
-public class CommandTestFactory {
-
- public static final String ID = "42";
-
- public static TestCommand create() {
- return createBuilder().build();
- }
-
- public static TestCommand.TestCommandBuilder createBuilder() {
- return TestCommand.builder()
- .id(ID)
- .vorgangId(VorgangTestFactory.ID.toString());
- }
-}
\ No newline at end of file
diff --git a/src/test/java/de/ozgcloud/processor/command/TestCommand.java b/src/test/java/de/ozgcloud/processor/command/TestCommand.java
deleted file mode 100644
index 4c97701de6fe75ac5f8a38a2126cbe317e656733..0000000000000000000000000000000000000000
--- a/src/test/java/de/ozgcloud/processor/command/TestCommand.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package de.ozgcloud.processor.command;
-
-import java.time.ZonedDateTime;
-import java.util.Map;
-
-import de.itvsh.ozg.pluto.command.CommandStatus;
-import lombok.Builder;
-import lombok.Getter;
-
-@Getter
-@Builder
-public class TestCommand implements de.itvsh.ozg.pluto.command.Command {
-
- private String id;
- private String vorgangId;
- private String relationId;
- private Long relationVersion;
-
- private String order;
-
- private ZonedDateTime createdAt;
- private ZonedDateTime finishedAt;
- private String createdBy;
- private String createdByName;
-
- private CommandStatus status;
-
- private Map<String, Object> bodyObject;
- private Map<String, String> body;
-
- private String errorMessage;
-}
diff --git a/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
index 2534b6e80ae3317e6c4ef24b558eea507f614688..16e8239270f4f03bcb54c32f801e4cbd21e417ef 100644
--- a/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
+++ b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
@@ -12,9 +12,9 @@ import org.springframework.context.ApplicationEventPublisher;
import de.itvsh.kop.common.test.ITCase;
import de.itvsh.ozg.pluto.command.CommandCreatedEvent;
+import de.itvsh.ozg.pluto.command.CommandTestFactory;
import de.itvsh.ozg.pluto.command.VorgangCreatedEvent;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
-import de.ozgcloud.processor.command.CommandTestFactory;
import de.ozgcloud.processor.result.ResultService;
import de.ozgcloud.processor.vorgang.VorgangId;
import de.ozgcloud.processor.vorgang.VorgangService;
@@ -54,7 +54,7 @@ class ProcessorEventListenerITCase {
publisher.publishEvent(new CommandCreatedEvent(command));
- verify(service).getVorgang(VorgangId.from(OzgCloudVorgangTestFactory.ID.toString()));
+ verify(service).getVorgang(VorgangId.from(CommandTestFactory.VORGANG_ID));
}
}
}
diff --git a/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
index e50d8ea938a85485743ef4257af25f7b56135c8a..f67fee6c8dce8d686695415d336cb87be5b57e4c 100644
--- a/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
+++ b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
@@ -24,9 +24,9 @@ import org.springframework.context.ApplicationEventPublisher;
import de.itvsh.ozg.pluto.command.Command;
import de.itvsh.ozg.pluto.command.CommandCreatedEvent;
import de.itvsh.ozg.pluto.command.CommandFailedEvent;
+import de.itvsh.ozg.pluto.command.CommandTestFactory;
import de.itvsh.ozg.pluto.command.VorgangCreatedEvent;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
-import de.ozgcloud.processor.command.CommandTestFactory;
import de.ozgcloud.processor.result.ProcessorTechnicalException;
import de.ozgcloud.processor.result.ResultService;
import de.ozgcloud.processor.vorgang.Vorgang;
@@ -127,7 +127,7 @@ class ProcessorEventListenerTest {
@Captor
private ArgumentCaptor<CommandFailedEvent> commandFailedEventCaptor;
@Captor
- private ArgumentCaptor<CommandProcessedEvent> commandSuccessEventCaptor;
+ private ArgumentCaptor<VorgangProcessedEvent> commandSuccessEventCaptor;
private final Vorgang vorgang = VorgangTestFactory.create();
private final Collection<String> processorNames = List.of("dummy1", "dummy2");
@@ -151,7 +151,7 @@ class ProcessorEventListenerTest {
void shouldGetVorgang() {
vorgangEventListener.onCommandExecuteProcessor(event);
- verify(vorgangService).getVorgang(VorgangTestFactory.ID);
+ verify(vorgangService).getVorgang(VorgangId.from(CommandTestFactory.VORGANG_ID));
}
@Test
@@ -165,7 +165,7 @@ class ProcessorEventListenerTest {
void shouldProcessResult() {
vorgangEventListener.onCommandExecuteProcessor(event);
- verify(vorgangEventListener).processResult(any(), eq(VorgangTestFactory.ID.toString()));
+ verify(vorgangEventListener).processResult(any(), eq(CommandTestFactory.VORGANG_ID));
}
@Test
@@ -190,7 +190,7 @@ class ProcessorEventListenerTest {
vorgangEventListener.onCommandExecuteProcessor(event);
verify(publisher).publishEvent(commandSuccessEventCaptor.capture());
- assertThat(commandSuccessEventCaptor.getValue().getClass()).isEqualTo(CommandProcessedEvent.class);
+ assertThat(commandSuccessEventCaptor.getValue().getClass()).isEqualTo(VorgangProcessedEvent.class);
}
@Test
@@ -230,7 +230,7 @@ class ProcessorEventListenerTest {
void shouldProcessError() {
vorgangEventListener.onCommandExecuteProcessor(event);
- verify(resultService).processError(any(), eq(VorgangTestFactory.ID.toString()));
+ verify(resultService).processError(any(), eq(CommandTestFactory.VORGANG_ID));
}
@Test
@@ -261,7 +261,7 @@ class ProcessorEventListenerTest {
void shouldPublishCommandFailedEvent() {
vorgangEventListener.onCommandExecuteProcessor(event);
- verify(resultService).processError(any(), eq(VorgangTestFactory.ID.toString()));
+ verify(resultService).processError(any(), eq(CommandTestFactory.VORGANG_ID));
}
}