From 8c862d8a489397bc1621568668dc37901e604b0a Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sat, 10 Sep 2016 13:59:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/chanjar/weixin/mp/api/ApiTestModule.java | 1 + .../weixin/mp/api/impl/WxMpServiceImplTest.java | 11 ++++------- 2 files changed, 5 insertions(+), 7 deletions(-) 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 index 4557c342..3955f87d 100644 --- 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 @@ -31,6 +31,7 @@ public class ApiTestModule implements Module { } } + @SuppressWarnings("unchecked") public static T fromXml(Class clazz, InputStream is) { XStream xstream = XStreamInitializer.getInstance(); xstream.alias("xml", clazz); 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 index 5791367b..33242ba4 100644 --- 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,5 +1,6 @@ package me.chanjar.weixin.mp.api.impl; +import org.testng.Assert; import org.testng.annotations.Guice; import org.testng.annotations.Test; @@ -9,8 +10,6 @@ import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.mp.api.ApiTestModule; import me.chanjar.weixin.mp.api.ApiTestModule.WxXmlMpInMemoryConfigStorage; -import org.testng.Assert; - @Test @Guice(modules = ApiTestModule.class) public class WxMpServiceImplTest { @@ -110,11 +109,9 @@ public class WxMpServiceImplTest { @Test public void testBuildQrConnectUrl() { - String qrConnectUrl = this.wxService - .buildQrConnectUrl( - ((WxXmlMpInMemoryConfigStorage) this.wxService - .getWxMpConfigStorage()).getOauth2redirectUri(), - WxConsts.QRCONNECT_SCOPE_SNSAPI_LOGIN, null); + String qrconnectRedirectUrl = ((WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getQrconnectRedirectUrl(); + String qrConnectUrl = this.wxService.buildQrConnectUrl(qrconnectRedirectUrl, + WxConsts.QRCONNECT_SCOPE_SNSAPI_LOGIN, null); Assert.assertNotNull(qrConnectUrl); System.out.println(qrConnectUrl); } From d49c3dce603d14fd4666fadda25fcb1a0c688966 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sat, 10 Sep 2016 14:11:49 +0800 Subject: [PATCH 2/2] fix some format --- .../api/impl/WxMpMaterialServiceImplTest.java | 39 +++++++++++++------ .../weixin/mp/demo/WxMpEndpointServlet.java | 17 ++++---- .../weixin/mp/demo/WxMpOAuth2Servlet.java | 4 +- 3 files changed, 41 insertions(+), 19 deletions(-) diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java index 6ab7c7c4..73349626 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java @@ -1,6 +1,24 @@ package me.chanjar.weixin.mp.api.impl; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import org.apache.commons.io.IOUtils; +import org.testng.Assert; +import org.testng.annotations.DataProvider; +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.bean.result.WxMediaUploadResult; import me.chanjar.weixin.common.exception.WxErrorException; @@ -9,17 +27,11 @@ import me.chanjar.weixin.mp.api.ApiTestModule; import me.chanjar.weixin.mp.bean.WxMpMaterial; import me.chanjar.weixin.mp.bean.WxMpMaterialArticleUpdate; import me.chanjar.weixin.mp.bean.WxMpMaterialNews; -import me.chanjar.weixin.mp.bean.result.*; -import org.apache.commons.io.IOUtils; -import org.testng.Assert; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Guice; -import org.testng.annotations.Test; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.*; +import me.chanjar.weixin.mp.bean.result.WxMpMaterialCountResult; +import me.chanjar.weixin.mp.bean.result.WxMpMaterialFileBatchGetResult; +import me.chanjar.weixin.mp.bean.result.WxMpMaterialNewsBatchGetResult; +import me.chanjar.weixin.mp.bean.result.WxMpMaterialUploadResult; +import me.chanjar.weixin.mp.bean.result.WxMpMaterialVideoInfoResult; /** * 素材管理相关接口的测试 @@ -199,6 +211,7 @@ public class WxMpMaterialServiceImplTest { @Test(dependsOnMethods = {"testUpdateNewsInfo"}) public void testMaterialNewsList() throws WxErrorException { WxMpMaterialNewsBatchGetResult wxMpMaterialNewsBatchGetResult = this.wxService.getMaterialService().materialNewsBatchGet(0, 20); + Assert.assertNotNull(wxMpMaterialNewsBatchGetResult); return; } @@ -207,6 +220,10 @@ public class WxMpMaterialServiceImplTest { WxMpMaterialFileBatchGetResult wxMpMaterialVoiceBatchGetResult = this.wxService.getMaterialService().materialFileBatchGet(WxConsts.MATERIAL_VOICE, 0, 20); WxMpMaterialFileBatchGetResult wxMpMaterialVideoBatchGetResult = this.wxService.getMaterialService().materialFileBatchGet(WxConsts.MATERIAL_VIDEO, 0, 20); WxMpMaterialFileBatchGetResult wxMpMaterialImageBatchGetResult = this.wxService.getMaterialService().materialFileBatchGet(WxConsts.MATERIAL_IMAGE, 0, 20); + + Assert.assertNotNull(wxMpMaterialVoiceBatchGetResult); + Assert.assertNotNull(wxMpMaterialVideoBatchGetResult); + Assert.assertNotNull(wxMpMaterialImageBatchGetResult); return; } diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpEndpointServlet.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpEndpointServlet.java index 2921e5fb..ae5fcba0 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpEndpointServlet.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpEndpointServlet.java @@ -1,5 +1,12 @@ package me.chanjar.weixin.mp.demo; +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import me.chanjar.weixin.common.util.StringUtils; import me.chanjar.weixin.mp.api.WxMpConfigStorage; import me.chanjar.weixin.mp.api.WxMpMessageRouter; @@ -7,16 +14,11 @@ import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - /** * @author Daniel Qian */ public class WxMpEndpointServlet extends HttpServlet { + private static final long serialVersionUID = 1L; protected WxMpConfigStorage wxMpConfigStorage; protected WxMpService wxMpService; @@ -29,7 +31,8 @@ public class WxMpEndpointServlet extends HttpServlet { this.wxMpMessageRouter = wxMpMessageRouter; } - @Override protected void service(HttpServletRequest request, HttpServletResponse response) + @Override + protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/html;charset=utf-8"); diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpOAuth2Servlet.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpOAuth2Servlet.java index e0291b10..b5a4f5f6 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpOAuth2Servlet.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpOAuth2Servlet.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; public class WxMpOAuth2Servlet extends HttpServlet { + private static final long serialVersionUID = 1L; protected WxMpService wxMpService; @@ -19,7 +20,8 @@ public class WxMpOAuth2Servlet extends HttpServlet { this.wxMpService = wxMpService; } - @Override protected void service(HttpServletRequest request, HttpServletResponse response) + @Override + protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/html;charset=utf-8");