Skip to content

Commit

Permalink
Merge pull request #4 from osandadeshan/1.0.5
Browse files Browse the repository at this point in the history 
Provided support for the outlook email as the email sender.
  • Loading branch information
@osandadeshan
osandadeshan authored Nov 29, 2020
2 parents 5b4b1f8 + e3e7d01 commit c4dc977
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 11 deletions.
24 changes: 16 additions & 8 deletions env/email/email.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,47 @@

# Dev environment email properties
dev_is_email_notifications_needed = yes
dev_sender_email_address = maxsoftgreporter@gmail.com
dev_sender_email_address = greporter@maxsoft.com
dev_sender_email_password = 1qaz2wsx$greporter
dev_recipients_email_addresses = [email protected]
dev_sender_email_smtp_host = smtp-mail.outlook.com
dev_sender_email_smtp_port = 587
dev_recipients_email_addresses = [email protected], [email protected]
dev_email_subject = MaxSoft GReporter
dev_email_body_title_heading_size = 3
dev_email_body_title = Test Execution Results - Dev Environment
dev_email_body = <b>MaxSoft GReporter</b> - Java plugin for gauge to send the test execution summary to a defined audience. <br /> <a href="https://github.com/osandadeshan/MaxSoft-GReporter">GitHub Source</a>

# QA environment email properties
qa_is_email_notifications_needed = yes
qa_sender_email_address = maxsoftgreporter@gmail.com
qa_sender_email_address = osanda@gmail.com
qa_sender_email_password = 1qaz2wsx$greporter
qa_recipients_email_addresses = [email protected]
qa_sender_email_smtp_host = smtp.gmail.com
qa_sender_email_smtp_port = 587
qa_recipients_email_addresses = [email protected], [email protected]
qa_email_subject = MaxSoft GReporter
qa_email_body_title_heading_size = 3
qa_email_body_title = Test Execution Results - QA Environment
qa_email_body = <b>MaxSoft GReporter</b> - Java plugin for gauge to send the test execution summary to a defined audience. <br /> <a href="https://github.com/osandadeshan/MaxSoft-GReporter">GitHub Source</a>

# Staging environment email properties
uat_is_email_notifications_needed = yes
uat_sender_email_address = maxsoftgreporter@gmail.com
uat_sender_email_address = osanda@gmail.com
uat_sender_email_password = 1qaz2wsx$greporter
uat_recipients_email_addresses = [email protected]
uat_sender_email_smtp_host = smtp.gmail.com
uat_sender_email_smtp_port = 587
uat_recipients_email_addresses = [email protected], [email protected]
uat_email_subject = MaxSoft GReporter
uat_email_body_title_heading_size = 3
uat_email_body_title = Test Execution Results - Staging Environment
uat_email_body = <b>MaxSoft GReporter</b> - Java plugin for gauge to send the test execution summary to a defined audience. <br /> <a href="https://github.com/osandadeshan/MaxSoft-GReporter">GitHub Source</a>

# Prod environment email properties
prod_is_email_notifications_needed = yes
prod_sender_email_address = maxsoftgreporter@gmail.com
prod_sender_email_address = greporter@maxsoft.com
prod_sender_email_password = 1qaz2wsx$greporter
prod_recipients_email_addresses = [email protected]
prod_sender_email_smtp_host = smtp-mail.outlook.com
prod_sender_email_smtp_port = 587
prod_recipients_email_addresses = [email protected], [email protected]
prod_email_subject = MaxSoft GReporter
prod_email_body_title_heading_size = 3
prod_email_body_title = Test Execution Results - Production Environment
Expand Down
16 changes: 13 additions & 3 deletions src/main/java/com/maxsoft/greporter/Email.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ public class Email {
private static String isEmailNeeded;
private static String senderEmailAddress;
private static String senderEmailPassword;
private static String senderEmailSmtpHost;
private static String senderEmailSmtpPort;
private static String recipientsEmailAddresses;
private static String emailSubject;
private static String emailBodyTitleHeadingSize;
Expand Down Expand Up @@ -76,6 +78,8 @@ private static void setEmailConfigurations() {
isEmailNeeded = emailProperties.getProperty("dev_is_email_notifications_needed");
senderEmailAddress = emailProperties.getProperty("dev_sender_email_address");
senderEmailPassword = emailProperties.getProperty("dev_sender_email_password");
senderEmailSmtpHost = emailProperties.getProperty("dev_sender_email_smtp_host");
senderEmailSmtpPort = emailProperties.getProperty("dev_sender_email_smtp_port");
recipientsEmailAddresses = emailProperties.getProperty("dev_recipients_email_addresses");
emailSubject = emailProperties.getProperty("dev_email_subject");
emailBodyTitleHeadingSize = emailProperties.getProperty("dev_email_body_title_heading_size");
Expand All @@ -86,6 +90,8 @@ private static void setEmailConfigurations() {
isEmailNeeded = emailProperties.getProperty("qa_is_email_notifications_needed");
senderEmailAddress = emailProperties.getProperty("qa_sender_email_address");
senderEmailPassword = emailProperties.getProperty("qa_sender_email_password");
senderEmailSmtpHost = emailProperties.getProperty("qa_sender_email_smtp_host");
senderEmailSmtpPort = emailProperties.getProperty("qa_sender_email_smtp_port");
recipientsEmailAddresses = emailProperties.getProperty("qa_recipients_email_addresses");
emailSubject = emailProperties.getProperty("qa_email_subject");
emailBodyTitleHeadingSize = emailProperties.getProperty("qa_email_body_title_heading_size");
Expand All @@ -96,6 +102,8 @@ private static void setEmailConfigurations() {
isEmailNeeded = emailProperties.getProperty("uat_is_email_notifications_needed");
senderEmailAddress = emailProperties.getProperty("uat_sender_email_address");
senderEmailPassword = emailProperties.getProperty("uat_sender_email_password");
senderEmailSmtpHost = emailProperties.getProperty("uat_sender_email_smtp_host");
senderEmailSmtpPort = emailProperties.getProperty("uat_sender_email_smtp_port");
recipientsEmailAddresses = emailProperties.getProperty("uat_recipients_email_addresses");
emailSubject = emailProperties.getProperty("uat_email_subject");
emailBodyTitleHeadingSize = emailProperties.getProperty("uat_email_body_title_heading_size");
Expand All @@ -106,6 +114,8 @@ private static void setEmailConfigurations() {
isEmailNeeded = emailProperties.getProperty("prod_is_email_notifications_needed");
senderEmailAddress = emailProperties.getProperty("prod_sender_email_address");
senderEmailPassword = emailProperties.getProperty("prod_sender_email_password");
senderEmailSmtpHost = emailProperties.getProperty("prod_sender_email_smtp_host");
senderEmailSmtpPort = emailProperties.getProperty("prod_sender_email_smtp_port");
recipientsEmailAddresses = emailProperties.getProperty("prod_recipients_email_addresses");
emailSubject = emailProperties.getProperty("prod_email_subject");
emailBodyTitleHeadingSize = emailProperties.getProperty("prod_email_body_title_heading_size");
Expand All @@ -126,8 +136,8 @@ public static void send(String executionResults) {
Properties props = new Properties();
props.put("mail.smtp.auth", "true");
props.put("mail.smtp.starttls.enable", "true");
props.put("mail.smtp.host", "smtp.gmail.com");
props.put("mail.smtp.port", "587");
props.put("mail.smtp.host", senderEmailSmtpHost);
props.put("mail.smtp.port", senderEmailSmtpPort);

Session session = Session.getInstance(props,
new javax.mail.Authenticator() {
Expand Down Expand Up @@ -157,7 +167,7 @@ protected PasswordAuthentication getPasswordAuthentication() {
BodyPart messageBodyPart = new MimeBodyPart();
String htmlText = "<h2 style=\"color:black;\"> Test Execution Status: " + "<span "
+ JsonReportReader.getExecutionStatusColor() + ">" + JsonReportReader.getExecutionStatus()
+ "</h2><br />" + "<h" + emailBodyTitleHeadingSize + ">" + emailBodyTitle + "</h"
+ "</span></h2><br />" + "<h" + emailBodyTitleHeadingSize + ">" + emailBodyTitle + "</h"
+ emailBodyTitleHeadingSize + ">" + "<br />" + emailBody + "<br /><br /><br />" + executionResults;
messageBodyPart.setContent(htmlText, "text/html");
// add it
Expand Down

0 comments on commit c4dc977

Please sign in to comment.