Merge branch 'master' into develop

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

@@ -44,6 +44,7 @@ public class ApiTestModule implements Module {
 
     private String openId;
     private String kfAccount;
+    private String qrconnectRedirectUrl;
 
     public String getOpenId() {
       return this.openId;
@@ -66,6 +67,14 @@ public class ApiTestModule implements Module {
       this.kfAccount = kfAccount;
     }
 
+    public String getQrconnectRedirectUrl() {
+      return this.qrconnectRedirectUrl;
+    }
+
+    public void setQrconnectRedirectUrl(String qrconnectRedirectUrl) {
+      this.qrconnectRedirectUrl = qrconnectRedirectUrl;
+    }
+
   }
 
 }

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

@@ -0,0 +1,162 @@
+package me.chanjar.weixin.mp.api.impl;
+
+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.mp.api.ApiTestModule;
+import me.chanjar.weixin.mp.api.ApiTestModule.WxXmlMpInMemoryConfigStorage;
+
+import org.testng.Assert;
+
+@Test
+@Guice(modules = ApiTestModule.class)
+public class WxMpServiceImplTest {
+
+  @Inject
+  private WxMpServiceImpl wxService;
+
+  @Test
+  public void testCheckSignature() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testGetAccessToken() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testGetAccessTokenBoolean() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testGetJsapiTicket() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testGetJsapiTicketBoolean() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testCreateJsapiSignature() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testCustomMessageSend() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testMassNewsUpload() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testMassVideoUpload() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testMassGroupMessageSend() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testMassOpenIdsMessageSend() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testMassMessagePreview() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testShortUrl() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testTemplateSend() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testSetIndustry() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testGetIndustry() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testSemanticQuery() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testOauth2buildAuthorizationUrl() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testBuildQrConnectUrl() {
+    String qrConnectUrl = this.wxService
+        .buildQrConnectUrl(
+            ((WxXmlMpInMemoryConfigStorage) this.wxService
+                .getWxMpConfigStorage()).getOauth2redirectUri(),
+            WxConsts.QRCONNECT_SCOPE_SNSAPI_LOGIN, null);
+    Assert.assertNotNull(qrConnectUrl);
+    System.out.println(qrConnectUrl);
+  }
+
+  @Test
+  public void testOauth2getAccessToken() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testOauth2refreshAccessToken() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testOauth2getUserInfo() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testOauth2validateAccessToken() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testGetCallbackIP() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testGet() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testPost() {
+    Assert.fail("Not yet implemented");
+  }
+
+  @Test
+  public void testExecute() {
+    Assert.fail("Not yet implemented");
+  }
+
+}

weixin-java-mp/src/test/resources/test-config.sample.xml

@@ -7,5 +7,6 @@
     <expiresTime>可以不填写</expiresTime>
     <openId>某个加你公众号的用户的openId</openId>
     <oauth2redirectUri>网页授权获取用户信息回调地址</oauth2redirectUri>
+    <qrconnectRedirectUrl>网页应用授权登陆回调地址</qrconnectRedirectUrl>
     <kfAccount>完整客服账号，格式为：账号前缀@公众号微信号</kfAccount>
 </xml>