SI-720 Natural Sortorder / Fix RabbitConnection while unittesting
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/FailureInformationRepository.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/FailureInformationRepository.java index a336b87..a18eede 100644 --- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/FailureInformationRepository.java +++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/FailureInformationRepository.java
@@ -29,9 +29,8 @@ @Repository public interface FailureInformationRepository extends PagingAndSortingRepository<TblFailureInformation, Long > { + Page<TblFailureInformation> findByTblFailureInformationCondensedIdIsNullOrderByFailureBeginDescIdAsc(Pageable pageable); // NOSONAR - Page<TblFailureInformation> findByTblFailureInformationCondensedIdIsNull(Pageable pageable); // NOSONAR - // _fd 03.03.2020: Name of function cannot be changed Optional<TblFailureInformation> findByUuid(UUID uuid); List<TblFailureInformation> findByUuidIn(List<UUID> uuidList);
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java index b3515fd..e414d4c 100644 --- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java +++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java
@@ -98,7 +98,7 @@ public Page<FailureInformationDto> findFailureInformations(Pageable pageable) { Page<FailureInformationDto> retPage = failureInformationRepository - .findByTblFailureInformationCondensedIdIsNull(pageable) + .findByTblFailureInformationCondensedIdIsNullOrderByFailureBeginDescIdAsc(pageable) .map(failureInformationMapper::toFailureInformationDto); retPage.getContent().forEach(this::enrichFailureInfo);
diff --git a/gfsBackendService/src/main/resources/application.yml b/gfsBackendService/src/main/resources/application.yml index 428e839..8836b6f 100644 --- a/gfsBackendService/src/main/resources/application.yml +++ b/gfsBackendService/src/main/resources/application.yml
@@ -69,9 +69,13 @@ spring: profiles: test - datasource: url: jdbc:h2:mem:test;DB_CLOSE_DELAY=-1 + +rabbitmq: + listener: + simple: + auto-startup: false jpa: hibernate: ddl-auto: create
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 5a26107..afe2419 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
@@ -78,7 +78,7 @@ //TblStation tblStation = MockDataHelper.mockTblStation(); //List<TblAddress> addressList = MockDataHelper.mockTblAddressList(); - when(failureInformationRepository.findByTblFailureInformationCondensedIdIsNull(any(Pageable.class))).thenReturn(mockfailurePage); + when(failureInformationRepository.findByTblFailureInformationCondensedIdIsNullOrderByFailureBeginDescIdAsc(any(Pageable.class))).thenReturn(mockfailurePage); //when(stationRepository.findByStationId(anyString())).thenReturn(Optional.of(tblStation)); //when(addressRepository.findByStationId(anyString())).thenReturn(addressList);