添加对发送模板消息的单元测试

binarywang · binarywang · commit cb9380cc4f33 · 2016-09-28T11:12:01.000+08:00
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java
@@ -257,9 +257,8 @@ public String shortUrl(String long_url) throws WxErrorException {
   @Override
   public String templateSend(WxMpTemplateMessage templateMessage) throws WxErrorException {
     String url = "https://api.weixin.qq.com/cgi-bin/message/template/send";
-    String responseContent = execute(new SimplePostRequestExecutor(), url, templateMessage.toJson());
-    JsonElement tmpJsonElement = JSON_PARSER.parse(responseContent);
-    final JsonObject jsonObject = tmpJsonElement.getAsJsonObject();
+    String responseContent = this.post(url, templateMessage.toJson());
+    final JsonObject jsonObject = JSON_PARSER.parse(responseContent).getAsJsonObject();
     if (jsonObject.get("errcode").getAsInt() == 0){
       return jsonObject.get("msgid").getAsString();
     }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateData.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateData.java
@@ -7,9 +7,6 @@
  */
 public class WxMpTemplateData implements Serializable {
 
-  /**
-   * 
-   */
   private static final long serialVersionUID = 6301835292940277870L;
   private String name;
   private String value;
@@ -48,6 +45,7 @@ public void setValue(String value) {
   public String getColor() {
     return this.color;
   }
+
   public void setColor(String color) {
     this.color = color;
   }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java
@@ -1,17 +1,14 @@
 package me.chanjar.weixin.mp.bean;
 
-import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-public class WxMpTemplateMessage implements Serializable {
+import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
-  /**
-   * 
-   */
+public class WxMpTemplateMessage implements Serializable {
   private static final long serialVersionUID = 5063374783759519418L;
+
   private String toUser;
   private String templateId;
   private String url;
@@ -65,4 +62,61 @@ public void addWxMpTemplateData(WxMpTemplateData datum) {
   public String toJson() {
     return WxMpGsonBuilder.INSTANCE.create().toJson(this);
   }
+
+  public static WxMpTemplateMessageBuilder builder() {
+    return new WxMpTemplateMessageBuilder();
+  }
+
+  public static class WxMpTemplateMessageBuilder {
+    private String toUser;
+    private String templateId;
+    private String url;
+    private String topColor;
+    private List<WxMpTemplateData> data = new ArrayList<>();
+
+    public WxMpTemplateMessageBuilder toUser(String toUser) {
+      this.toUser = toUser;
+      return this;
+    }
+
+    public WxMpTemplateMessageBuilder templateId(String templateId) {
+      this.templateId = templateId;
+      return this;
+    }
+
+    public WxMpTemplateMessageBuilder url(String url) {
+      this.url = url;
+      return this;
+    }
+
+    public WxMpTemplateMessageBuilder topColor(String topColor) {
+      this.topColor = topColor;
+      return this;
+    }
+
+    public WxMpTemplateMessageBuilder data(List<WxMpTemplateData> data) {
+      this.data = data;
+      return this;
+    }
+
+    public WxMpTemplateMessageBuilder from(WxMpTemplateMessage origin) {
+      this.toUser(origin.toUser);
+      this.templateId(origin.templateId);
+      this.url(origin.url);
+      this.topColor(origin.topColor);
+      this.data(origin.data);
+      return this;
+    }
+
+    public WxMpTemplateMessage build() {
+      WxMpTemplateMessage m = new WxMpTemplateMessage();
+      m.toUser = this.toUser;
+      m.templateId = this.templateId;
+      m.url = this.url;
+      m.topColor = this.topColor;
+      m.data = this.data;
+      return m;
+    }
+  }
+
 }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java
@@ -3,24 +3,21 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 
 import me.chanjar.weixin.common.util.xml.XStreamInitializer;
+import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
 
 public class ApiTestModule implements Module {
 
   @Override
   public void configure(Binder binder) {
     try (InputStream is1 = ClassLoader
         .getSystemResourceAsStream("test-config.xml")) {
-      WxXmlMpInMemoryConfigStorage config = fromXml(
-          WxXmlMpInMemoryConfigStorage.class, is1);
+      WxXmlMpInMemoryConfigStorage config = this
+          .fromXml(WxXmlMpInMemoryConfigStorage.class, is1);
       WxMpServiceImpl wxService = new WxMpServiceImpl();
       wxService.setWxMpConfigStorage(config);
 
@@ -32,50 +29,11 @@ public void configure(Binder binder) {
   }
 
   @SuppressWarnings("unchecked")
-  public static <T> T fromXml(Class<T> clazz, InputStream is) {
+  private <T> T fromXml(Class<T> clazz, InputStream is) {
     XStream xstream = XStreamInitializer.getInstance();
     xstream.alias("xml", clazz);
     xstream.processAnnotations(clazz);
     return (T) xstream.fromXML(is);
   }
 
-  @XStreamAlias("xml")
-  public static class WxXmlMpInMemoryConfigStorage
-      extends WxMpInMemoryConfigStorage {
-
-    private String openid;
-    private String kfAccount;
-    private String qrconnectRedirectUrl;
-
-    public String getOpenid() {
-      return this.openid;
-    }
-
-    public void setOpenid(String openid) {
-      this.openid = openid;
-    }
-
-    @Override
-    public String toString() {
-      return ToStringBuilder.reflectionToString(this);
-    }
-
-    public String getKfAccount() {
-      return this.kfAccount;
-    }
-
-    public void setKfAccount(String kfAccount) {
-      this.kfAccount = kfAccount;
-    }
-
-    public String getQrconnectRedirectUrl() {
-      return this.qrconnectRedirectUrl;
-    }
-
-    public void setQrconnectRedirectUrl(String qrconnectRedirectUrl) {
-      this.qrconnectRedirectUrl = qrconnectRedirectUrl;
-    }
-
-  }
-
 }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
@@ -36,7 +36,7 @@ public class WxMpMassMessageAPITest {
   @Test
   public void testTextMassOpenIdsMessageSend() throws WxErrorException {
     // 发送群发消息
-    ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
+    WxXmlMpInMemoryConfigStorage configProvider = (WxXmlMpInMemoryConfigStorage) this.wxService
         .getWxMpConfigStorage();
     WxMpMassOpenIdsMessage massMessage = new WxMpMassOpenIdsMessage();
     massMessage.setMsgType(WxConsts.MASS_MSG_TEXT);
@@ -53,7 +53,7 @@ public void testTextMassOpenIdsMessageSend() throws WxErrorException {
   public void testMediaMassOpenIdsMessageSend(String massMsgType,
       String mediaId) throws WxErrorException {
     // 发送群发消息
-    ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
+    WxXmlMpInMemoryConfigStorage configProvider = (WxXmlMpInMemoryConfigStorage) this.wxService
         .getWxMpConfigStorage();
     WxMpMassOpenIdsMessage massMessage = new WxMpMassOpenIdsMessage();
     massMessage.setMsgType(massMsgType);
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxXmlMpInMemoryConfigStorage.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxXmlMpInMemoryConfigStorage.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright(c) 2011-2016 by UCredit Inc.
+ * All Rights Reserved
+ */
+package me.chanjar.weixin.mp.api;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+@XStreamAlias("xml")
+public class WxXmlMpInMemoryConfigStorage
+    extends WxMpInMemoryConfigStorage {
+
+  private String openid;
+  private String kfAccount;
+  private String qrconnectRedirectUrl;
+  private String templateId;
+
+  public String getOpenid() {
+    return this.openid;
+  }
+
+  public void setOpenid(String openid) {
+    this.openid = openid;
+  }
+
+  @Override
+  public String toString() {
+    return ToStringBuilder.reflectionToString(this);
+  }
+
+  public String getKfAccount() {
+    return this.kfAccount;
+  }
+
+  public void setKfAccount(String kfAccount) {
+    this.kfAccount = kfAccount;
+  }
+
+  public String getQrconnectRedirectUrl() {
+    return this.qrconnectRedirectUrl;
+  }
+
+  public void setQrconnectRedirectUrl(String qrconnectRedirectUrl) {
+    this.qrconnectRedirectUrl = qrconnectRedirectUrl;
+  }
+
+  public String getTemplateId() {
+    return this.templateId;
+  }
+
+  public void setTemplateId(String templateId) {
+    this.templateId = templateId;
+  }
+
+}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java
@@ -3,6 +3,7 @@
 import com.google.inject.Inject;
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.mp.api.ApiTestModule;
+import me.chanjar.weixin.mp.api.WxXmlMpInMemoryConfigStorage;
 import me.chanjar.weixin.mp.bean.WxMpGroup;
 import org.testng.Assert;
 import org.testng.annotations.Guice;
@@ -48,13 +49,13 @@ public void getGroupUpdate() throws WxErrorException {
   }
 
   public void testGroupQueryUserGroup() throws WxErrorException {
-    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
+    WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
     long groupid = this.wxService.getGroupService().userGetGroup(configStorage.getOpenid());
     Assert.assertTrue(groupid != -1l);
   }
 
   public void testGroupMoveUser() throws WxErrorException {
-    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
+    WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
     this.wxService.getGroupService().userUpdateGroup(configStorage.getOpenid(), this.wxService.getGroupService().groupGet().get(3).getId());
   }
 
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java
@@ -14,7 +14,7 @@
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.mp.api.ApiTestModule;
-import me.chanjar.weixin.mp.api.ApiTestModule.WxXmlMpInMemoryConfigStorage;
+import me.chanjar.weixin.mp.api.WxXmlMpInMemoryConfigStorage;
 import me.chanjar.weixin.mp.bean.WxMpCustomMessage;
 import me.chanjar.weixin.mp.bean.kefu.request.WxMpKfAccountRequest;
 import me.chanjar.weixin.mp.bean.kefu.result.WxMpKfInfo;
@@ -38,7 +38,7 @@ public class WxMpKefuServiceImplTest {
   protected WxMpServiceImpl wxService;
 
   public void testSendCustomMessage() throws WxErrorException {
-    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
+    WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService
         .getWxMpConfigStorage();
     WxMpCustomMessage message = new WxMpCustomMessage();
     message.setMsgType(WxConsts.CUSTOM_MSG_TEXT);
@@ -50,7 +50,7 @@ public void testSendCustomMessage() throws WxErrorException {
   }
 
   public void testSendCustomMessageWithKfAccount() throws WxErrorException {
-    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
+    WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService
         .getWxMpConfigStorage();
     WxMpCustomMessage message = new WxMpCustomMessage();
     message.setMsgType(WxConsts.CUSTOM_MSG_TEXT);
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java
@@ -7,6 +7,7 @@
 
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.mp.api.ApiTestModule;
+import me.chanjar.weixin.mp.api.WxXmlMpInMemoryConfigStorage;
 import me.chanjar.weixin.mp.bean.pay.WxRedpackResult;
 import me.chanjar.weixin.mp.bean.pay.WxSendRedpackRequest;
 import me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderRequest;
@@ -71,7 +72,7 @@ public void testSendRedpack() throws Exception {
     request.setClientIp("aaa");
     request.setMchBillno("aaaa");
     request
-        .setReOpenid(((ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid());
+        .setReOpenid(((WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid());
     WxRedpackResult redpackResult = this.wxService.getPayService().sendRedpack(request);
     System.err.println(redpackResult);
   }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java
@@ -1,14 +1,20 @@
 package me.chanjar.weixin.mp.api.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import org.testng.Assert;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
 import com.google.inject.Inject;
 
 import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.mp.api.ApiTestModule;
-import me.chanjar.weixin.mp.api.ApiTestModule.WxXmlMpInMemoryConfigStorage;
+import me.chanjar.weixin.mp.api.WxXmlMpInMemoryConfigStorage;
+import me.chanjar.weixin.mp.bean.WxMpTemplateData;
+import me.chanjar.weixin.mp.bean.WxMpTemplateMessage;
 
 @Test
 @Guice(modules = ApiTestModule.class)
@@ -82,9 +88,18 @@ public void testShortUrl() {
     Assert.fail("Not yet implemented");
   }
 
-  @Test
-  public void testTemplateSend() {
-    Assert.fail("Not yet implemented");
+  @Test(invocationCount = 100, threadPoolSize = 30)
+  public void testTemplateSend() throws WxErrorException {
+    SimpleDateFormat dateFormat = new SimpleDateFormat(
+        "yyyy-MM-dd HH:mm:ss.SSS");
+    WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService
+        .getWxMpConfigStorage();
+    WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
+        .toUser(configStorage.getOpenid())
+        .templateId(configStorage.getTemplateId()).build();
+    templateMessage.addWxMpTemplateData(
+        new WxMpTemplateData("first", dateFormat.format(new Date())));
+    this.wxService.templateSend(templateMessage);
   }
 
   @Test
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlacklistServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlacklistServiceImplTest.java
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java
diff --git a/weixin-java-mp/src/test/resources/test-config.sample.xml b/weixin-java-mp/src/test/resources/test-config.sample.xml
