From b53ab699496a696d4306671d5e921bd8c9ac0aaf Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Fri, 18 Oct 2024 10:43:06 +0200 Subject: [PATCH] OZG-6944 rename test methods --- .../antragraum/AntragraumGrpcServiceTest.java | 68 +++++++++---------- .../antragraum/AntragraumServiceTest.java | 40 +++++------ .../AttachedItemRemoteServiceTest.java | 12 ++-- .../postfach/AttachedItemServiceTest.java | 6 +- 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java index 44d47db..1d37a4c 100644 --- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java +++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java @@ -506,35 +506,35 @@ class AntragraumGrpcServiceTest { @Test void shouldConstructInputStream() { - getAttachmentContent(); + callGetAttachmentContent(); assertThat(mockedConstructionInput.constructed()).hasSize(1); } @Test void shouldConstructOutputStream() { - getAttachmentContent(); + callGetAttachmentContent(); assertThat(mockedConstructionOutput.constructed()).hasSize(1); } @Test void shouldConnectPipes() { - getAttachmentContent(); + callGetAttachmentContent(); assertThat(connectedInput).isEqualTo(pipedInputStream); } @Test void shouldCallGetAttachmentFileContent() { - getAttachmentContent(); + callGetAttachmentContent(); verify(grpcService).getAttachmentFileContent(grpcRequest, pipedOutputStream); } @Test void shouldSendFileContent() { - getAttachmentContent(); + callGetAttachmentContent(); verify(grpcService).sendFileContent(pipedInputStream, responseObserver); } @@ -554,7 +554,7 @@ class AntragraumGrpcServiceTest { try (var mockedConstructionInput = mockConstruction(PipedInputStream.class, (mock, context) -> doThrow(IOException.class).when(mock).close())) { - assertThrows(TechnicalException.class, () -> getAttachmentContent()); + assertThrows(TechnicalException.class, () -> callGetAttachmentContent()); } } @@ -564,12 +564,12 @@ class AntragraumGrpcServiceTest { try (var mockedConstructionInput = mockConstruction(PipedOutputStream.class, (mock, context) -> doThrow(IOException.class).when(mock).close())) { - assertThrows(TechnicalException.class, () -> getAttachmentContent()); + assertThrows(TechnicalException.class, () -> callGetAttachmentContent()); } } } - private void getAttachmentContent() { + private void callGetAttachmentContent() { grpcService.getAttachmentContent(grpcRequest, responseObserver); } } @@ -601,14 +601,14 @@ class AntragraumGrpcServiceTest { @Test void shouldConstructNewThread() { - getRueckfrageAttachmentFile(); + callGetRueckfrageAttachmentFile(); assertThat(mockedConstructionThread.constructed()).hasSize(1); } @Test void shouldStartThread() { - getRueckfrageAttachmentFile(); + callGetRueckfrageAttachmentFile(); verify(thread).start(); } @@ -622,7 +622,7 @@ class AntragraumGrpcServiceTest { @Test void shouldMapRequest() { - getRueckfrageAttachmentFile(); + callGetRueckfrageAttachmentFile(); passedRunnable.run(); @@ -631,7 +631,7 @@ class AntragraumGrpcServiceTest { @Test void shouldCallServiceToGetAttachmentContent() { - getRueckfrageAttachmentFile(); + callGetRueckfrageAttachmentFile(); passedRunnable.run(); @@ -640,7 +640,7 @@ class AntragraumGrpcServiceTest { } - private void getRueckfrageAttachmentFile() { + private void callGetRueckfrageAttachmentFile() { grpcService.getAttachmentFileContent(grpcRequest, pipedOutputStream); } } @@ -666,14 +666,14 @@ class AntragraumGrpcServiceTest { @Test void shouldCreateBufferedInputStream() { - sendFileContent(); + callSendFileContent(); verify(grpcService).createBufferedInputStream(fileContent); } @Test void shouldSendFirstDataChunk() { - sendFileContent(); + callSendFileContent(); verify(responseObserver) .onNext(argThat((response) -> response.getFileContent() @@ -682,7 +682,7 @@ class AntragraumGrpcServiceTest { @Test void shouldSendSecondDataChunk() { - sendFileContent(); + callSendFileContent(); verify(responseObserver) .onNext(argThat((response) -> response.getFileContent() @@ -692,7 +692,7 @@ class AntragraumGrpcServiceTest { @Test void shouldComplete() { - sendFileContent(); + callSendFileContent(); verify(responseObserver).onCompleted(); } @@ -714,7 +714,7 @@ class AntragraumGrpcServiceTest { void shouldCloseInputStream() { when(inputStream.read(any())).thenReturn(-1); - sendFileContent(); + callSendFileContent(); verify(inputStream).close(); } @@ -739,13 +739,13 @@ class AntragraumGrpcServiceTest { @Test void shouldThrowTechnicalException() { assertThrows(TechnicalException.class, - () -> sendFileContent()); + () -> callSendFileContent()); } @Test void shouldCloseFileContentStreamQuietly() { try { - sendFileContent(); + callSendFileContent(); } catch (TechnicalException e) { } @@ -754,7 +754,7 @@ class AntragraumGrpcServiceTest { } } - private void sendFileContent() { + private void callSendFileContent() { grpcService.sendFileContent(fileContent, responseObserver); } } @@ -786,33 +786,33 @@ class AntragraumGrpcServiceTest { @Test void shouldConstructBufferedInputStream() { - createBufferedInputStream(); + callCreateBufferedInputStream(); assertThat(mockConstructionBufferedInputStream.constructed()).hasSize(1); } @Test void shouldConstructBufferedInputStreamWithFileContent() { - createBufferedInputStream(); + callCreateBufferedInputStream(); assertThat(passedInputStream).isEqualTo(fileContent); } @Test void shouldConstructBufferedInputStreamWithChunkSize() { - createBufferedInputStream(); + callCreateBufferedInputStream(); assertThat(chunkSize).isEqualTo(AntragraumGrpcService.CHUNK_SIZE); } @Test void shouldReturnBufferedInputStream() { - var returnedInputStream = createBufferedInputStream(); + var returnedInputStream = callCreateBufferedInputStream(); assertThat(returnedInputStream).isEqualTo(constructedInputStream); } - private InputStream createBufferedInputStream() { + private InputStream callCreateBufferedInputStream() { return grpcService.createBufferedInputStream(fileContent); } @@ -838,26 +838,26 @@ class AntragraumGrpcServiceTest { @Test void shouldMapRequest() { - getAttachmentMetadata(); + callGetAttachmentMetadata(); verify(attachmentFileRequestMapper).fromGrpcMetadataRequest(grpcRequest); } @Test void shouldCallServiceToGetMetadata() { - getAttachmentMetadata(); + callGetAttachmentMetadata(); verify(service).getAttachmentMetadata(request); } @Test void shouldCallSendFileMetadata() { - getAttachmentMetadata(); + callGetAttachmentMetadata(); verify(grpcService).sendFileMetadata(attachment, responseObserver); } - private void getAttachmentMetadata() { + private void callGetAttachmentMetadata() { grpcService.getAttachmentMetadata(grpcRequest, responseObserver); } } @@ -879,26 +879,26 @@ class AntragraumGrpcServiceTest { @Test void shouldMapMetadata() { - sendFileMetadata(); + callSendFileMetadata(); verify(ozgCloudFileMapper).toMetadata(attachment); } @Test void shouldSendMetadata() { - sendFileMetadata(); + callSendFileMetadata(); verify(responseObserver).onNext(argThat((response) -> response.getFileMetadata().equals(metadata))); } @Test void shouldCallOnCompleted() { - sendFileMetadata(); + callSendFileMetadata(); verify(responseObserver).onCompleted(); } - private void sendFileMetadata() { + private void callSendFileMetadata() { grpcService.sendFileMetadata(attachment, responseObserver); } } diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumServiceTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumServiceTest.java index 13663ca..d26ea85 100644 --- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumServiceTest.java +++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumServiceTest.java @@ -650,28 +650,28 @@ class AntragraumServiceTest { @Test void shouldCallVerifyAccessToFile() { - getAttachmentContent(); + callGetAttachmentContent(); verify(service).verifyAccessToFile(request); } @Test void shouldCreateDataOutputStream() { - getAttachmentContent(); + callGetAttachmentContent(); assertThat(dataOutputStreamMockedConstruction.constructed()).hasSize(1); } @Test void shouldCreateDataOutputStreamWithPipedOutputStream() { - getAttachmentContent(); + callGetAttachmentContent(); assertThat(underlyingStream).isEqualTo(pipedOutputStream); } @Test void shouldCallOzgCloudFileServiceToWriteData() { - getAttachmentContent(); + callGetAttachmentContent(); verify(ozgCloudFileService).writeFileDataToStream(OzgCloudFileId.from(AttachmentFileRequestTestFactory.FILE_ID), dataOutputStream); } @@ -679,7 +679,7 @@ class AntragraumServiceTest { @Test @SneakyThrows void shouldCloseDataOutputStream() { - getAttachmentContent(); + callGetAttachmentContent(); verify(dataOutputStream).close(); } @@ -696,13 +696,13 @@ class AntragraumServiceTest { try (var dataOutputStreamMockedConstruction = mockConstruction(DataOutputStream.class, (outputStream, context) -> doThrow(IOException.class).when(outputStream).close())) { - assertThrows(TechnicalException.class, () -> getAttachmentContent()); + assertThrows(TechnicalException.class, () -> callGetAttachmentContent()); } } } @SneakyThrows - private void getAttachmentContent() { + private void callGetAttachmentContent() { service.getAttachmentContent(request, pipedOutputStream); } } @@ -719,14 +719,14 @@ class AntragraumServiceTest { @Test void shouldCallVerifyAccessToFile() { - getAttachmentMetadata(); + callGetAttachmentMetadata(); verify(service).verifyAccessToFile(request); } @Test void shouldCallOzgCloudFileServiceToGetFile() { - getAttachmentMetadata(); + callGetAttachmentMetadata(); verify(ozgCloudFileService).getFile(OzgCloudFileId.from(AttachmentFileRequestTestFactory.FILE_ID)); } @@ -736,12 +736,12 @@ class AntragraumServiceTest { var ozgCloudFile = OzgCloudFileTestFactory.create(); when(ozgCloudFileService.getFile(OzgCloudFileId.from(AttachmentFileRequestTestFactory.FILE_ID))).thenReturn(ozgCloudFile); - var result = getAttachmentMetadata(); + var result = callGetAttachmentMetadata(); assertThat(result).isEqualTo(ozgCloudFile); } - private OzgCloudFile getAttachmentMetadata() { + private OzgCloudFile callGetAttachmentMetadata() { return service.getAttachmentMetadata(request); } } @@ -761,33 +761,33 @@ class AntragraumServiceTest { @Test void shouldVerifySamlToken() { - verifyAccessToFile(); + callVerifyAccessToFile(); verify(service).verifyToken(AttachmentFileRequestTestFactory.TOKEN); } @Test void shouldCallAttachedItemServiceToGetPostfachNachricht() { - verifyAccessToFile(); + callVerifyAccessToFile(); verify(attachedItemService).getPostfachNachricht(AttachmentFileRequestTestFactory.NACHRICHT_ID); } @Test void shouldCallVerifyAccessToVorgang() { - verifyAccessToFile(); + callVerifyAccessToFile(); verify(service).verifyAccessToVorgang(AttachmentFileRequestTestFactory.TOKEN, nachricht); } @Test void shouldVerifyFileId() { - verifyAccessToFile(); + callVerifyAccessToFile(); verify(service).verifyFileId(AttachmentFileRequestTestFactory.FILE_ID, nachricht); } - private void verifyAccessToFile() { + private void callVerifyAccessToFile() { service.verifyAccessToFile(request); } @@ -842,7 +842,7 @@ class AntragraumServiceTest { void shouldCallIsAccessible() { doReturn(true).when(service).isAccessible(AttachmentFileRequestTestFactory.TOKEN, GrpcServiceKontoTestFactory.TRUST_LEVEL); - verifyTrustLevel(); + callVerifyTrustLevel(); verify(service).isAccessible(AttachmentFileRequestTestFactory.TOKEN, GrpcServiceKontoTestFactory.TRUST_LEVEL); } @@ -851,7 +851,7 @@ class AntragraumServiceTest { void shouldThrowExceptionOnNotAccessible() { doReturn(false).when(service).isAccessible(AttachmentFileRequestTestFactory.TOKEN, GrpcServiceKontoTestFactory.TRUST_LEVEL); - assertThatThrownBy(() -> verifyTrustLevel()) + assertThatThrownBy(() -> callVerifyTrustLevel()) .isInstanceOf(NotFoundException.class) .hasMessageContaining("PostfachNachricht") .hasMessageContaining(PostfachNachrichtTestFactory.ID); @@ -861,10 +861,10 @@ class AntragraumServiceTest { void shouldNotThrowExceptionOnAccessible() { doReturn(true).when(service).isAccessible(AttachmentFileRequestTestFactory.TOKEN, GrpcServiceKontoTestFactory.TRUST_LEVEL); - assertDoesNotThrow(() -> verifyTrustLevel()); + assertDoesNotThrow(() -> callVerifyTrustLevel()); } - private void verifyTrustLevel() { + private void callVerifyTrustLevel() { service.verifyTrustLevel(AttachmentFileRequestTestFactory.TOKEN, nachricht, vorgang); } } diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/AttachedItemRemoteServiceTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/AttachedItemRemoteServiceTest.java index a300996..62969f4 100644 --- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/AttachedItemRemoteServiceTest.java +++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/AttachedItemRemoteServiceTest.java @@ -285,28 +285,28 @@ class AttachedItemRemoteServiceTest { @Test void shouldCallGetVorgangAttachedItemServiceStub() { - getPostfachNachrichtById(); + callGetPostfachNachrichtById(); verify(service).getVorgangAttachedItemServiceStub(); } @Test void shouldCallBuildGetByIdRequest() { - getPostfachNachrichtById(); + callGetPostfachNachrichtById(); verify(service).buildGetByIdRequest(PostfachNachrichtTestFactory.ID); } @Test void shouldCallServiceStubWithInterceptor() { - getPostfachNachrichtById(); + callGetPostfachNachrichtById(); verify(stubWithInterceptor).getById(request); } @Test void shouldMapToPostfachNachricht() { - getPostfachNachrichtById(); + callGetPostfachNachrichtById(); verify(postfachNachrichtMapper).fromAttachedItem(GrpcVorgangAttachedItemResponseTestFactory.ATTACHED_ITEM); } @@ -317,12 +317,12 @@ class AttachedItemRemoteServiceTest { when(postfachNachrichtMapper.fromAttachedItem(GrpcVorgangAttachedItemResponseTestFactory.ATTACHED_ITEM)) .thenReturn(mappedPostfachNachricht); - var postfachNachricht = getPostfachNachrichtById(); + var postfachNachricht = callGetPostfachNachrichtById(); assertThat(postfachNachricht).isEqualTo(mappedPostfachNachricht); } - private PostfachNachricht getPostfachNachrichtById() { + private PostfachNachricht callGetPostfachNachrichtById() { return service.getPostfachNachrichtById(PostfachNachrichtTestFactory.ID); } } diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/AttachedItemServiceTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/AttachedItemServiceTest.java index c4377c8..6c51331 100644 --- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/AttachedItemServiceTest.java +++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/AttachedItemServiceTest.java @@ -23,7 +23,7 @@ class AttachedItemServiceTest { @Test void shouldCallRemoteService() { - getPostfachNachricht(); + callGetPostfachNachricht(); verify(remoteService).getPostfachNachrichtById(PostfachNachrichtTestFactory.ID); } @@ -32,12 +32,12 @@ class AttachedItemServiceTest { void shouldReturnPostfachNachricht() { when(remoteService.getPostfachNachrichtById(PostfachNachrichtTestFactory.ID)).thenReturn(postfachNachricht); - var result = getPostfachNachricht(); + var result = callGetPostfachNachricht(); assertThat(result).isEqualTo(postfachNachricht); } - private PostfachNachricht getPostfachNachricht() { + private PostfachNachricht callGetPostfachNachricht() { return service.getPostfachNachricht(PostfachNachrichtTestFactory.ID); } } -- GitLab