From 7deb25b4bb8770b0ba0ad7b20724ad877d5e8e59 Mon Sep 17 00:00:00 2001
From: BinaryWang <wbchn@qq.com>
Date: Thu, 30 Jun 2016 18:52:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/mp/api/WxMpBaseAPITest.java        |  4 +--
 .../weixin/mp/api/WxMpMediaAPITest.java       | 28 ++++++++++---------
 .../weixin/mp/api/WxMpQrCodeAPITest.java      | 14 +++++++---
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java
index c4210b57d..49d056af2 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java
@@ -20,9 +20,9 @@ public class WxMpBaseAPITest {
   protected WxMpServiceImpl wxService;
 
   public void testRefreshAccessToken() throws WxErrorException {
-    WxMpConfigStorage configStorage = wxService.wxMpConfigStorage;
+    WxMpConfigStorage configStorage = this.wxService.wxMpConfigStorage;
     String before = configStorage.getAccessToken();
-    wxService.getAccessToken(false);
+    this.wxService.getAccessToken(false);
 
     String after = configStorage.getAccessToken();
     Assert.assertNotEquals(before, after);
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMediaAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMediaAPITest.java
index 0df7103d5..b2fbc8514 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMediaAPITest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMediaAPITest.java
@@ -26,21 +26,23 @@ public class WxMpMediaAPITest {
   @Inject
   protected WxMpServiceImpl wxService;
 
-  private List<String> media_ids = new ArrayList<String>();
+  private List<String> media_ids = new ArrayList<>();
   
   @Test(dataProvider="uploadMedia")
   public void testUploadMedia(String mediaType, String fileType, String fileName) throws WxErrorException, IOException {
-    InputStream inputStream = ClassLoader.getSystemResourceAsStream(fileName);
-    WxMediaUploadResult res = wxService.mediaUpload(mediaType, fileType, inputStream);
-    Assert.assertNotNull(res.getType());
-    Assert.assertNotNull(res.getCreatedAt());
-    Assert.assertTrue(res.getMediaId() != null || res.getThumbMediaId() != null);
-    
-    if (res.getMediaId() != null) {
-      media_ids.add(res.getMediaId());
-    }
-    if (res.getThumbMediaId() != null) {
-      media_ids.add(res.getThumbMediaId());
+    try(InputStream inputStream = ClassLoader.getSystemResourceAsStream(fileName)){
+      WxMediaUploadResult res = this.wxService.mediaUpload(mediaType, fileType, inputStream);
+      Assert.assertNotNull(res.getType());
+      Assert.assertNotNull(res.getCreatedAt());
+      Assert.assertTrue(res.getMediaId() != null || res.getThumbMediaId() != null);
+      
+      if (res.getMediaId() != null) {
+        this.media_ids.add(res.getMediaId());
+      }
+      
+      if (res.getThumbMediaId() != null) {
+        this.media_ids.add(res.getThumbMediaId());
+      }
     }
   }
   
@@ -56,7 +58,7 @@ public class WxMpMediaAPITest {
   
   @Test(dependsOnMethods = { "testUploadMedia" }, dataProvider="downloadMedia")
   public void testDownloadMedia(String media_id) throws WxErrorException {
-    wxService.mediaDownload(media_id);
+    this.wxService.mediaDownload(media_id);
   }
   
   @DataProvider
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpQrCodeAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpQrCodeAPITest.java
index 1fa76e493..7af300c9c 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpQrCodeAPITest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpQrCodeAPITest.java
@@ -22,23 +22,29 @@ public class WxMpQrCodeAPITest {
   protected WxMpServiceImpl wxService;
 
   public void testQrCodeCreateTmpTicket() throws WxErrorException {
-    WxMpQrCodeTicket ticket = wxService.qrCodeCreateTmpTicket(1, null);
+    WxMpQrCodeTicket ticket = this.wxService.qrCodeCreateTmpTicket(1, null);
     Assert.assertNotNull(ticket.getUrl());
     Assert.assertNotNull(ticket.getTicket());
     Assert.assertTrue(ticket.getExpire_seconds() != -1);
   }
 
   public void testQrCodeCreateLastTicket() throws WxErrorException {
-    WxMpQrCodeTicket ticket = wxService.qrCodeCreateLastTicket(1);
+    WxMpQrCodeTicket ticket = this.wxService.qrCodeCreateLastTicket(1);
     Assert.assertNotNull(ticket.getUrl());
     Assert.assertNotNull(ticket.getTicket());
     Assert.assertTrue(ticket.getExpire_seconds() == -1);
   }
 
   public void testQrCodePicture() throws WxErrorException {
-    WxMpQrCodeTicket ticket = wxService.qrCodeCreateLastTicket(1);
-    File file = wxService.qrCodePicture(ticket);
+    WxMpQrCodeTicket ticket = this.wxService.qrCodeCreateLastTicket(1);
+    File file = this.wxService.qrCodePicture(ticket);
     Assert.assertNotNull(file);
   }
+  
+  public void testQrCodePictureUrl() throws WxErrorException {
+    WxMpQrCodeTicket ticket = this.wxService.qrCodeCreateLastTicket(1);
+    String url = this.wxService.qrCodePictureUrl(ticket.getTicket());
+    Assert.assertNotNull(url);
+  }
 
 }