From 4be5e159cb9b60fa6b021e120d1a86fad3106816 Mon Sep 17 00:00:00 2001
From: chengshiwen <chengshiwen0103@gmail.com>
Date: Sat, 6 Feb 2021 22:01:33 +0800
Subject: [PATCH] Fix unit tests

---
 .../alert/plugin/EmailAlertPlugin.java              | 13 ++++++-------
 .../alert/plugin/EmailAlertPluginTest.java          |  3 ++-
 .../server/worker/task/sql/SqlTask.java             |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java
index d20306b15..27fb301dc 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java
@@ -96,9 +96,6 @@ public class EmailAlertPlugin implements AlertPlugin {
         retMaps = emailManager.send(receviersList, receviersCcList, alert.getTitle(), alert.getContent(),
                 alert.getShowType());
 
-        //send flag
-        boolean flag = false;
-
         if (retMaps == null) {
             retMaps = new HashMap<>();
             retMaps.put(Constants.MESSAGE, "alert send error.");
@@ -107,9 +104,12 @@ public class EmailAlertPlugin implements AlertPlugin {
             return retMaps;
         }
 
-        flag = Boolean.parseBoolean(String.valueOf(retMaps.get(Constants.STATUS)));
-
-        if (flag) {
+        boolean enabled = Boolean.parseBoolean(String.valueOf(retMaps.get(Constants.MAIL_ENABLED)));
+        boolean status = Boolean.parseBoolean(String.valueOf(retMaps.get(Constants.STATUS)));
+        if (!enabled) {
+            logger.warn("mail wasn't sent since the mail config isn't set");
+            retMaps.put(Constants.MESSAGE, "mail wasn't sent since the mail config isn't set");
+        } else if (status) {
             logger.info("alert send success");
             retMaps.put(Constants.MESSAGE, "email send success.");
             if (EnterpriseWeChatUtils.isEnable()) {
@@ -121,7 +121,6 @@ public class EmailAlertPlugin implements AlertPlugin {
                     logger.error(e.getMessage(), e);
                 }
             }
-
         } else {
             retMaps.put(Constants.MESSAGE, "alert send error.");
             logger.info("alert send error : {}", retMaps.get(Constants.MESSAGE));
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java
index 52c2fc050..93ffe9ad5 100644
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java
+++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java
@@ -75,6 +75,7 @@ public class EmailAlertPluginTest {
         List<String> list = new ArrayList<String>(){{ add("xx@xx.com"); }};
         alertInfo.addProp("receivers", list);
         Map<String, Object> ret = plugin.process(alertInfo);
-        assertFalse(Boolean.parseBoolean(String.valueOf(ret.get(Constants.STATUS))));
+        assertFalse(Boolean.parseBoolean(String.valueOf(ret.get(Constants.MAIL_ENABLED))));
+        assertTrue(Boolean.parseBoolean(String.valueOf(ret.get(Constants.STATUS))));
     }
 }
\ No newline at end of file
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
index b07c55624..a9f9bb3b2 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
@@ -453,11 +453,11 @@ public class SqlTask extends AbstractTask {
         if(EnumUtils.isValidEnum(ShowType.class,showTypeName)){
             Map<String, Object> mailResult = MailUtils.sendMails(receiversList,
                     receiversCcList, title, content, ShowType.valueOf(showTypeName).getDescp());
-            if(!(boolean) mailResult.get(STATUS)){
-                throw new RuntimeException("send mail failed!");
-            }else if(!(boolean) mailResult.get(MAIL_ENABLED)){
+            if(!(boolean) mailResult.get(MAIL_ENABLED)){
                 logger.info("mail info : {} {}", title, content);
                 logger.warn("mail wasn't sent since the mail config isn't set");
+            }else if(!(boolean) mailResult.get(STATUS)){
+                throw new RuntimeException("send mail failed!");
             }
         }else{
             logger.error("showType: {} is not valid "  ,showTypeName);
-- 
GitLab