chore[litemall-core,litemall-wx-api]: 测试代码调整

litemall-wx-api/src/test/java/org/linlinjava/litemall/wx/ExpressTest.java

@@ -1,4 +1,4 @@
-package org.linlinjava.litemall.wx;
+package org.linlinjava.litemall.core;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

litemall-core/src/test/java/org/linlinjava/litemall/core/SmsTest.java

@@ -29,11 +29,11 @@ public class SmsTest {
     private NotifyService notifyService;
 
     @Test
-    public void testSingle() {
+    public void testCaptcha() {
         String phone = "xxxxxxxxxxx";
-        // 这里的短信签名必须在短信管理平台内设置正确并且相符合
-        String msg = "【xxx】你的验证码为:123456，请与2分钟内填写，如非本人操作，请忽略本短信。";
-        notifyService.notifySms(phone, msg);
+        String[] params = new String[] {"123456"};
+
+        notifyService.notifySmsTemplate(phone, NotifyType.CAPTCHA, params);
 
         try {
             Thread.sleep(5000);
@@ -43,11 +43,11 @@ public class SmsTest {
     }
 
     @Test
-    public void testCaptcha() {
+    public void testPaySucceed() {
         String phone = "xxxxxxxxxxx";
         String[] params = new String[] {"123456"};
 
-        notifyService.notifySmsTemplate(phone, NotifyType.CAPTCHA, params);
+        notifyService.notifySmsTemplate(phone, NotifyType.PAY_SUCCEED, params);
 
         try {
             Thread.sleep(5000);
@@ -57,11 +57,11 @@ public class SmsTest {
     }
 
     @Test
-    public void testPaySucceed() {
+    public void testShip() {
         String phone = "xxxxxxxxxxx";
         String[] params = new String[] {"123456"};
 
-        notifyService.notifySmsTemplate(phone, NotifyType.PAY_SUCCEED, params);
+        notifyService.notifySmsTemplate(phone, NotifyType.SHIP, params);
 
         try {
             Thread.sleep(5000);
@@ -70,4 +70,17 @@ public class SmsTest {
         }
     }
 
+    @Test
+    public void testRefund() {
+        String phone = "xxxxxxxxxxx";
+        String[] params = new String[] {"123456"};
+
+        notifyService.notifySmsTemplate(phone, NotifyType.REFUND, params);
+
+        try {
+            Thread.sleep(5000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
 }

litemall-core/src/test/java/org/linlinjava/litemall/core/WxTemplateTest.java

@@ -1,35 +0,0 @@
-package org.linlinjava.litemall.core;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.linlinjava.litemall.core.notify.NotifyService;
-import org.linlinjava.litemall.core.notify.NotifyType;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
-/**
- */
-@WebAppConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest
-public class WxTemplateTest {
-
-    @Autowired
-    private NotifyService notifyService;
-
-    @Test
-    public void testPaySucceed() {
-        String touser = "xx";
-        String[] params = new String[]{"xxx"};
-        notifyService.notifyWxTemplate(touser, NotifyType.PAY_SUCCEED, params);
-        try {
-            Thread.sleep(5000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
-
-}