Skip to content

Commit ff1b69a

Browse files
binarywangbinarywang
committed
使用IDEA统一格式化测试代码
1 parent 123eb50 commit ff1b69a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+591
-642
lines changed

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
import me.chanjar.weixin.common.exception.WxErrorException;
55
import me.chanjar.weixin.mp.api.test.ApiTestModule;
66
import org.apache.commons.lang3.StringUtils;
7-
import org.testng.Assert;
8-
import org.testng.annotations.Guice;
9-
import org.testng.annotations.Test;
7+
import org.testng.*;
8+
import org.testng.annotations.*;
109

1110
/**
1211
* 基础API测试
13-
* @author chanjarster
1412
*
13+
* @author chanjarster
1514
*/
1615
@Test(groups = "baseAPI")
1716
@Guice(modules = ApiTestModule.class)

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBusyRetryTest.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import me.chanjar.weixin.common.exception.WxErrorException;
55
import me.chanjar.weixin.common.util.http.RequestExecutor;
66
import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
7-
import org.testng.annotations.DataProvider;
8-
import org.testng.annotations.Test;
7+
import org.testng.annotations.*;
98

109
import java.util.concurrent.ExecutionException;
1110
import java.util.concurrent.ExecutorService;
@@ -15,14 +14,14 @@
1514
@Test
1615
public class WxMpBusyRetryTest {
1716

18-
@DataProvider(name="getService")
17+
@DataProvider(name = "getService")
1918
public Object[][] getService() {
2019
WxMpService service = new WxMpServiceImpl() {
2120

2221
@Override
2322
protected synchronized <T, E> T executeInternal(
24-
RequestExecutor<T, E> executor, String uri, E data)
25-
throws WxErrorException {
23+
RequestExecutor<T, E> executor, String uri, E data)
24+
throws WxErrorException {
2625
this.log.info("Executed");
2726
WxError error = new WxError();
2827
error.setErrorCode(-1);
@@ -32,7 +31,7 @@ protected synchronized <T, E> T executeInternal(
3231

3332
service.setMaxRetryTimes(3);
3433
service.setRetrySleepMillis(500);
35-
return new Object[][] { { service } };
34+
return new Object[][]{{service}};
3635
}
3736

3837
@Test(dataProvider = "getService", expectedExceptions = RuntimeException.class)

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package me.chanjar.weixin.mp.api;
22

3-
import me.chanjar.weixin.mp.api.test.ApiTestModule;
4-
import org.testng.Assert;
5-
import org.testng.annotations.Guice;
6-
import org.testng.annotations.Test;
7-
83
import com.google.inject.Inject;
9-
104
import me.chanjar.weixin.common.exception.WxErrorException;
115
import me.chanjar.weixin.common.util.crypto.SHA1;
6+
import me.chanjar.weixin.mp.api.test.ApiTestModule;
7+
import org.testng.*;
8+
import org.testng.annotations.*;
129

1310
/**
1411
* 测试jsapi ticket接口
@@ -35,10 +32,10 @@ public void test() {
3532
String noncestr = "82693e11-b9bc-448e-892f-f5289f46cd0f";
3633
String jsapiTicket = "bxLdikRXVbTPdHSM05e5u4RbEYQn7pNQMPrfzl8lJNb1foLDa3HIwI3BRMkQmSO_5F64VFa75uURcq6Uz7QHgA";
3734
String result = SHA1.genWithAmple(
38-
"jsapi_ticket=" + jsapiTicket,
39-
"noncestr=" + noncestr,
40-
"timestamp=" + timestamp,
41-
"url=" + url
35+
"jsapi_ticket=" + jsapiTicket,
36+
"noncestr=" + noncestr,
37+
"timestamp=" + timestamp,
38+
"url=" + url
4239
);
4340

4441
Assert.assertEquals(result, "c6f04b64d6351d197b71bd23fb7dd2d44c0db486");

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
import me.chanjar.weixin.mp.bean.WxMpMassVideo;
1313
import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
1414
import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult;
15-
import org.testng.Assert;
16-
import org.testng.annotations.DataProvider;
17-
import org.testng.annotations.Guice;
18-
import org.testng.annotations.Test;
15+
import org.testng.*;
16+
import org.testng.annotations.*;
1917

2018
import java.io.IOException;
2119
import java.io.InputStream;

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

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
import me.chanjar.weixin.common.session.WxSessionManager;
66
import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
77
import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
8-
import org.testng.Assert;
9-
import org.testng.annotations.DataProvider;
10-
import org.testng.annotations.Test;
8+
import org.testng.*;
9+
import org.testng.annotations.*;
1110

1211
import java.util.Map;
1312

1413
/**
1514
* 测试消息路由器
16-
* @author chanjarster
1715
*
16+
* @author chanjarster
1817
*/
1918
@Test
2019
public class WxMpMessageRouterTest {
@@ -23,35 +22,35 @@ public class WxMpMessageRouterTest {
2322
public void prepare(boolean async, StringBuffer sb, WxMpMessageRouter router) {
2423
router
2524
.rule()
26-
.async(async)
27-
.msgType(WxConsts.XML_MSG_TEXT).event(WxConsts.EVT_CLICK).eventKey("KEY_1").content("CONTENT_1")
28-
.handler(new WxEchoMpMessageHandler(sb, "COMBINE_4"))
25+
.async(async)
26+
.msgType(WxConsts.XML_MSG_TEXT).event(WxConsts.EVT_CLICK).eventKey("KEY_1").content("CONTENT_1")
27+
.handler(new WxEchoMpMessageHandler(sb, "COMBINE_4"))
2928
.end()
3029
.rule()
31-
.async(async)
32-
.msgType(WxConsts.XML_MSG_TEXT).event(WxConsts.EVT_CLICK).eventKey("KEY_1")
33-
.handler(new WxEchoMpMessageHandler(sb, "COMBINE_3"))
30+
.async(async)
31+
.msgType(WxConsts.XML_MSG_TEXT).event(WxConsts.EVT_CLICK).eventKey("KEY_1")
32+
.handler(new WxEchoMpMessageHandler(sb, "COMBINE_3"))
3433
.end()
3534
.rule()
36-
.async(async)
37-
.msgType(WxConsts.XML_MSG_TEXT).event(WxConsts.EVT_CLICK)
38-
.handler(new WxEchoMpMessageHandler(sb, "COMBINE_2"))
35+
.async(async)
36+
.msgType(WxConsts.XML_MSG_TEXT).event(WxConsts.EVT_CLICK)
37+
.handler(new WxEchoMpMessageHandler(sb, "COMBINE_2"))
3938
.end()
4039
.rule().async(async).msgType(WxConsts.XML_MSG_TEXT).handler(new WxEchoMpMessageHandler(sb, WxConsts.XML_MSG_TEXT)).end()
4140
.rule().async(async).event(WxConsts.EVT_CLICK).handler(new WxEchoMpMessageHandler(sb, WxConsts.EVT_CLICK)).end()
4241
.rule().async(async).eventKey("KEY_1").handler(new WxEchoMpMessageHandler(sb, "KEY_1")).end()
4342
.rule().async(async).content("CONTENT_1").handler(new WxEchoMpMessageHandler(sb, "CONTENT_1")).end()
4443
.rule().async(async).rContent(".*bc.*").handler(new WxEchoMpMessageHandler(sb, "abcd")).end()
4544
.rule().async(async).matcher(new WxMpMessageMatcher() {
46-
@Override
47-
public boolean match(WxMpXmlMessage message) {
48-
return "strangeformat".equals(message.getFormat());
49-
}
50-
}).handler(new WxEchoMpMessageHandler(sb, "matcher")).end()
45+
@Override
46+
public boolean match(WxMpXmlMessage message) {
47+
return "strangeformat".equals(message.getFormat());
48+
}
49+
}).handler(new WxEchoMpMessageHandler(sb, "matcher")).end()
5150
.rule().async(async).handler(new WxEchoMpMessageHandler(sb, "ALL")).end();
5251
}
5352

54-
@Test(dataProvider="messages-1")
53+
@Test(dataProvider = "messages-1")
5554
public void testSync(WxMpXmlMessage message, String expected) {
5655
StringBuffer sb = new StringBuffer();
5756
WxMpMessageRouter router = new WxMpMessageRouter(null);
@@ -60,11 +59,11 @@ public void testSync(WxMpXmlMessage message, String expected) {
6059
Assert.assertEquals(sb.toString(), expected);
6160
}
6261

63-
@Test(dataProvider="messages-1")
62+
@Test(dataProvider = "messages-1")
6463
public void testAsync(WxMpXmlMessage message, String expected) throws InterruptedException {
6564
StringBuffer sb = new StringBuffer();
6665
WxMpMessageRouter router = new WxMpMessageRouter(null);
67-
prepare(true, sb, router);
66+
prepare(true, sb, router);
6867
router.route(message);
6968
Thread.sleep(500l);
7069
Assert.assertEquals(sb.toString(), expected);
@@ -75,7 +74,7 @@ public void testConcurrency() throws InterruptedException {
7574
router.rule().handler(new WxMpMessageHandler() {
7675
@Override
7776
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService,
78-
WxSessionManager sessionManager) {
77+
WxSessionManager sessionManager) {
7978
return null;
8079
}
8180
}).end();
@@ -97,7 +96,8 @@ public void run() {
9796

9897
Thread.sleep(1000l * 2);
9998
}
100-
@DataProvider(name="messages-1")
99+
100+
@DataProvider(name = "messages-1")
101101
public Object[][] messages2() {
102102
WxMpXmlMessage message1 = new WxMpXmlMessage();
103103
message1.setMsgType(WxConsts.XML_MSG_TEXT);
@@ -135,40 +135,21 @@ public Object[][] messages2() {
135135
c4.setEventKey("KEY_1");
136136
c4.setContent("CONTENT_1");
137137

138-
return new Object[][] {
139-
new Object[] { message1, WxConsts.XML_MSG_TEXT + "," },
140-
new Object[] { message2, WxConsts.EVT_CLICK + "," },
141-
new Object[] { message3, "KEY_1," },
142-
new Object[] { message4, "CONTENT_1," },
143-
new Object[] { message5, "ALL," },
144-
new Object[] { message6, "abcd," },
145-
new Object[] { message7, "matcher," },
146-
new Object[] { c2, "COMBINE_2," },
147-
new Object[] { c3, "COMBINE_3," },
148-
new Object[] { c4, "COMBINE_4," }
138+
return new Object[][]{
139+
new Object[]{message1, WxConsts.XML_MSG_TEXT + ","},
140+
new Object[]{message2, WxConsts.EVT_CLICK + ","},
141+
new Object[]{message3, "KEY_1,"},
142+
new Object[]{message4, "CONTENT_1,"},
143+
new Object[]{message5, "ALL,"},
144+
new Object[]{message6, "abcd,"},
145+
new Object[]{message7, "matcher,"},
146+
new Object[]{c2, "COMBINE_2,"},
147+
new Object[]{c3, "COMBINE_3,"},
148+
new Object[]{c4, "COMBINE_4,"}
149149
};
150150

151151
}
152152

153-
public static class WxEchoMpMessageHandler implements WxMpMessageHandler {
154-
155-
private StringBuffer sb;
156-
private String echoStr;
157-
158-
public WxEchoMpMessageHandler(StringBuffer sb, String echoStr) {
159-
this.sb = sb;
160-
this.echoStr = echoStr;
161-
}
162-
163-
@Override
164-
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService,
165-
WxSessionManager sessionManager) {
166-
this.sb.append(this.echoStr).append(',');
167-
return null;
168-
}
169-
170-
}
171-
172153
@DataProvider
173154
public Object[][] standardSessionManager() {
174155

@@ -178,8 +159,8 @@ public Object[][] standardSessionManager() {
178159
ism.setProcessExpiresFrequency(1);
179160
ism.setBackgroundProcessorDelay(1);
180161

181-
return new Object[][] {
182-
new Object[] { ism }
162+
return new Object[][]{
163+
new Object[]{ism}
183164
};
184165

185166
}
@@ -191,8 +172,8 @@ public void testSessionClean1(StandardSessionManager ism) throws InterruptedExce
191172
final WxMpMessageRouter router = new WxMpMessageRouter(null);
192173
router.setSessionManager(ism);
193174
router
194-
.rule().async(false).handler(new WxSessionMessageHandler()).next()
195-
.rule().async(false).handler(new WxSessionMessageHandler()).end();
175+
.rule().async(false).handler(new WxSessionMessageHandler()).next()
176+
.rule().async(false).handler(new WxSessionMessageHandler()).end();
196177

197178
WxMpXmlMessage msg = new WxMpXmlMessage();
198179
msg.setFromUser("abc");
@@ -211,8 +192,8 @@ public void testSessionClean2(StandardSessionManager ism) throws InterruptedExce
211192
final WxMpMessageRouter router = new WxMpMessageRouter(null);
212193
router.setSessionManager(ism);
213194
router
214-
.rule().async(false).handler(new WxSessionMessageHandler()).next()
215-
.rule().async(true).handler(new WxSessionMessageHandler()).end();
195+
.rule().async(false).handler(new WxSessionMessageHandler()).next()
196+
.rule().async(true).handler(new WxSessionMessageHandler()).end();
216197

217198
WxMpXmlMessage msg = new WxMpXmlMessage();
218199
msg.setFromUser("abc");
@@ -225,8 +206,8 @@ public void testSessionClean2(StandardSessionManager ism) throws InterruptedExce
225206
final WxMpMessageRouter router = new WxMpMessageRouter(null);
226207
router.setSessionManager(ism);
227208
router
228-
.rule().async(true).handler(new WxSessionMessageHandler()).next()
229-
.rule().async(false).handler(new WxSessionMessageHandler()).end();
209+
.rule().async(true).handler(new WxSessionMessageHandler()).next()
210+
.rule().async(false).handler(new WxSessionMessageHandler()).end();
230211

231212
WxMpXmlMessage msg = new WxMpXmlMessage();
232213
msg.setFromUser("abc");
@@ -245,8 +226,8 @@ public void testSessionClean3(StandardSessionManager ism) throws InterruptedExce
245226
final WxMpMessageRouter router = new WxMpMessageRouter(null);
246227
router.setSessionManager(ism);
247228
router
248-
.rule().async(true).handler(new WxSessionMessageHandler()).next()
249-
.rule().async(true).handler(new WxSessionMessageHandler()).end();
229+
.rule().async(true).handler(new WxSessionMessageHandler()).next()
230+
.rule().async(true).handler(new WxSessionMessageHandler()).end();
250231

251232
WxMpXmlMessage msg = new WxMpXmlMessage();
252233
msg.setFromUser("abc");
@@ -265,7 +246,7 @@ public void testSessionClean4(StandardSessionManager ism) throws InterruptedExce
265246
final WxMpMessageRouter router = new WxMpMessageRouter(null);
266247
router.setSessionManager(ism);
267248
router
268-
.rule().async(false).handler(new WxSessionMessageHandler()).end();
249+
.rule().async(false).handler(new WxSessionMessageHandler()).end();
269250

270251
WxMpXmlMessage msg = new WxMpXmlMessage();
271252
msg.setFromUser("abc");
@@ -279,7 +260,7 @@ public void testSessionClean4(StandardSessionManager ism) throws InterruptedExce
279260
final WxMpMessageRouter router = new WxMpMessageRouter(null);
280261
router.setSessionManager(ism);
281262
router
282-
.rule().async(true).handler(new WxSessionMessageHandler()).end();
263+
.rule().async(true).handler(new WxSessionMessageHandler()).end();
283264

284265
WxMpXmlMessage msg = new WxMpXmlMessage();
285266
msg.setFromUser("abc");
@@ -290,11 +271,30 @@ public void testSessionClean4(StandardSessionManager ism) throws InterruptedExce
290271
}
291272
}
292273

293-
public static class WxSessionMessageHandler implements WxMpMessageHandler {
274+
public static class WxEchoMpMessageHandler implements WxMpMessageHandler {
275+
276+
private StringBuffer sb;
277+
private String echoStr;
278+
279+
public WxEchoMpMessageHandler(StringBuffer sb, String echoStr) {
280+
this.sb = sb;
281+
this.echoStr = echoStr;
282+
}
283+
284+
@Override
285+
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService,
286+
WxSessionManager sessionManager) {
287+
this.sb.append(this.echoStr).append(',');
288+
return null;
289+
}
290+
291+
}
292+
293+
public static class WxSessionMessageHandler implements WxMpMessageHandler {
294294

295295
@Override
296296
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService,
297-
WxSessionManager sessionManager) {
297+
WxSessionManager sessionManager) {
298298
sessionManager.getSession(wxMessage.getFromUser());
299299
return null;
300300
}

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@
33
import com.google.inject.Inject;
44
import me.chanjar.weixin.common.exception.WxErrorException;
55
import me.chanjar.weixin.mp.api.test.ApiTestModule;
6-
import org.testng.Assert;
7-
import org.testng.annotations.Guice;
8-
import org.testng.annotations.Test;
6+
import org.testng.*;
7+
import org.testng.annotations.*;
98

109
import java.util.Arrays;
1110

1211
/**
13-
*
1412
* @author chanjarster
15-
*
1613
*/
1714
@Test(groups = "miscAPI")
1815
@Guice(modules = ApiTestModule.class)

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
import com.google.inject.Inject;
44
import me.chanjar.weixin.common.exception.WxErrorException;
55
import me.chanjar.weixin.mp.api.test.ApiTestModule;
6-
import org.testng.Assert;
7-
import org.testng.annotations.Guice;
8-
import org.testng.annotations.Test;
6+
import org.testng.*;
7+
import org.testng.annotations.*;
98

109
/**
1110
* 测试短连接

0 commit comments

Comments
 (0)