From 9aedbd5663ae900e55ce1f0eba94535f5bcf827a Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Sat, 4 Jan 2025 11:28:52 +0100 Subject: [PATCH] improvde code after review --- .../service/ProgrammingMessagingService.java | 2 +- .../service/BuildAgentDockerServiceTest.java | 2 +- .../ParticipationTeamWebsocketServiceTest.java | 9 +++++---- .../iris/PyrisEventSystemIntegrationTest.java | 15 ++++++++------- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java index 75a1233d68fd..7a7861cbcbcc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java @@ -200,7 +200,7 @@ public void notifyUserAboutNewResult(Result result, ProgrammingExerciseParticipa /** * Notify Iris about the submission status for the given result and student participation. - * Only if the user has accepted Iris, the exercise is not an exam exercise, and the exercise chat is enabled in the exercise settings + * Only notifies if the user has accepted Iris, the exercise is not an exam exercise, and the exercise chat is enabled in the exercise settings * NOTE: we check those settings early to prevent unnecessary database queries and exceptions later on in most cases. More sophisticated checks are done in the Iris service. *

* If the submission was successful, Iris will be informed about the successful submission. diff --git a/src/test/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerServiceTest.java index cdc2af3ec1b1..754566ec90ee 100644 --- a/src/test/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerServiceTest.java @@ -83,7 +83,7 @@ void testDeleteOldDockerImages_NoOutdatedImages() { buildAgentDockerService.deleteOldDockerImages(); // Verify that removeImageCmd() was not called. - verify(dockerClient, times(0)).removeImageCmd(anyString()); + verify(dockerClient, never()).removeImageCmd(anyString()); } @Test diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/service/ParticipationTeamWebsocketServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/service/ParticipationTeamWebsocketServiceTest.java index 37bf559d6b73..8c74aff1d9ff 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/service/ParticipationTeamWebsocketServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/service/ParticipationTeamWebsocketServiceTest.java @@ -2,6 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.RETURNS_MOCKS; +import static org.mockito.Mockito.after; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.timeout; @@ -139,7 +140,7 @@ void testPatchModelingSubmissionWithWrongPrincipal() { // when we submit a patch, but with the wrong user ... participationTeamWebsocketService.patchModelingSubmission(participation.getId(), patch, getPrincipalMock("student2")); // the patch should not be broadcast. - verify(websocketMessagingService, timeout(2000).times(0)).sendMessage(websocketTopic(participation), List.of()); + verify(websocketMessagingService, after(1000).never()).sendMessage(websocketTopic(participation), List.of()); } @Test @@ -152,7 +153,7 @@ void testUpdateModelingSubmission() { // the submission should be handled by the service (i.e. saved), ... verify(modelingSubmissionService, timeout(2000).times(1)).handleModelingSubmission(any(), any(), any()); // but it should NOT be broadcast (sync is handled with patches only). - verify(websocketMessagingService, timeout(2000).times(0)).sendMessage(websocketTopic(participation), List.of()); + verify(websocketMessagingService, after(1000).never()).sendMessage(websocketTopic(participation), List.of()); } @Test @@ -163,9 +164,9 @@ void testUpdateModelingSubmissionWithWrongPrincipal() { // when we submit a new modeling submission with the wrong user ... participationTeamWebsocketService.updateModelingSubmission(participation.getId(), submission, getPrincipalMock("student2")); // the submission is NOT saved ... - verify(modelingSubmissionService, timeout(2000).times(0)).handleModelingSubmission(any(), any(), any()); + verify(modelingSubmissionService, after(1000).never()).handleModelingSubmission(any(), any(), any()); // it is also not broadcast. - verify(websocketMessagingService, timeout(2000).times(0)).sendMessage(websocketTopic(participation), List.of()); + verify(websocketMessagingService, after(1000).never()).sendMessage(websocketTopic(participation), List.of()); } @Test diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisEventSystemIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisEventSystemIntegrationTest.java index f129a7727812..44aa312cc340 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisEventSystemIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisEventSystemIntegrationTest.java @@ -5,6 +5,7 @@ import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -244,7 +245,7 @@ void testShouldNotFireProgressStalledEventWithEventDisabled() { createSubmissionWithScore(studentParticipation, 40); createSubmissionWithScore(studentParticipation, 40); var result = createSubmissionWithScore(studentParticipation, 40); - verify(pyrisEventService, times(0)).trigger(new NewResultEvent(result)); + verify(pyrisEventService, never()).trigger(new NewResultEvent(result)); } @Test @@ -259,7 +260,7 @@ void testShouldNotFireBuildFailedEventWhenEventSettingDisabled() { // Create a failing submission for the student. var result = createFailingSubmission(studentParticipation); // very that the event is not fired - verify(pyrisEventService, times(0)).trigger(new NewResultEvent(result)); + verify(pyrisEventService, never()).trigger(new NewResultEvent(result)); } @Test @@ -284,7 +285,7 @@ void testShouldShouldNotFireProgressStalledEventWithExistingSuccessfulSubmission await().atMost(2, TimeUnit.SECONDS).untilAsserted(() -> { verify(irisExerciseChatSessionService, times(2)).onNewResult(any(Result.class)); - verify(pyrisPipelineService, times(0)).executeExerciseChatPipeline(any(), any(), any(), any(), any()); + verify(pyrisPipelineService, never()).executeExerciseChatPipeline(any(), any(), any(), any(), any()); }); } @@ -298,8 +299,8 @@ void testShouldNotFireProgressStalledEventWithLessThanThreeSubmissions() { pyrisEventService.trigger(new NewResultEvent(result)); - verify(irisExerciseChatSessionService, times(0)).onNewResult(any(Result.class)); - verify(pyrisPipelineService, times(0)).executeExerciseChatPipeline(any(), any(), any(), any(), any()); + verify(irisExerciseChatSessionService, never()).onNewResult(any(Result.class)); + verify(pyrisPipelineService, never()).executeExerciseChatPipeline(any(), any(), any(), any(), any()); } @Test @@ -313,8 +314,8 @@ void testShouldNotFireProgressStalledEventWithIncreasingScores() { pyrisEventService.trigger(new NewResultEvent(result)); - verify(irisExerciseChatSessionService, times(0)).onNewResult(any(Result.class)); - verify(pyrisPipelineService, times(0)).executeExerciseChatPipeline(any(), any(), any(), any(), any()); + verify(irisExerciseChatSessionService, never()).onNewResult(any(Result.class)); + verify(pyrisPipelineService, never()).executeExerciseChatPipeline(any(), any(), any(), any(), any()); } @Test