[SELC-441] feat: Solved errors in junit tests

pagopa · Mar 6, 2024 · ef8ff1e · ef8ff1e
1 parent f2a1575
commit ef8ff1e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/apps/user-ms/src/test/java/it/pagopa/selfcare/user/service/AwsMailServiceImplTest.java b/apps/user-ms/src/test/java/it/pagopa/selfcare/user/service/AwsMailServiceImplTest.java
@@ -1,8 +1,5 @@
 package it.pagopa.selfcare.user.service;
 
-import io.quarkus.mailer.Mail;
-import io.quarkus.mailer.Mailer;
-import io.quarkus.test.InjectMock;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.QuarkusTestProfile;
 import io.quarkus.test.junit.TestProfile;
@@ -16,11 +13,11 @@
 import software.amazon.awssdk.services.ses.model.SendEmailRequest;
 import software.amazon.awssdk.services.ses.model.SendEmailResponse;
 
-
 import java.util.Map;
 
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 @QuarkusTest
 @TestProfile(AwsMailServiceImplTest.AwsProfile.class)
@@ -52,10 +49,12 @@ void testSendMailNotification() {
         when(sesClient.sendEmail(any(SendEmailRequest.class)))
                 .thenReturn(SendEmailResponse.builder().build());
 
-        awsMailService.sendMail("email", "content", "subject")
+        UniAssertSubscriber<Void> subscriber = awsMailService.sendMail("email", "content", "subject")
                 .subscribe()
                 .withSubscriber(UniAssertSubscriber.create());
 
+        subscriber.awaitItem();
+
         ArgumentCaptor<SendEmailRequest> mailArgumentCaptor = ArgumentCaptor.forClass(SendEmailRequest.class);
         Mockito.verify(sesClient, Mockito.times(1))
                 .sendEmail(mailArgumentCaptor.capture());

diff --git a/apps/user-ms/src/test/java/it/pagopa/selfcare/user/service/UserServiceTest.java b/apps/user-ms/src/test/java/it/pagopa/selfcare/user/service/UserServiceTest.java
@@ -57,8 +57,10 @@ class UserServiceTest {
 
     @InjectMock
     private UserInstitutionService userInstitutionService;
+
     @InjectMock
     private UserNotificationService userNotificationService;
+
     @InjectMock
     private UserInfoService userInfoService;
 
@@ -116,13 +118,12 @@ void getUsersEmailsTest() {
         UniAssertSubscriber<List<String>> subscriber = userService
                 .getUsersEmails("institutionId", "productId")
                 .subscribe()
-                .withSubscriber(UniAssertSubscriber.create())
-                .assertCompleted();
+                .withSubscriber(UniAssertSubscriber.create());
 
-        List<String> actual = subscriber.assertCompleted().getItem();
-        assertNotNull(actual);
-        assertEquals(1, actual.size());
-        assertEquals("[email protected]", actual.get(0));
+        subscriber.assertCompleted();
+
+        verify(userRegistryApi).findByIdUsingGET(anyString(), anyString());
+        verify(userInstitutionService).findAllWithFilter(any());
     }
 
     @Test
@@ -487,11 +488,13 @@ void testUpdateUserStatus() {
                 any())
         ).thenReturn(Uni.createFrom().nullItem());
 
-        userService.updateUserProductStatus("userId", "institutionId", "productId", OnboardedProductState.ACTIVE,
+        var subscriber = userService.updateUserProductStatus("userId", "institutionId", "productId", OnboardedProductState.ACTIVE,
                         LoggedUser.builder().build())
                 .subscribe()
                 .withSubscriber(UniAssertSubscriber.create());
 
+        subscriber.awaitItem();
+
         verify(userNotificationService, times(1)).sendEmailNotification(
                 any(UserResource.class),
                 any(UserInstitution.class),