Skip to content

Commit d619848

Browse files
binarywangbinarywang
committed
优化单元测试提示信息
1 parent 996c806 commit d619848

File tree

4 files changed

+56
-28
lines changed

4 files changed

+56
-28
lines changed

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/ApiTestModule.java‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
package me.chanjar.weixin.cp.api;
22

3+
import java.io.IOException;
4+
import java.io.InputStream;
5+
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
8+
39
import com.google.inject.Binder;
410
import com.google.inject.Module;
511
import com.thoughtworks.xstream.XStream;
612
import com.thoughtworks.xstream.annotations.XStreamAlias;
713
import me.chanjar.weixin.common.util.xml.XStreamInitializer;
814
import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl;
9-
import me.chanjar.weixin.cp.config.WxCpConfigStorage;
1015
import me.chanjar.weixin.cp.config.WxCpInMemoryConfigStorage;
1116

12-
import java.io.IOException;
13-
import java.io.InputStream;
14-
1517
public class ApiTestModule implements Module {
18+
private final Logger log = LoggerFactory.getLogger(this.getClass());
19+
private static final String TEST_CONFIG_XML = "test-config.xml";
1620

17-
public static <T> T fromXml(Class<T> clazz, InputStream is) {
21+
private static <T> T fromXml(Class<T> clazz, InputStream is) {
1822
XStream xstream = XStreamInitializer.getInstance();
1923
xstream.alias("xml", clazz);
2024
xstream.processAnnotations(clazz);
@@ -23,17 +27,19 @@ public static <T> T fromXml(Class<T> clazz, InputStream is) {
2327

2428
@Override
2529
public void configure(Binder binder) {
26-
try (InputStream is1 = ClassLoader
27-
.getSystemResourceAsStream("test-config.xml")) {
28-
WxXmlCpInMemoryConfigStorage config = fromXml(
29-
WxXmlCpInMemoryConfigStorage.class, is1);
30+
try (InputStream inputStream = ClassLoader.getSystemResourceAsStream(TEST_CONFIG_XML)) {
31+
if (inputStream == null) {
32+
throw new RuntimeException("测试配置文件【" + TEST_CONFIG_XML + "】未找到，请参照test-config-sample.xml文件生成");
33+
}
34+
35+
WxXmlCpInMemoryConfigStorage config = fromXml(WxXmlCpInMemoryConfigStorage.class, inputStream);
3036
WxCpService wxService = new WxCpServiceImpl();
3137
wxService.setWxCpConfigStorage(config);
3238

3339
binder.bind(WxCpService.class).toInstance(wxService);
3440
binder.bind(WxXmlCpInMemoryConfigStorage.class).toInstance(config);
3541
} catch (IOException e) {
36-
e.printStackTrace();
42+
this.log.error(e.getMessage(), e);
3743
}
3844
}
3945

‎weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/test/ApiTestModule.java‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,30 @@
11
package cn.binarywang.wx.miniapp.test;
22

3+
import java.io.IOException;
4+
import java.io.InputStream;
5+
import java.util.concurrent.locks.ReentrantLock;
6+
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
9+
310
import cn.binarywang.wx.miniapp.api.WxMaService;
411
import cn.binarywang.wx.miniapp.config.WxMaConfig;
512
import com.google.inject.Binder;
613
import com.google.inject.Module;
714

8-
import java.io.IOException;
9-
import java.io.InputStream;
10-
import java.util.concurrent.locks.ReentrantLock;
11-
1215
/**
1316
* @author <a href="https://github.com/binarywang">Binary Wang</a>
1417
*/
1518
public class ApiTestModule implements Module {
19+
private final Logger log = LoggerFactory.getLogger(this.getClass());
20+
private static final String TEST_CONFIG_XML = "test-config.xml";
1621

1722
@Override
1823
public void configure(Binder binder) {
19-
try (InputStream inputStream = ClassLoader.getSystemResourceAsStream("test-config.xml")) {
24+
try (InputStream inputStream = ClassLoader.getSystemResourceAsStream(TEST_CONFIG_XML)) {
25+
if (inputStream == null) {
26+
throw new RuntimeException("测试配置文件【" + TEST_CONFIG_XML + "】未找到，请参照test-config-sample.xml文件生成");
27+
}
2028
TestConfig config = TestConfig.fromXml(inputStream);
2129
config.setAccessTokenLock(new ReentrantLock());
2230

@@ -26,7 +34,7 @@ public void configure(Binder binder) {
2634
binder.bind(WxMaService.class).toInstance(wxService);
2735
binder.bind(WxMaConfig.class).toInstance(config);
2836
} catch (IOException e) {
29-
e.printStackTrace();
37+
this.log.error(e.getMessage(), e);
3038
}
3139
}
3240

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

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

3+
import java.io.IOException;
4+
import java.io.InputStream;
5+
import java.util.concurrent.locks.ReentrantLock;
6+
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
9+
310
import com.google.inject.Binder;
411
import com.google.inject.Module;
512
import com.thoughtworks.xstream.XStream;
@@ -8,24 +15,26 @@
815
import me.chanjar.weixin.mp.api.WxMpService;
916
import me.chanjar.weixin.mp.api.impl.WxMpServiceOkHttpImpl;
1017

11-
import java.io.IOException;
12-
import java.io.InputStream;
13-
import java.util.concurrent.locks.ReentrantLock;
14-
1518
public class ApiTestModule implements Module {
19+
private final Logger log = LoggerFactory.getLogger(this.getClass());
20+
private static final String TEST_CONFIG_XML = "test-config.xml";
1621

1722
@Override
1823
public void configure(Binder binder) {
19-
try (InputStream is1 = ClassLoader.getSystemResourceAsStream("test-config.xml")) {
20-
TestConfigStorage config = this.fromXml(TestConfigStorage.class, is1);
24+
try (InputStream inputStream = ClassLoader.getSystemResourceAsStream(TEST_CONFIG_XML)) {
25+
if (inputStream == null) {
26+
throw new RuntimeException("测试配置文件【" + TEST_CONFIG_XML + "】未找到，请参照test-config-sample.xml文件生成");
27+
}
28+
29+
TestConfigStorage config = this.fromXml(TestConfigStorage.class, inputStream);
2130
config.setAccessTokenLock(new ReentrantLock());
2231
WxMpService wxService = new WxMpServiceOkHttpImpl();
2332
wxService.setWxMpConfigStorage(config);
2433

2534
binder.bind(WxMpService.class).toInstance(wxService);
2635
binder.bind(WxMpConfigStorage.class).toInstance(config);
2736
} catch (IOException e) {
28-
e.printStackTrace();
37+
this.log.error(e.getMessage(), e);
2938
}
3039
}
3140

‎weixin-java-pay/src/test/java/com/github/binarywang/wxpay/testbase/ApiTestModule.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
package com.github.binarywang.wxpay.testbase;
22

3+
import java.io.IOException;
4+
import java.io.InputStream;
5+
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
8+
39
import com.github.binarywang.wxpay.config.WxPayConfig;
410
import com.github.binarywang.wxpay.service.WxPayService;
511
import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
@@ -8,17 +14,15 @@
814
import com.thoughtworks.xstream.XStream;
915
import me.chanjar.weixin.common.util.xml.XStreamInitializer;
1016

11-
import java.io.IOException;
12-
import java.io.InputStream;
13-
1417
public class ApiTestModule implements Module {
18+
private final Logger log = LoggerFactory.getLogger(this.getClass());
1519
private static final String TEST_CONFIG_XML = "test-config.xml";
1620

1721
@Override
1822
public void configure(Binder binder) {
1923
try (InputStream inputStream = ClassLoader.getSystemResourceAsStream(TEST_CONFIG_XML)) {
2024
if (inputStream == null) {
21-
throw new RuntimeException("测试配置文件【" + TEST_CONFIG_XML + "】未找到");
25+
throw new RuntimeException("测试配置文件【" + TEST_CONFIG_XML + "】未找到，请参照test-config-sample.xml文件生成");
2226
}
2327

2428
XmlWxPayConfig config = this.fromXml(XmlWxPayConfig.class, inputStream);
@@ -28,8 +32,9 @@ public void configure(Binder binder) {
2832
binder.bind(WxPayService.class).toInstance(wxService);
2933
binder.bind(WxPayConfig.class).toInstance(config);
3034
} catch (IOException e) {
31-
e.printStackTrace();
35+
this.log.error(e.getMessage(), e);
3236
}
37+
3338
}
3439

3540
@SuppressWarnings("unchecked")

0 commit comments

Comments
 (0)