fix some warnings in test files

Author: binarywang

weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpCustomMessageAPITest.java

@@ -21,7 +21,7 @@ public class WxMpCustomMessageAPITest {
   protected WxMpServiceImpl wxService;
 
   public void testSendCustomMessage() throws WxErrorException {
-    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) wxService.getWxMpConfigStorage();
+    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
     WxMpCustomMessage message = new WxMpCustomMessage();
     message.setMsgType(WxConsts.CUSTOM_MSG_TEXT);
     message.setToUser(configStorage.getOpenId());
@@ -31,7 +31,7 @@ public void testSendCustomMessage() throws WxErrorException {
   }
 
   public void testSendCustomMessageWithKfAccount() throws WxErrorException {
-    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) wxService.getWxMpConfigStorage();
+    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
     WxMpCustomMessage message = new WxMpCustomMessage();
     message.setMsgType(WxConsts.CUSTOM_MSG_TEXT);
     message.setToUser(configStorage.getOpenId());

weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpJsAPITest.java

@@ -24,7 +24,7 @@ public class WxMpJsAPITest {
 
 
   public void testJsapiTicket() throws WxErrorException {
-    String jsapiTicket = wxService.getJsapiTicket(false);
+    String jsapiTicket = this.wxService.getJsapiTicket(false);
     System.out.println(jsapiTicket);
     Assert.assertNotNull(jsapiTicket);
   }

weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java

@@ -1,6 +1,15 @@
 package me.chanjar.weixin.mp.api;
 
+import java.io.IOException;
+import java.io.InputStream;
+
+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;
@@ -11,13 +20,6 @@
 import me.chanjar.weixin.mp.bean.WxMpMassVideo;
 import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
 import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult;
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Guice;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.io.InputStream;
 
 /**
  * 测试群发消息
@@ -34,27 +36,32 @@ public class WxMpMassMessageAPITest {
   @Test
   public void testTextMassOpenIdsMessageSend() throws WxErrorException {
     // 发送群发消息
-    ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) wxService.getWxMpConfigStorage();
+    ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
+        .getWxMpConfigStorage();
     WxMpMassOpenIdsMessage massMessage = new WxMpMassOpenIdsMessage();
     massMessage.setMsgType(WxConsts.MASS_MSG_TEXT);
     massMessage.setContent("测试群发消息\n欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
     massMessage.getToUsers().add(configProvider.getOpenId());
 
-    WxMpMassSendResult massResult = wxService.massOpenIdsMessageSend(massMessage);
+    WxMpMassSendResult massResult = this.wxService
+        .massOpenIdsMessageSend(massMessage);
     Assert.assertNotNull(massResult);
     Assert.assertNotNull(massResult.getMsgId());
   }
 
   @Test(dataProvider="massMessages")
-  public void testMediaMassOpenIdsMessageSend(String massMsgType, String mediaId) throws WxErrorException, IOException {
+  public void testMediaMassOpenIdsMessageSend(String massMsgType,
+      String mediaId) throws WxErrorException {
     // 发送群发消息
-    ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) wxService.getWxMpConfigStorage();
+    ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
+        .getWxMpConfigStorage();
     WxMpMassOpenIdsMessage massMessage = new WxMpMassOpenIdsMessage();
     massMessage.setMsgType(massMsgType);
     massMessage.setMediaId(mediaId);
     massMessage.getToUsers().add(configProvider.getOpenId());
 
-    WxMpMassSendResult massResult = wxService.massOpenIdsMessageSend(massMessage);
+    WxMpMassSendResult massResult = this.wxService
+        .massOpenIdsMessageSend(massMessage);
     Assert.assertNotNull(massResult);
     Assert.assertNotNull(massResult.getMsgId());
   }
@@ -64,35 +71,42 @@ public void testTextMassGroupMessageSend() throws WxErrorException {
     WxMpMassGroupMessage massMessage = new WxMpMassGroupMessage();
     massMessage.setMsgtype(WxConsts.MASS_MSG_TEXT);
     massMessage.setContent("测试群发消息\n欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
-    massMessage.setGroupId(wxService.getGroupService().groupGet().get(0).getId());
+    massMessage
+        .setGroupId(this.wxService.getGroupService().groupGet().get(0).getId());
 
-    WxMpMassSendResult massResult = wxService.massGroupMessageSend(massMessage);
+    WxMpMassSendResult massResult = this.wxService
+        .massGroupMessageSend(massMessage);
     Assert.assertNotNull(massResult);
     Assert.assertNotNull(massResult.getMsgId());
   }
 
   @Test(dataProvider="massMessages")
-  public void testMediaMassGroupMessageSend(String massMsgType, String mediaId) throws WxErrorException, IOException {
+  public void testMediaMassGroupMessageSend(String massMsgType, String mediaId)
+      throws WxErrorException {
     WxMpMassGroupMessage massMessage = new WxMpMassGroupMessage();
     massMessage.setMsgtype(massMsgType);
     massMessage.setMediaId(mediaId);
-    massMessage.setGroupId(wxService.getGroupService().groupGet().get(0).getId());
+    massMessage
+        .setGroupId(this.wxService.getGroupService().groupGet().get(0).getId());
 
-    WxMpMassSendResult massResult = wxService.massGroupMessageSend(massMessage);
+    WxMpMassSendResult massResult = this.wxService
+        .massGroupMessageSend(massMessage);
     Assert.assertNotNull(massResult);
     Assert.assertNotNull(massResult.getMsgId());
   }
 
   @DataProvider
   public Object[][] massMessages() throws WxErrorException, IOException {
     Object[][] messages = new Object[4][];
+
     /*
      * 视频素材
      */
-    {
+    try (InputStream inputStream = ClassLoader
+        .getSystemResourceAsStream("mm.mp4")) {
       // 上传视频到媒体库
-      InputStream inputStream = ClassLoader.getSystemResourceAsStream("mm.mp4");
-      WxMediaUploadResult uploadMediaRes = wxService.getMaterialService().mediaUpload(WxConsts.MEDIA_VIDEO, WxConsts.FILE_MP4, inputStream);
+      WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
+          .mediaUpload(WxConsts.MEDIA_VIDEO, WxConsts.FILE_MP4, inputStream);
       Assert.assertNotNull(uploadMediaRes);
       Assert.assertNotNull(uploadMediaRes.getMediaId());
 
@@ -101,38 +115,44 @@ public Object[][] massMessages() throws WxErrorException, IOException {
       video.setTitle("测试标题");
       video.setDescription("测试描述");
       video.setMediaId(uploadMediaRes.getMediaId());
-      WxMpMassUploadResult uploadResult = wxService.massVideoUpload(video);
+      WxMpMassUploadResult uploadResult = this.wxService.massVideoUpload(video);
       Assert.assertNotNull(uploadResult);
       Assert.assertNotNull(uploadResult.getMediaId());
       messages[0] = new Object[] { WxConsts.MASS_MSG_VIDEO, uploadResult.getMediaId() };
     }
+
     /**
      * 图片素材
      */
-    {
-      InputStream inputStream = ClassLoader.getSystemResourceAsStream("mm.jpeg");
-      WxMediaUploadResult uploadMediaRes = wxService.getMaterialService().mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, inputStream);
+    try (InputStream inputStream = ClassLoader
+        .getSystemResourceAsStream("mm.jpeg")) {
+      WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
+          .mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, inputStream);
       Assert.assertNotNull(uploadMediaRes);
       Assert.assertNotNull(uploadMediaRes.getMediaId());
       messages[1] = new Object[] { WxConsts.MASS_MSG_IMAGE, uploadMediaRes.getMediaId() };
     }
+
     /**
      * 语音素材
      */
-    {
-      InputStream inputStream = ClassLoader.getSystemResourceAsStream("mm.mp3");
-      WxMediaUploadResult uploadMediaRes = wxService.getMaterialService().mediaUpload(WxConsts.MEDIA_VOICE, WxConsts.FILE_MP3, inputStream);
+    try (InputStream inputStream = ClassLoader
+        .getSystemResourceAsStream("mm.mp3")) {
+      WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
+          .mediaUpload(WxConsts.MEDIA_VOICE, WxConsts.FILE_MP3, inputStream);
       Assert.assertNotNull(uploadMediaRes);
       Assert.assertNotNull(uploadMediaRes.getMediaId());
       messages[2] = new Object[] { WxConsts.MASS_MSG_VOICE, uploadMediaRes.getMediaId() };
     }
+
     /**
      * 图文素材
      */
-    {
+    try (InputStream inputStream = ClassLoader
+        .getSystemResourceAsStream("mm.jpeg")) {
       // 上传照片到媒体库
-      InputStream inputStream = ClassLoader.getSystemResourceAsStream("mm.jpeg");
-      WxMediaUploadResult uploadMediaRes = wxService.getMaterialService().mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, inputStream);
+      WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
+          .mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, inputStream);
       Assert.assertNotNull(uploadMediaRes);
       Assert.assertNotNull(uploadMediaRes.getMediaId());
 
@@ -154,11 +174,13 @@ public Object[][] massMessages() throws WxErrorException, IOException {
       article2.setDigest("摘要2");
       news.addArticle(article2);
 
-      WxMpMassUploadResult massUploadResult = wxService.massNewsUpload(news);
+      WxMpMassUploadResult massUploadResult = this.wxService
+          .massNewsUpload(news);
       Assert.assertNotNull(massUploadResult);
       Assert.assertNotNull(uploadMediaRes.getMediaId());
       messages[3] = new Object[] { WxConsts.MASS_MSG_NEWS, massUploadResult.getMediaId() };
     }
+
     return messages;
   }
 

weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java

@@ -163,7 +163,7 @@ public WxEchoMpMessageHandler(StringBuffer sb, String echoStr) {
     @Override
     public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService,
         WxSessionManager sessionManager) {
-      sb.append(this.echoStr).append(',');
+      this.sb.append(this.echoStr).append(',');
       return null;
     }
 

weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMiscAPITest.java

@@ -23,7 +23,7 @@ public class WxMpMiscAPITest {
 
   @Test
   public void testGetCallbackIP() throws WxErrorException {
-    String[] ipArray = wxService.getCallbackIP();
+    String[] ipArray = this.wxService.getCallbackIP();
     System.out.println(Arrays.toString(ipArray));
     Assert.assertNotNull(ipArray);
     Assert.assertNotEquals(ipArray.length, 0);

weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpShortUrlAPITest.java

@@ -20,7 +20,7 @@ public class WxMpShortUrlAPITest {
   protected WxMpServiceImpl wxService;
 
   public void testShortUrl() throws WxErrorException {
-    String shortUrl = wxService.shortUrl("www.baidu.com");
+    String shortUrl = this.wxService.shortUrl("www.baidu.com");
     Assert.assertNotNull(shortUrl);
   }
 

weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java

@@ -42,7 +42,7 @@ public void testGetCardApiTicketWithParam() throws Exception {
   public void testCreateCardApiSignature() throws Exception {
     //app_id, card_id, card_type, code, openid, location_id
 
-    String[] param = {"123", cardId, "", code, openid, ""};
+    String[] param = {"123", this.cardId, "", this.code, this.openid, ""};
     WxCardApiSignature cardApiSignature = this.wxService.getCardService().createCardApiSignature(param);
     assertNotNull(cardApiSignature);
     System.out.println(cardApiSignature);
@@ -58,34 +58,34 @@ public void testDecryptCardCode() throws Exception {
 
   @Test
   public void testQueryCardCode() throws Exception {
-    WxMpCardResult wxMpCardResult = this.wxService.getCardService().queryCardCode(cardId, code, false);
+    WxMpCardResult wxMpCardResult = this.wxService.getCardService().queryCardCode(this.cardId, this.code, false);
     assertNotNull(wxMpCardResult);
     System.out.println(wxMpCardResult);
   }
 
   @Test
   public void testConsumeCardCode() throws Exception {
-    String result = this.wxService.getCardService().consumeCardCode(code);
+    String result = this.wxService.getCardService().consumeCardCode(this.code);
     assertNotNull(result);
     System.out.println(result);
   }
 
   @Test
   public void testConsumeCardCodeWithCardId() throws Exception {
-    String result = this.wxService.getCardService().consumeCardCode(code, cardId);
+    String result = this.wxService.getCardService().consumeCardCode(this.code, this.cardId);
     assertNotNull(result);
     System.out.println(result);
   }
 
   @Test
   public void testMarkCardCode() throws Exception {
-    this.wxService.getCardService().markCardCode(code, cardId, openid, true);
+    this.wxService.getCardService().markCardCode(this.code, this.cardId, this.openid, true);
     System.out.println("done");
   }
 
   @Test
   public void testGetCardDetail() throws Exception {
-    String result = this.wxService.getCardService().getCardDetail(cardId);
+    String result = this.wxService.getCardService().getCardDetail(this.cardId);
     assertNotNull(result);
     System.out.println(result);
   }

weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java

@@ -35,15 +35,15 @@ public void testGroupGet() throws WxErrorException {
     Assert.assertNotNull(groupList);
     Assert.assertTrue(groupList.size() > 0);
     for (WxMpGroup g : groupList) {
-      group = g;
+      this.group = g;
       Assert.assertNotNull(g.getName());
     }
   }
 
   @Test(dependsOnMethods={"testGroupGet", "testGroupCreate"})
   public void getGroupUpdate() throws WxErrorException {
-    group.setName("分组改名");
-    this.wxService.getGroupService().groupUpdate(group);
+    this.group.setName("分组改名");
+    this.wxService.getGroupService().groupUpdate(this.group);
   }
 
 }