fixed tests

Author: Holly Williams

send-surveys/src/main/java/com/objectcomputing/pulsesurvey/email/manager/GmailSender.java

@@ -70,14 +70,15 @@ public void sendEmail(String subject, String emailAddress, String emailMessage)
 
             LOG.info("Message id: " + message.getId());
             LOG.info(message.toPrettyString());
+            LOG.info("Email Sent: " + subject + " to " + emailAddress + "\n");
         } catch (IOException e) {
             LOG.error("IOException: " + e.getMessage());
             e.printStackTrace();
         } catch (MessagingException e) {
             LOG.error("MessagingException: " + e.getMessage());
             e.printStackTrace();
         }
-        LOG.info("Email Sent: " + subject + " to " + emailAddress + "\n");
+
     }
 
     /**

send-surveys/src/main/java/com/objectcomputing/pulsesurvey/send/surveys/SurveysController.java

@@ -51,6 +51,18 @@ public void setGmailApi(GmailApi api) {
         this.gmail = api;
     }
 
+    public void setResponseKeyRepo(ResponseKeyRepository responseKeyRepository) {
+        this.responseKeyRepo = responseKeyRepository;
+    }
+
+    public void setTemplateManager(SurveyTemplateManager surveyTemplateManager) {
+        this.templateManager = surveyTemplateManager;
+    }
+
+    public void setGmailSender(GmailSender gmailSender) {
+        this.gmailSender = gmailSender;
+    }
+
     /* call GetRandomEmails(what percentage of current employees) ->
     GetEmail(Google) -> SelectRandom -> GenerateKeys -> Map<String Email, String KeyUUID>
     Map gets returned */

send-surveys/src/test/java/com/objectcomputing/pulsesurvey/send/surveys/SurveysControllerTest.java

@@ -1,6 +1,9 @@
 package com.objectcomputing.pulsesurvey.send.surveys;
 
+import com.objectcomputing.pulsesurvey.email.manager.GmailSender;
 import com.objectcomputing.pulsesurvey.model.SendSurveysCommand;
+import com.objectcomputing.pulsesurvey.repositories.ResponseKeyRepository;
+import com.objectcomputing.pulsesurvey.template.manager.SurveyTemplateManager;
 import io.micronaut.test.annotation.MicronautTest;
 import com.objectcomputing.pulsesurvey.model.ResponseKey;
 import net.bytebuddy.utility.RandomString;
@@ -9,11 +12,13 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junitpioneer.jupiter.SystemPropertyExtension;
+import org.mockito.ArgumentMatchers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 
+import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,9 +31,13 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
+//import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.internal.verification.VerificationModeFactory.times;
 
 @ExtendWith(SystemPropertyExtension.class)
 @MicronautTest
@@ -41,46 +50,78 @@ public class SurveysControllerTest {
 
     SurveysController.GmailApi gmailApiMock = mock(SurveysController.GmailApi.class);
 
+    ResponseKeyRepository mockRepository = mock(ResponseKeyRepository.class);
+
+    SurveyTemplateManager mockTemplateManager = mock(SurveyTemplateManager.class);
+
+    GmailSender mockGmailSender = mock(GmailSender.class);
+
     @BeforeEach
     void setupTest() {
         itemUnderTest.setGmailApi(gmailApiMock);
+        itemUnderTest.setResponseKeyRepo(mockRepository);
+        itemUnderTest.setTemplateManager(mockTemplateManager);
+        itemUnderTest.setGmailSender(mockGmailSender);
         reset(gmailApiMock);
+        reset(mockRepository);
+        reset(mockTemplateManager);
+        reset(mockGmailSender);
     }
 
-    List<String> generateEmails(int size) {
+    List<String> generateFakeEmails(int size) {
         List<String> toReturn = new ArrayList<>(size);
         for (int count = 0; count < size; count++) {
             toReturn.add(RandomString.make(8) + "@" + RandomString.make(10) + ".com");
         }
         return toReturn;
     }
 
-    List<ResponseKey> generateResponseKeys(int size) {
+    List<ResponseKey> generateFakeResponseKeys(int size) {
         List<ResponseKey> toReturn = new ArrayList<>(size);
         for (int count = 0; count < size; count++) {
             toReturn.add(new ResponseKey(UUID.randomUUID(), LocalDateTime.now()));
         }
         return toReturn;
     }
 
-    static final int PERCENT_OF_EMAILS = 10;
+ //   static final int PERCENT_OF_EMAILS = 10;
 
     @Test
     void testSendEmails_ReportsCorrectNumber() {
         String percentOfEmails = "10";
         double doublePercentOfEmails = parseDouble(percentOfEmails);
         LOG.info("Using doublePercentOfEmails: "+ doublePercentOfEmails);
-        List<String> fakeEmails = generateEmails((int)(Math.random()*100)%50);
+        List<String> fakeEmails = generateFakeEmails((int)(Math.random()*100)%50);
         LOG.info("Using addresses: "+ fakeEmails.size());
         final int numberOfEmailsToBeSent = (int) Math
                 .ceil(fakeEmails.size() * parseDouble(percentOfEmails) / 100.0);
+        final int numkeys = (int)(Math.random()*100)%100;
         LOG.info("Using numberOfEmailsToBeSent: "+ numberOfEmailsToBeSent);
+
         when(gmailApiMock.getEmails()).thenReturn(fakeEmails);
 
+        List<ResponseKey> fakeKeys = generateFakeResponseKeys(numkeys);
+        when(mockRepository.saveAll(any())).thenReturn(fakeKeys);
+
+        String fakeTemplateName = "not a real template";
+        Map<String, String> fakeEmailKeyMap = new  HashMap<>();
+        fakeEmailKeyMap.put("one@fake.email", "fake key 1");
+        fakeEmailKeyMap.put("two@fake.email", "fake key 2");
+        Map<String, String> fakeEmailBodiesMap = new  HashMap<>();
+        fakeEmailBodiesMap.put("one@fake.email", "fake email body 1");
+        fakeEmailBodiesMap.put("two@fake.email", "fake email body 2");
+
+        try {
+            when(mockTemplateManager.populateEmails(fakeTemplateName, fakeEmailKeyMap)).thenReturn(fakeEmailBodiesMap);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
         SendSurveysCommand sendSurveysCommand = new SendSurveysCommand();
         sendSurveysCommand.setTemplateName("emailTemplate");
         sendSurveysCommand.setPercentOfEmails(percentOfEmails);
         SendSurveys sent = itemUnderTest.sendEmails(sendSurveysCommand);
+
         assertThat(sent.getName(), containsString("Sent surveys:"));
         assertThat(sent.getName(), containsString("Sent surveys: "+numberOfEmailsToBeSent));
     }
@@ -91,7 +132,7 @@ void testSendEmails_ReportsCorrectNumber() {
      **/
     @Test
     void testGetTotalNumberOfAvailableEmailAddresses() {
-        List<String> fakeEmails = generateEmails((int)(Math.random()*100)%50);
+        List<String> fakeEmails = generateFakeEmails((int)(Math.random()*100)%50);
         LOG.info("Using addresses: "+ fakeEmails.size());
         when(gmailApiMock.getEmails()).thenReturn(fakeEmails);
         assertEquals(fakeEmails.size(), itemUnderTest.getTotalNumberOfAvailableEmailAddresses());
@@ -103,7 +144,7 @@ void testGetTotalNumberOfAvailableEmailAddresses() {
     @Test
     void testGetRandomEmailAddresses_CorrectNumber() {
         final int percentOfEmailsNeeded = 10;
-        List<String> fakeEmails = generateEmails((int)(Math.random()*100)%50);
+        List<String> fakeEmails = generateFakeEmails((int)(Math.random()*100)%50);
         LOG.info("Using addresses: "+ fakeEmails.size());
         final long numberOfEmailsToBeSent = (long) Math
                 .ceil(fakeEmails.size() * (double) percentOfEmailsNeeded / 100.0);
@@ -118,7 +159,7 @@ void testGetRandomEmailAddresses_CorrectNumber() {
     @Test
     void testGetRandomEmailAddresses_UniqueAddresses() {
         final int percentOfEmailsNeeded = 10;
-        List<String> fakeEmails = generateEmails((int)(Math.random()*100)%50);
+        List<String> fakeEmails = generateFakeEmails((int)(Math.random()*100)%50);
         LOG.info("Using addresses: "+ fakeEmails.size());
         final long numberOfEmailsToBeSent = (long) Math
                 .ceil(fakeEmails.size() * (double) percentOfEmailsNeeded / 100.0);
@@ -134,7 +175,7 @@ void testGetRandomEmailAddresses_UniqueAddresses() {
     // contains("a", "b", "c"));
     @Test
     void testGetRandomEmailAddresses_SubsetOfOriginal() {
-        List<String> fakeEmails = generateEmails((int)(Math.random()*100)%50);
+        List<String> fakeEmails = generateFakeEmails((int)(Math.random()*100)%50);
         LOG.info("Using addresses: "+ fakeEmails.size());
         final int percentOfEmailsNeeded = 10;
 
@@ -152,6 +193,10 @@ void testGenerateAndSaveKeys() {
         final int numkeys = (int)(Math.random()*100)%100;
         LOG.info("Generating keys: "+ numkeys);
 
+        List<ResponseKey> fakeKeys = generateFakeResponseKeys(numkeys);
+
+        when(mockRepository.saveAll(any())).thenReturn(fakeKeys);
+
         List<ResponseKey> actual = itemUnderTest.generateAndSaveKeys(numkeys);
         assertEquals(numkeys, actual.size());
     }
@@ -162,8 +207,8 @@ void testGenerateAndSaveKeys() {
     void testMapEmailsToKeys_CorrectNumber() {
         int numberOfEmails = (int)(Math.random()*100)%50;
         LOG.info("Mapping emails: "+ numberOfEmails);
-        List<String> fakeEmails = generateEmails(numberOfEmails);
-        List<ResponseKey> fakeKeys = generateResponseKeys(numberOfEmails);
+        List<String> fakeEmails = generateFakeEmails(numberOfEmails);
+        List<ResponseKey> fakeKeys = generateFakeResponseKeys(numberOfEmails);
 
         when(gmailApiMock.getEmails()).thenReturn(fakeEmails);
 
@@ -178,8 +223,8 @@ void testMapEmailsToKeys_CorrectNumber() {
     void testMapEmailsToKeys_ContainsCorrectKeys() {
         int numberOfEmails = (int)(Math.random()*100)%50;
         LOG.info("Mapping emails: "+ numberOfEmails);
-        List<String> fakeEmails = generateEmails(numberOfEmails);
-        List<ResponseKey> fakeKeys = generateResponseKeys(numberOfEmails);
+        List<String> fakeEmails = generateFakeEmails(numberOfEmails);
+        List<ResponseKey> fakeKeys = generateFakeResponseKeys(numberOfEmails);
 
         when(gmailApiMock.getEmails()).thenReturn(fakeEmails);
 
@@ -193,13 +238,16 @@ void testMapEmailsToKeys_ContainsCorrectKeys() {
     // * no idea how to test this one *
     @Test
     void testSendTheEmails() {
-        // * no idea how to test this one *
+        //todo mock gmailsender
         Map<String, String> fakeEmailMap =  new HashMap<String, String>();
         fakeEmailMap.put("a@dnc.com","a bunch of fake html");
         fakeEmailMap.put("b@dnc.com","more fake html");
-        //call sendTheEmails with the email body map <emailaddress, emailbody>
+
         itemUnderTest.sendTheEmails(fakeEmailMap);
 
+        verify(mockGmailSender,
+                times(fakeEmailMap.size())).sendEmail(any(String.class), any(String.class), any(String.class));
+
     }
 
 }