Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend into SI-668-Automatischer-externer-Status
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/DecideFailureInfoCanceledTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/DecideFailureInfoCanceledTest.java index 31468a7..1b6102b 100644 --- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/DecideFailureInfoCanceledTest.java +++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/DecideFailureInfoCanceledTest.java
@@ -51,7 +51,7 @@ @Test public void shouldCall_DecideFailureInfoCanceled_Result_Canceld() { - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); FailureInformationDto fiDto = MockDataHelper.mockFailureInformationDto(); fiDto.setStatusInternId(UUID.randomUUID()); @@ -78,7 +78,7 @@ @Test public void shouldCall_DecideFailureInfoCanceled_Result_Qualfied() { - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); FailureInformationDto fiDto = MockDataHelper.mockFailureInformationDto(); fiDto.setStatusInternId(UUID.randomUUID());
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/DecideFailureInfoPlannedTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/DecideFailureInfoPlannedTest.java index 6de2a08..a44adeb 100644 --- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/DecideFailureInfoPlannedTest.java +++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/DecideFailureInfoPlannedTest.java
@@ -47,7 +47,7 @@ @Test public void shouldcall_DecideFailureInfoPlanned_Result_Created() { - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); refStatus.setId(GfiProcessState.NEW.getStatusValue()); FailureInformationDto fiDto = MockDataHelper.mockFailureInformationDto();
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/DecideFailureInfoUpdatedTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/DecideFailureInfoUpdatedTest.java index edecd18..38b8945 100644 --- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/DecideFailureInfoUpdatedTest.java +++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/DecideFailureInfoUpdatedTest.java
@@ -50,7 +50,7 @@ @Test public void shouldCall_DecideFailureInfoUpdated_Result_Updated() { - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); refStatus.setId(GfiProcessState.QUALIFIED.getStatusValue()); refStatus.setStatus("qualified"); @@ -84,7 +84,7 @@ @Test public void shouldCall_DecideFailureInfoUpdated_Result_Completed() { - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); refStatus.setId(GfiProcessState.QUALIFIED.getStatusValue()); refStatus.setStatus("qualified");
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGridTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGridTest.java index 9c46c39..2ab8eda 100644 --- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGridTest.java +++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGridTest.java
@@ -83,7 +83,7 @@ public void shouldEndInQualifyMessageWhenStoredWithCreatedFromDBStateNew() { FailureInformationDto dtoToSave = MockDataHelper.mockFailureInformationDto(); TblFailureInformation failureFromDB = MockDataHelper.mockTblFailureInformation(); - RefStatus refStatusFromDB = MockDataHelper.mockRefStatus(); + RefStatus refStatusFromDB = MockDataHelper.mockRefStatusCreated(); refStatusFromDB.setId(GfiProcessState.NEW.getStatusValue()); when( failureInformationRepository.findByUuid(eq(dtoToSave.getUuid()))).thenReturn(Optional.of(failureFromDB)); @@ -101,7 +101,7 @@ public void shouldEndInQualifyMessageWhenStoredWithCreatedFromDBStatePlanned() { FailureInformationDto dtoToSave = MockDataHelper.mockFailureInformationDto(); TblFailureInformation failureFromDB = MockDataHelper.mockTblFailureInformation(); - RefStatus refStatusFromDB = MockDataHelper.mockRefStatus(); + RefStatus refStatusFromDB = MockDataHelper.mockRefStatusCreated(); refStatusFromDB.setId(GfiProcessState.PLANNED.getStatusValue()); when( failureInformationRepository.findByUuid(eq(dtoToSave.getUuid()))).thenReturn(Optional.of(failureFromDB)); @@ -118,7 +118,7 @@ public void shouldCallStoreOnlyOnceWhenSavingWithNewCreated() { FailureInformationDto dtoToSave = MockDataHelper.mockFailureInformationDto(); TblFailureInformation failureFromDB = MockDataHelper.mockTblFailureInformation(); - RefStatus refStatusFromDB = MockDataHelper.mockRefStatus(); + RefStatus refStatusFromDB = MockDataHelper.mockRefStatusCreated(); refStatusFromDB.setId(GfiProcessState.NEW.getStatusValue()); when( failureInformationRepository.findByUuid(eq(dtoToSave.getUuid()))).thenReturn(Optional.of(failureFromDB));
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/StorePublishStatusTaskTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/StorePublishStatusTaskTest.java index debb85a..5e547bf 100644 --- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/StorePublishStatusTaskTest.java +++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/StorePublishStatusTaskTest.java
@@ -70,7 +70,7 @@ @Test public void shouldSetCorrectStatusOnLeaveStep() throws ProcessException { - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); FailureInformationDto fiDto = MockDataHelper.mockFailureInformationDto(); fiDto.setStatusInternId(UUID.randomUUID());
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationReminderMailSentServiceTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationReminderMailSentServiceTest.java index 845c29a..348f935 100644 --- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationReminderMailSentServiceTest.java +++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationReminderMailSentServiceTest.java
@@ -56,7 +56,7 @@ @Test public void shouldNotDisplayReminder() { Page<TblFailureInformation> mockfailurePage = MockDataHelper.mockTblFailureInformationPage(); - RefStatus mockRefStatus = MockDataHelper.mockRefStatus(); + RefStatus mockRefStatus = MockDataHelper.mockRefStatusCreated(); when(failureInformationRepository.findByTblFailureInformationCondensedIdIsNullOrderByFailureBeginDescIdAsc(any(Pageable.class))).thenReturn(mockfailurePage); when(statusRepository.findById(any(Long.class))).thenReturn(Optional.of(mockRefStatus)); @@ -69,7 +69,7 @@ @Test public void shouldDisplayReminder() { Page<TblFailureInformation> mockfailurePage = MockDataHelper.mockTblFailureInformationPage(); - RefStatus mockRefStatus = MockDataHelper.mockRefStatus(); + RefStatus mockRefStatus = MockDataHelper.mockRefStatusCreated(); Date reminderDate = Date.from( Instant.now().plus(Duration.ofHours(2))); mockfailurePage.getContent().stream().findFirst().get().setFailureEndPlanned(reminderDate);
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java index 0755962..5c27b86 100644 --- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java +++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java
@@ -14,8 +14,10 @@ */ package org.eclipse.openk.gridfailureinformation.service; +import lombok.extern.log4j.Log4j2; import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessState; import org.eclipse.openk.gridfailureinformation.config.TestConfiguration; +import org.eclipse.openk.gridfailureinformation.constants.Constants; import org.eclipse.openk.gridfailureinformation.exceptions.BadRequestException; import org.eclipse.openk.gridfailureinformation.exceptions.NotFoundException; import org.eclipse.openk.gridfailureinformation.exceptions.OperationDeniedException; @@ -36,6 +38,8 @@ import org.springframework.test.context.ContextConfiguration; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.Month; import java.util.*; import static org.junit.jupiter.api.Assertions.*; @@ -44,10 +48,9 @@ import static org.mockito.Mockito.when; //import java.sql.Date; - +@Log4j2 @DataJpaTest @ContextConfiguration(classes = {TestConfiguration.class}) - public class FailureInformationServiceTest { @Qualifier("myFailureInformationService") @Autowired @@ -75,11 +78,11 @@ private DistributionGroupRepository distributionGroupRepository; @MockBean private FailureInformationPublicationChannelRepository failureInformationPublicationChannelRepository; - + @Test public void shouldFindFailureInformations() { Page<TblFailureInformation> mockfailurePage = MockDataHelper.mockTblFailureInformationPage(); - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); when(failureInformationRepository.findByTblFailureInformationCondensedIdIsNullOrderByFailureBeginDescIdAsc(any(Pageable.class))).thenReturn(mockfailurePage); when(statusRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of(refStatus)); @@ -94,7 +97,7 @@ TblFailureInformation mockFailure = MockDataHelper.mockTblFailureInformation(); TblStation tblStation = MockDataHelper.mockTblStation(); List<TblAddress> addressList = MockDataHelper.mockTblAddressList(); - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); when(statusRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of(refStatus)); when(failureInformationRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of(mockFailure)); @@ -119,7 +122,7 @@ FailureInformationDto fiDto = MockDataHelper.mockFailureInformationDto(); TblFailureInformation fiTbl = MockDataHelper.mockTblFailureInformation(); RefFailureClassification refFailureClassification = MockDataHelper.mockRefFailureClassification(); - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); RefBranch refBranch = MockDataHelper.mockRefBranch(); RefRadius refRadius = MockDataHelper.mockRefRadius(); RefExpectedReason refExpectedReason = MockDataHelper.mockRefExpectedReason(); @@ -165,10 +168,8 @@ assertEquals(fiTbl.getLatitude(), savedDto.getLatitude()); assertEquals(fiTbl.getRefFailureClassification().getUuid(), savedDto.getFailureClassificationId()); assertEquals(fiTbl.getRefFailureClassification().getClassification(), savedDto.getFailureClassification()); - assertEquals(fiTbl.getRefStatusIntern().getUuid(), savedDto.getStatusInternId()); assertEquals(fiTbl.getRefStatusIntern().getStatus(), savedDto.getStatusIntern()); -// assertEquals(fiTbl.getRefStatusExtern().getUuid(), savedDto.getStatusExternId()); -// assertEquals(fiTbl.getRefStatusExtern().getStatus(), savedDto.getStatusExtern()); + assertEquals(fiTbl.getRefStatusIntern().getStatus(), savedDto.getStatusIntern()); assertEquals(fiTbl.getRefBranch().getUuid(), savedDto.getBranchId()); assertEquals(fiTbl.getRefBranch().getName(), savedDto.getBranch()); assertEquals(fiTbl.getRefBranch().getColorCode(), savedDto.getBranchColorCode()); @@ -179,7 +180,7 @@ @Test public void shouldUpdateFailureInformation_emptyReferences() { - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); refStatus.setId(GfiProcessState.PLANNED.getStatusValue()); TblStation tblStation = MockDataHelper.mockTblStation(); @@ -301,7 +302,7 @@ public void shouldNotStoreFailureInformation_Exception_FailureInformationNotFound() { FailureInformationDto fiDto = MockDataHelper.mockFailureInformationDto(); RefFailureClassification refFailureClassification = MockDataHelper.mockRefFailureClassification(); - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); RefBranch refBranch = MockDataHelper.mockRefBranch(); //failureInformation cannot be found @@ -326,7 +327,7 @@ FailureInformationDto fiDto = MockDataHelper.mockFailureInformationDto(); TblFailureInformation fiTbl = MockDataHelper.mockTblFailureInformation(); RefFailureClassification refFailureClassification = MockDataHelper.mockRefFailureClassification(); - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); RefBranch refBranch = MockDataHelper.mockRefBranch(); @@ -351,7 +352,7 @@ FailureInformationDto fiDto = MockDataHelper.mockFailureInformationDto(); TblFailureInformation fiTbl = MockDataHelper.mockTblFailureInformation(); RefFailureClassification refFailureClassification = MockDataHelper.mockRefFailureClassification(); - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); RefBranch refBranch = MockDataHelper.mockRefBranch(); @@ -376,7 +377,7 @@ FailureInformationDto fiDto = MockDataHelper.mockFailureInformationDto(); TblFailureInformation fiTbl = MockDataHelper.mockTblFailureInformation(); RefFailureClassification refFailureClassification = MockDataHelper.mockRefFailureClassification(); - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); RefBranch refBranch = MockDataHelper.mockRefBranch(); when(failureInformationRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of(fiTbl)); @@ -400,7 +401,7 @@ FailureInformationDto fiDto = MockDataHelper.mockFailureInformationDto(); TblFailureInformation fiTbl = MockDataHelper.mockTblFailureInformation(); RefFailureClassification refFailureClassification = MockDataHelper.mockRefFailureClassification(); - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); RefBranch refBranch = MockDataHelper.mockRefBranch(); when(failureInformationRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of(fiTbl)); @@ -425,7 +426,7 @@ TblFailureInformation fiTbl = MockDataHelper.mockTblFailureInformation(); RefFailureClassification refFailureClassification = MockDataHelper.mockRefFailureClassification(); RefRadius refRadius = MockDataHelper.mockRefRadius(); - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); RefBranch refBranch = MockDataHelper.mockRefBranch(); RefExpectedReason refExpectedReason = MockDataHelper.mockRefExpectedReason(); @@ -454,7 +455,7 @@ TblFailureInformation fiTbl = MockDataHelper.mockTblFailureInformation(); RefFailureClassification refFailureClassification = MockDataHelper.mockRefFailureClassification(); RefRadius refRadius = MockDataHelper.mockRefRadius(); - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); RefBranch refBranch = MockDataHelper.mockRefBranch(); TblStation tblStation = MockDataHelper.mockTblStation(); List<TblAddress> addressList = MockDataHelper.mockTblAddressList(); @@ -486,7 +487,7 @@ FailureInformationDto fiDto = MockDataHelper.mockFailureInformationDto(); TblFailureInformation fiTbl = MockDataHelper.mockTblFailureInformation(); RefFailureClassification refFailureClassification = MockDataHelper.mockRefFailureClassification(); - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); RefBranch refBranch = MockDataHelper.mockRefBranch(); RefRadius refRadius = MockDataHelper.mockRefRadius(); RefExpectedReason refExpectedReason = MockDataHelper.mockRefExpectedReason(); @@ -575,7 +576,7 @@ listFailureInfos.add(tblFailureInformation2); listFailureInfos.add(tblFailureInformation3); - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); when(failureInformationRepository.findByUuidIn(any(List.class))).thenReturn(listFailureInfos); when(statusRepository.findById(anyLong())).thenReturn(Optional.of(refStatus)); @@ -637,7 +638,7 @@ listFailureInfos.add(tblFailureInformation3); //different status - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); RefStatus refStatus2 = MockDataHelper.mockRefStatus2(); when(statusRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of(refStatus)); @@ -669,7 +670,7 @@ @Test public void shouldReturnSubordinateFailureInfos(){ - RefStatus refStatus = MockDataHelper.mockRefStatus(); + RefStatus refStatus = MockDataHelper.mockRefStatusCreated(); when(statusRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of(refStatus)); List<TblFailureInformation> fiMockList = MockDataHelper.mockTblFailureInformationList(); @@ -695,8 +696,8 @@ List<TblFailureInformation> subordinatedFiList = MockDataHelper.mockTblFailureInformationList(); when(failureInformationRepository.findByUuidIn(anyList())).thenReturn(subordinatedFiList); - when(statusRepository.findById(anyLong())).thenReturn(Optional.of(MockDataHelper.mockRefStatus())); - when(statusRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of(MockDataHelper.mockRefStatus())); + when(statusRepository.findById(anyLong())).thenReturn(Optional.of(MockDataHelper.mockRefStatusCreated())); + when(statusRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of(MockDataHelper.mockRefStatusCreated())); when(failureInformationRepository.save(any(TblFailureInformation.class))) .then((Answer<TblFailureInformation>) invocation -> {
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/support/MockDataHelper.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/support/MockDataHelper.java index 6a753ba..bb59575 100644 --- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/support/MockDataHelper.java +++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/support/MockDataHelper.java
@@ -92,9 +92,6 @@ dto.setStatusInternId(UUID.randomUUID()); dto.setStatusIntern("NEW"); -// dto.setStatusExternId(UUID.randomUUID()); -// dto.setStatusExtern("CLOSED"); - dto.setBranchId(UUID.randomUUID()); dto.setBranch("G"); dto.setBranchColorCode("#fdea64"); @@ -155,13 +152,10 @@ obj.setModDate(new java.util.Date(Date.valueOf("2020-05-23").getTime())); obj.setModUser("schlonzh"); - obj.setRefStatusIntern(mockRefStatus()); -// obj.setRefStatusExtern(mockRefStatus()); + obj.setRefStatusIntern(mockRefStatusCreated()); obj.setRefFailureClassification(mockRefFailureClassification()); obj.setRefBranch(mockRefBranch()); - obj.setRefStatusIntern(mockRefStatus()); - obj.setDistributionGroups(mockDistributionGroupList()); obj.setStations(mockTblStationList().stream().collect(Collectors.toSet())); @@ -218,7 +212,7 @@ obj.setRefFailureClassification(mockRefFailureClassification()); obj.setRefBranch(mockRefBranch()); - obj.setRefStatusIntern(mockRefStatus()); + obj.setRefStatusIntern(mockRefStatusCreated()); obj.setDistributionGroups(mockDistributionGroupList()); obj.setStations(mockTblStationList().stream().collect(Collectors.toSet())); return obj; @@ -385,15 +379,69 @@ return statusDtoList; } - public static RefStatus mockRefStatus() { + public static RefStatus mockRefStatusNew() { RefStatus refStatus = new RefStatus(); - refStatus.setUuid(UUID.fromString("acabc8f6-2cf3-485a-a4f8-68d178c7df45")); + refStatus.setUuid(UUID.randomUUID()); + refStatus.setId(GfiProcessState.NEW.getStatusValue()); + refStatus.setStatus("neu"); + + return refStatus; + } + + public static RefStatus mockRefStatusPlanned() { + RefStatus refStatus = new RefStatus(); + refStatus.setUuid(UUID.randomUUID()); + refStatus.setId(GfiProcessState.PLANNED.getStatusValue()); + refStatus.setStatus("geplant"); + + return refStatus; + } + + public static RefStatus mockRefStatusCreated() { + RefStatus refStatus = new RefStatus(); + refStatus.setUuid(UUID.randomUUID()); refStatus.setId(GfiProcessState.CREATED.getStatusValue()); refStatus.setStatus("angelegt"); return refStatus; } + public static RefStatus mockRefStatusCANCELED() { + RefStatus refStatus = new RefStatus(); + refStatus.setUuid(UUID.randomUUID()); + refStatus.setId(GfiProcessState.CANCELED.getStatusValue()); + refStatus.setStatus("storniert"); + + return refStatus; + } + + public static RefStatus mockRefStatusQUALIFIED() { + RefStatus refStatus = new RefStatus(); + refStatus.setUuid(UUID.randomUUID()); + refStatus.setId(GfiProcessState.QUALIFIED.getStatusValue()); + refStatus.setStatus("qualifiziert"); + + return refStatus; + } + + public static RefStatus mockRefStatusUPDATED() { + RefStatus refStatus = new RefStatus(); + refStatus.setUuid(UUID.randomUUID()); + refStatus.setId(GfiProcessState.UPDATED.getStatusValue()); + refStatus.setStatus("aktualisiert"); + + return refStatus; + } + + public static RefStatus mockRefStatusCOMPLETED() { + RefStatus refStatus = new RefStatus(); + refStatus.setUuid(UUID.randomUUID()); + refStatus.setId(GfiProcessState.COMPLETED.getStatusValue()); + refStatus.setStatus("abgeschlossen"); + + return refStatus; + } + public static RefStatus mockRefStatus2() { RefStatus refStatus = new RefStatus(); refStatus.setUuid(UUID.fromString("4a7c2640-74ae-11ea-bc55-0242ac130003")); @@ -405,7 +453,7 @@ public static List<RefStatus> mockRefStatusList() { List<RefStatus> refStatusList = new ArrayList<>(); - RefStatus refStatus1 = mockRefStatus(); + RefStatus refStatus1 = mockRefStatusCreated(); RefStatus refStatus2 = new RefStatus(); refStatus2.setUuid(UUID.fromString("113814c2-594e-11ea-8e2d-0242ac130003")); refStatus2.setStatus("geschlossen"); @@ -445,8 +493,7 @@ obj.setModDate(new java.util.Date(Date.valueOf("2020-05-23").getTime())); obj.setModUser("schlonzh"); - obj.setRefStatusIntern(mockRefStatus()); - //obj.setRefStatusExtern(mockRefStatus()); + obj.setRefStatusIntern(mockRefStatusCreated()); obj.setRefFailureClassification(mockRefFailureClassification()); obj.setRefBranch(mockRefBranch()); @@ -481,8 +528,7 @@ obj.setModDate(new java.util.Date(Date.valueOf("2020-05-23").getTime())); obj.setModUser("Gansg"); - obj.setRefStatusIntern(mockRefStatus()); - //obj.setRefStatusExtern(mockRefStatus()); + obj.setRefStatusIntern(mockRefStatusCreated()); obj.setRefFailureClassification(mockRefFailureClassification()); obj.setRefBranch(mockRefBranch());