You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/02/12 06:22:20 UTC

[26/31] incubator-kylin git commit: Update MailServiceTest test

Update MailServiceTest test

Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/b2d0d47d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/b2d0d47d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/b2d0d47d

Branch: refs/heads/master
Commit: b2d0d47d722b5ac79ab0d77118b40640f52d220e
Parents: 0789b54
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Fri Feb 6 09:38:26 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Fri Feb 6 09:38:26 2015 +0800

----------------------------------------------------------------------
 .../kylinolap/common/util/MailServiceTest.java    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b2d0d47d/common/src/test/java/com/kylinolap/common/util/MailServiceTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/com/kylinolap/common/util/MailServiceTest.java b/common/src/test/java/com/kylinolap/common/util/MailServiceTest.java
index f6368d6..6abc456 100644
--- a/common/src/test/java/com/kylinolap/common/util/MailServiceTest.java
+++ b/common/src/test/java/com/kylinolap/common/util/MailServiceTest.java
@@ -17,34 +17,36 @@
 
 package com.kylinolap.common.util;
 
+import com.kylinolap.common.KylinConfig;
+import org.junit.Test;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
-
-import com.kylinolap.common.KylinConfig;
-
 public class MailServiceTest {
 
     @Test
     public void testSendEmail() throws IOException {
-        
+
         @SuppressWarnings("deprecation")
         KylinConfig config = KylinConfig.getInstanceForTest(AbstractKylinTestCase.SANDBOX_TEST_DATA);
 
+        if (!"true".equalsIgnoreCase(config.getProperty(KylinConfig.MAIL_ENABLED, "false")))
+            return;
+
         MailService mailservice = new MailService(config);
         boolean sent = sendTestEmail(mailservice);
         assert sent;
-        
+
         // set mail.enabled=false, and run again, this time should be no mail delviered
         config.setProperty(KylinConfig.MAIL_ENABLED, "false");
         mailservice = new MailService(config);
         sent = sendTestEmail(mailservice);
         assert !sent;
-        
+
     }
-    
+
     private boolean sendTestEmail(MailService mailservice) {
 
         List<String> receivers = new ArrayList<String>(1);