Skip to content
Snippets Groups Projects
Commit 979e1efd authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4713 OZG-4927 add missing vorgang order

parent 1e688a38
No related branches found
No related tags found
No related merge requests found
...@@ -32,6 +32,7 @@ public class StatusChangeHistoryBuilder extends ChangeHistoryBuilder<StatusChang ...@@ -32,6 +32,7 @@ public class StatusChangeHistoryBuilder extends ChangeHistoryBuilder<StatusChang
CommandOrder.VORGANG_BESCHEIDEN, CommandOrder.VORGANG_BESCHEIDEN,
CommandOrder.VORGANG_ABSCHLIESSEN, CommandOrder.VORGANG_ABSCHLIESSEN,
CommandOrder.VORGANG_ZUM_LOESCHEN_MARKIEREN, CommandOrder.VORGANG_ZUM_LOESCHEN_MARKIEREN,
CommandOrder.VORGANG_WIEDEREROEFFNEN,
CommandOrder.VORGANG_LOESCHEN, CommandOrder.VORGANG_LOESCHEN,
CommandOrder.VORGANG_ZURUECKSTELLEN); CommandOrder.VORGANG_ZURUECKSTELLEN);
......
...@@ -40,7 +40,8 @@ public class StatusChangeHistoryBuilderTest { ...@@ -40,7 +40,8 @@ public class StatusChangeHistoryBuilderTest {
class TestIsRelevant { class TestIsRelevant {
@EnumSource(mode = Mode.INCLUDE, names = { "VORGANG_ANNEHMEN", "VORGANG_VERWERFEN", "VORGANG_ZURUECKHOLEN", "VORGANG_BEARBEITEN", @EnumSource(mode = Mode.INCLUDE, names = { "VORGANG_ANNEHMEN", "VORGANG_VERWERFEN", "VORGANG_ZURUECKHOLEN", "VORGANG_BEARBEITEN",
"VORGANG_BESCHEIDEN", "VORGANG_ABSCHLIESSEN", "VORGANG_ZUM_LOESCHEN_MARKIEREN", "VORGANG_LOESCHEN", "VORGANG_ZURUECKSTELLEN" }) "VORGANG_BESCHEIDEN", "VORGANG_ABSCHLIESSEN", "VORGANG_ZUM_LOESCHEN_MARKIEREN", "VORGANG_LOESCHEN", "VORGANG_ZURUECKSTELLEN",
"VORGANG_WIEDEREROEFFNEN" })
@ParameterizedTest @ParameterizedTest
void shouldReturnTrue(CommandOrder order) { void shouldReturnTrue(CommandOrder order) {
var isStatusChangeCommand = builder.isRelevant(CommandTestFactory.createBuilder().order(order).build()); var isStatusChangeCommand = builder.isRelevant(CommandTestFactory.createBuilder().order(order).build());
...@@ -49,7 +50,8 @@ public class StatusChangeHistoryBuilderTest { ...@@ -49,7 +50,8 @@ public class StatusChangeHistoryBuilderTest {
} }
@EnumSource(mode = Mode.EXCLUDE, names = { "VORGANG_ANNEHMEN", "VORGANG_VERWERFEN", "VORGANG_ZURUECKHOLEN", "VORGANG_BEARBEITEN", @EnumSource(mode = Mode.EXCLUDE, names = { "VORGANG_ANNEHMEN", "VORGANG_VERWERFEN", "VORGANG_ZURUECKHOLEN", "VORGANG_BEARBEITEN",
"VORGANG_BESCHEIDEN", "VORGANG_ABSCHLIESSEN", "VORGANG_ZUM_LOESCHEN_MARKIEREN", "VORGANG_LOESCHEN", "VORGANG_ZURUECKSTELLEN" }) "VORGANG_BESCHEIDEN", "VORGANG_ABSCHLIESSEN", "VORGANG_ZUM_LOESCHEN_MARKIEREN", "VORGANG_LOESCHEN", "VORGANG_ZURUECKSTELLEN",
"VORGANG_WIEDEREROEFFNEN" })
@ParameterizedTest @ParameterizedTest
void shouldReturnFalse(CommandOrder order) { void shouldReturnFalse(CommandOrder order) {
var isStatusChangeCommand = builder.isRelevant(CommandTestFactory.createBuilder().order(order).build()); var isStatusChangeCommand = builder.isRelevant(CommandTestFactory.createBuilder().order(order).build());
...@@ -64,7 +66,8 @@ public class StatusChangeHistoryBuilderTest { ...@@ -64,7 +66,8 @@ public class StatusChangeHistoryBuilderTest {
private static final String EXPECTED_STATUS_BEFORE_CHANGE = LoremIpsum.getInstance().getWords(2); private static final String EXPECTED_STATUS_BEFORE_CHANGE = LoremIpsum.getInstance().getWords(2);
private static final String EXPECTED_STATUS_AFTER_CHANGE = LoremIpsum.getInstance().getWords(2); private static final String EXPECTED_STATUS_AFTER_CHANGE = LoremIpsum.getInstance().getWords(2);
private final CommandWithPrevious commandWithPrevious = CommandWithPreviousTestFactory.createBuilder().command(command).previous(previousCommand).build(); private final CommandWithPrevious commandWithPrevious = CommandWithPreviousTestFactory.createBuilder().command(command)
.previous(previousCommand).build();
@BeforeEach @BeforeEach
void init() { void init() {
...@@ -101,8 +104,10 @@ public class StatusChangeHistoryBuilderTest { ...@@ -101,8 +104,10 @@ public class StatusChangeHistoryBuilderTest {
@Nested @Nested
class TestGetStatusBeforeChange { class TestGetStatusBeforeChange {
private final CommandWithPrevious commandWithoutPrevious = CommandWithPreviousTestFactory.createBuilder().command(previousCommand).previous(null).build(); private final CommandWithPrevious commandWithoutPrevious = CommandWithPreviousTestFactory.createBuilder().command(previousCommand)
private final CommandWithPrevious commandWithPrevious = CommandWithPreviousTestFactory.createBuilder().command(command).previous(previousCommand).build(); .previous(null).build();
private final CommandWithPrevious commandWithPrevious = CommandWithPreviousTestFactory.createBuilder().command(command)
.previous(previousCommand).build();
@Test @Test
void shouldReturnStatusBeforeChange() { void shouldReturnStatusBeforeChange() {
...@@ -125,7 +130,8 @@ public class StatusChangeHistoryBuilderTest { ...@@ -125,7 +130,8 @@ public class StatusChangeHistoryBuilderTest {
@Nested @Nested
class TestGetStatusAfterChange { class TestGetStatusAfterChange {
private final CommandWithPrevious commandWithPrevious = CommandWithPreviousTestFactory.createBuilder().command(command).previous(previousCommand).build(); private final CommandWithPrevious commandWithPrevious = CommandWithPreviousTestFactory.createBuilder().command(command)
.previous(previousCommand).build();
@Test @Test
void shouldReturnStatusAfterChange() { void shouldReturnStatusAfterChange() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment