使用IDEA统一格式化测试代码

2026-03-10 00:13:40 +08:00 · 2017-01-23 16:54:48 +08:00
parent 123eb5088d
commit ff1b69a38f
45 changed files with 591 additions and 642 deletions
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoGuessNumberHandler.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoGuessNumberHandler.java
@@ -1,9 +1,5 @@
 package me.chanjar.weixin.mp.demo;

-import java.util.Map;
-import java.util.Random;
-import java.util.regex.Pattern;
-
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.session.WxSession;
 import me.chanjar.weixin.common.session.WxSessionManager;
@@ -14,6 +10,10 @@ import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;

+import java.util.Map;
+import java.util.Random;
+import java.util.regex.Pattern;
+
 public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMatcher {

  private Random random = new Random();
@@ -35,7 +35,7 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa

  @Override
  public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService,
-      WxSessionManager sessionManager) throws WxErrorException {
+                                  WxSessionManager sessionManager) throws WxErrorException {

    if (isUserWantGuess(wxMessage)) {
      letsGo(wxMessage, wxMpService, sessionManager);
@@ -53,17 +53,17 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa
    WxSession session = sessionManager.getSession(wxMessage.getFromUser());
    if (session.getAttribute("guessing") == null) {
      WxMpKefuMessage m = WxMpKefuMessage
-          .TEXT()
-          .toUser(wxMessage.getFromUser())
-          .content("请猜一个100以内的数字")
-          .build();
+        .TEXT()
+        .toUser(wxMessage.getFromUser())
+        .content("请猜一个100以内的数字")
+        .build();
      wxMpService.getKefuService().sendKefuMessage(m);
    } else {
      WxMpKefuMessage m = WxMpKefuMessage
-          .TEXT()
-          .toUser(wxMessage.getFromUser())
-          .content("放弃了吗？那请重新猜一个100以内的数字")
-          .build();
+        .TEXT()
+        .toUser(wxMessage.getFromUser())
+        .content("放弃了吗？那请重新猜一个100以内的数字")
+        .build();
      wxMpService.getKefuService().sendKefuMessage(m);
    }

@@ -88,25 +88,25 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa
    int guessNumber = Integer.valueOf(wxMessage.getContent());
    if (guessNumber < answer) {
      WxMpKefuMessage m = WxMpKefuMessage
-          .TEXT()
-          .toUser(wxMessage.getFromUser())
-          .content("小了")
-          .build();
+        .TEXT()
+        .toUser(wxMessage.getFromUser())
+        .content("小了")
+        .build();
      wxMpService.getKefuService().sendKefuMessage(m);

    } else if (guessNumber > answer) {
      WxMpKefuMessage m = WxMpKefuMessage
-          .TEXT()
-          .toUser(wxMessage.getFromUser())
-          .content("大了")
-          .build();
+        .TEXT()
+        .toUser(wxMessage.getFromUser())
+        .content("大了")
+        .build();
      wxMpService.getKefuService().sendKefuMessage(m);
    } else {
      WxMpKefuMessage m = WxMpKefuMessage
-          .TEXT()
-          .toUser(wxMessage.getFromUser())
-          .content("Bingo!")
-          .build();
+        .TEXT()
+        .toUser(wxMessage.getFromUser())
+        .content("Bingo!")
+        .build();
      session.removeAttribute("guessing");
      wxMpService.getKefuService().sendKefuMessage(m);
    }
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoImageHandler.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoImageHandler.java
@@ -15,17 +15,17 @@ import java.util.Map;
 public class DemoImageHandler implements WxMpMessageHandler {
  @Override
  public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context,
-      WxMpService wxMpService, WxSessionManager sessionManager) {
+                                  WxMpService wxMpService, WxSessionManager sessionManager) {
    try {
      WxMediaUploadResult wxMediaUploadResult = wxMpService.getMaterialService()
-          .mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, ClassLoader.getSystemResourceAsStream("mm.jpeg"));
+        .mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, ClassLoader.getSystemResourceAsStream("mm.jpeg"));
      WxMpXmlOutImageMessage m
-          = WxMpXmlOutMessage
-          .IMAGE()
-          .mediaId(wxMediaUploadResult.getMediaId())
-          .fromUser(wxMessage.getToUser())
-          .toUser(wxMessage.getFromUser())
-          .build();
+        = WxMpXmlOutMessage
+        .IMAGE()
+        .mediaId(wxMediaUploadResult.getMediaId())
+        .fromUser(wxMessage.getToUser())
+        .toUser(wxMessage.getFromUser())
+        .build();
      return m;
    } catch (WxErrorException e) {
      e.printStackTrace();
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoLogHandler.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoLogHandler.java
@@ -14,7 +14,7 @@ import java.util.Map;
 public class DemoLogHandler implements WxMpMessageHandler {
  @Override
  public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService,
-      WxSessionManager sessionManager) {
+                                  WxSessionManager sessionManager) {
    System.out.println(wxMessage.toString());
    return null;
  }
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoOAuth2Handler.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoOAuth2Handler.java
@@ -15,13 +15,13 @@ import java.util.Map;
 public class DemoOAuth2Handler implements WxMpMessageHandler {
  @Override
  public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
-      Map<String, Object> context, WxMpService wxMpService,
-      WxSessionManager sessionManager) {
+                                  Map<String, Object> context, WxMpService wxMpService,
+                                  WxSessionManager sessionManager) {
    String href = "<a href=\"" + wxMpService.oauth2buildAuthorizationUrl(
-        wxMpService.getWxMpConfigStorage().getOauth2redirectUri(),
-        WxConsts.OAUTH2_SCOPE_USER_INFO, null) + "\">测试oauth2</a>";
+      wxMpService.getWxMpConfigStorage().getOauth2redirectUri(),
+      WxConsts.OAUTH2_SCOPE_USER_INFO, null) + "\">测试oauth2</a>";
    return WxMpXmlOutMessage.TEXT().content(href)
-        .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
-        .build();
+      .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
+      .build();
  }
 }
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoTextHandler.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoTextHandler.java
@@ -15,10 +15,10 @@ import java.util.Map;
 public class DemoTextHandler implements WxMpMessageHandler {
  @Override
  public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context,
-      WxMpService wxMpService, WxSessionManager sessionManager) {
+                                  WxMpService wxMpService, WxSessionManager sessionManager) {
    WxMpXmlOutTextMessage m
-        = WxMpXmlOutMessage.TEXT().content("测试加密消息").fromUser(wxMessage.getToUser())
-        .toUser(wxMessage.getFromUser()).build();
+      = WxMpXmlOutMessage.TEXT().content("测试加密消息").fromUser(wxMessage.getToUser())
+      .toUser(wxMessage.getFromUser()).build();
    return m;
  }

--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoInMemoryConfigStorage.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoInMemoryConfigStorage.java
@@ -13,17 +13,16 @@ import java.io.InputStream;
@XStreamAlias("xml")
 class WxMpDemoInMemoryConfigStorage extends WxMpInMemoryConfigStorage {

-  @Override
-  public String toString() {
-    return "SimpleWxConfigProvider [appId=" + this.appId + ", secret=" + this.secret + ", accessToken=" + this.accessToken
-        + ", expiresTime=" + this.expiresTime + ", token=" + this.token + ", aesKey=" + this.aesKey + "]";
-  }
-
-
  public static WxMpDemoInMemoryConfigStorage fromXml(InputStream is) {
    XStream xstream = XStreamInitializer.getInstance();
    xstream.processAnnotations(WxMpDemoInMemoryConfigStorage.class);
    return (WxMpDemoInMemoryConfigStorage) xstream.fromXML(is);
  }

+  @Override
+  public String toString() {
+    return "SimpleWxConfigProvider [appId=" + this.appId + ", secret=" + this.secret + ", accessToken=" + this.accessToken
+      + ", expiresTime=" + this.expiresTime + ", token=" + this.token + ", aesKey=" + this.aesKey + "]";
+  }
+
 }
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoServer.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoServer.java
@@ -1,18 +1,17 @@
 package me.chanjar.weixin.mp.demo;

-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.mp.api.WxMpConfigStorage;
 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
 import me.chanjar.weixin.mp.api.WxMpMessageRouter;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+
+import java.io.IOException;
+import java.io.InputStream;

 public class WxMpDemoServer {

@@ -29,12 +28,12 @@ public class WxMpDemoServer {
    server.setHandler(servletHandler);

    ServletHolder endpointServletHolder = new ServletHolder(
-        new WxMpEndpointServlet(wxMpConfigStorage, wxMpService,
-            wxMpMessageRouter));
+      new WxMpEndpointServlet(wxMpConfigStorage, wxMpService,
+        wxMpMessageRouter));
    servletHandler.addServletWithMapping(endpointServletHolder, "/*");

    ServletHolder oauthServletHolder = new ServletHolder(
-        new WxMpOAuth2Servlet(wxMpService));
+      new WxMpOAuth2Servlet(wxMpService));
    servletHandler.addServletWithMapping(oauthServletHolder, "/oauth2/*");

    server.start();
@@ -43,9 +42,9 @@ public class WxMpDemoServer {

  private static void initWeixin() {
    try (InputStream is1 = ClassLoader
-        .getSystemResourceAsStream("test-config.xml")) {
+      .getSystemResourceAsStream("test-config.xml")) {
      WxMpDemoInMemoryConfigStorage config = WxMpDemoInMemoryConfigStorage
-          .fromXml(is1);
+        .fromXml(is1);

      wxMpConfigStorage = config;
      wxMpService = new WxMpServiceImpl();
@@ -59,11 +58,11 @@ public class WxMpDemoServer {

      wxMpMessageRouter = new WxMpMessageRouter(wxMpService);
      wxMpMessageRouter.rule().handler(logHandler).next().rule()
-          .msgType(WxConsts.XML_MSG_TEXT).matcher(guessNumberHandler)
-          .handler(guessNumberHandler).end().rule().async(false).content("哈哈")
-          .handler(textHandler).end().rule().async(false).content("图片")
-          .handler(imageHandler).end().rule().async(false).content("oauth")
-          .handler(oauth2handler).end();
+        .msgType(WxConsts.XML_MSG_TEXT).matcher(guessNumberHandler)
+        .handler(guessNumberHandler).end().rule().async(false).content("哈哈")
+        .handler(textHandler).end().rule().async(false).content("图片")
+        .handler(imageHandler).end().rule().async(false).content("oauth")
+        .handler(oauth2handler).end();
    } catch (IOException e) {
      e.printStackTrace();
    }
--- 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
@@ -23,7 +23,7 @@ public class WxMpEndpointServlet extends HttpServlet {
  protected WxMpMessageRouter wxMpMessageRouter;

  public WxMpEndpointServlet(WxMpConfigStorage wxMpConfigStorage, WxMpService wxMpService,
-      WxMpMessageRouter wxMpMessageRouter) {
+                             WxMpMessageRouter wxMpMessageRouter) {
    this.wxMpConfigStorage = wxMpConfigStorage;
    this.wxMpService = wxMpService;
    this.wxMpMessageRouter = wxMpMessageRouter;
@@ -31,7 +31,7 @@ public class WxMpEndpointServlet extends HttpServlet {

  @Override
  protected void service(HttpServletRequest request, HttpServletResponse response)
-      throws IOException {
+    throws IOException {

    response.setContentType("text/html;charset=utf-8");
    response.setStatus(HttpServletResponse.SC_OK);
@@ -54,8 +54,8 @@ public class WxMpEndpointServlet extends HttpServlet {
    }

    String encryptType = StringUtils.isBlank(request.getParameter("encrypt_type")) ?
-        "raw" :
-        request.getParameter("encrypt_type");
+      "raw" :
+      request.getParameter("encrypt_type");

    if ("raw".equals(encryptType)) {
      // 明文传输的消息
--- 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
@@ -1,16 +1,15 @@
 package me.chanjar.weixin.mp.demo;

-import java.io.IOException;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;

+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 public class WxMpOAuth2Servlet extends HttpServlet {
  private static final long serialVersionUID = 1L;

@@ -22,7 +21,7 @@ public class WxMpOAuth2Servlet extends HttpServlet {

  @Override
  protected void service(HttpServletRequest request, HttpServletResponse response)
-      throws IOException {
+    throws IOException {

    response.setContentType("text/html;charset=utf-8");
    response.setStatus(HttpServletResponse.SC_OK);