Skip to content

Commit 7340e03

Browse files
binarywangbinarywang
committed
将部分仅供测试代码使用的常量挪走
1 parent f3ac998 commit 7340e03

8 files changed

Lines changed: 51 additions & 20 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
<module>weixin-java-cp</module>
8888
<module>weixin-java-mp</module>
8989
<module>weixin-java-pay</module>
90+
<!--module>weixin-java-osgi</module-->
9091
</modules>
9192

9293
<properties>

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,6 @@ public class WxConsts {
136136
public static final String MEDIA_VIDEO = "video";
137137
public static final String MEDIA_THUMB = "thumb";
138138
public static final String MEDIA_FILE = "file";
139-
///////////////////////
140-
// 文件类型
141-
///////////////////////
142-
public static final String FILE_JPG = "jpeg";
143-
public static final String FILE_MP3 = "mp3";
144-
public static final String FILE_AMR = "amr";
145-
public static final String FILE_MP4 = "mp4";
146139
/**
147140
* 点击推事件
148141
*/

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package me.chanjar.weixin.cp.api;
2+
3+
/**
4+
* <pre>
5+
* 仅供测试使用的一些常量
6+
* Created by Binary Wang on 2017-3-9.
7+
* </pre>
8+
*/
9+
public class TestConstants {
10+
///////////////////////
11+
// 文件类型
12+
///////////////////////
13+
public static final String FILE_JPG = "jpeg";
14+
public static final String FILE_MP3 = "mp3";
15+
public static final String FILE_AMR = "amr";
16+
public static final String FILE_MP4 = "mp4";
17+
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ public void testUploadMedia(String mediaType, String fileType, String fileName)
5454
@DataProvider
5555
public Object[][] uploadMedia() {
5656
return new Object[][]{
57-
new Object[]{WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, "mm.jpeg"},
58-
new Object[]{WxConsts.MEDIA_VOICE, WxConsts.FILE_MP3, "mm.mp3"},
59-
new Object[]{WxConsts.MEDIA_VIDEO, WxConsts.FILE_MP4, "mm.mp4"},
60-
new Object[]{WxConsts.MEDIA_FILE, WxConsts.FILE_JPG, "mm.jpeg"}
57+
new Object[]{WxConsts.MEDIA_IMAGE, TestConstants.FILE_JPG, "mm.jpeg"},
58+
new Object[]{WxConsts.MEDIA_VOICE, TestConstants.FILE_MP3, "mm.mp3"},
59+
new Object[]{WxConsts.MEDIA_VIDEO, TestConstants.FILE_MP4, "mm.mp4"},
60+
new Object[]{WxConsts.MEDIA_FILE, TestConstants.FILE_JPG, "mm.jpeg"}
6161
};
6262
}
6363

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import me.chanjar.weixin.common.exception.WxErrorException;
77
import me.chanjar.weixin.mp.api.test.ApiTestModule;
88
import me.chanjar.weixin.mp.api.test.TestConfigStorage;
9+
import me.chanjar.weixin.mp.api.test.TestConstants;
910
import me.chanjar.weixin.mp.bean.WxMpMassNews;
1011
import me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage;
1112
import me.chanjar.weixin.mp.bean.WxMpMassTagMessage;
@@ -101,7 +102,7 @@ public Object[][] massMessages() throws WxErrorException, IOException {
101102
.getSystemResourceAsStream("mm.mp4")) {
102103
// 上传视频到媒体库
103104
WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
104-
.mediaUpload(WxConsts.MEDIA_VIDEO, WxConsts.FILE_MP4, inputStream);
105+
.mediaUpload(WxConsts.MEDIA_VIDEO, TestConstants.FILE_MP4, inputStream);
105106
Assert.assertNotNull(uploadMediaRes);
106107
Assert.assertNotNull(uploadMediaRes.getMediaId());
107108

@@ -122,7 +123,7 @@ public Object[][] massMessages() throws WxErrorException, IOException {
122123
try (InputStream inputStream = ClassLoader
123124
.getSystemResourceAsStream("mm.jpeg")) {
124125
WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
125-
.mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, inputStream);
126+
.mediaUpload(WxConsts.MEDIA_IMAGE, TestConstants.FILE_JPG, inputStream);
126127
Assert.assertNotNull(uploadMediaRes);
127128
Assert.assertNotNull(uploadMediaRes.getMediaId());
128129
messages[1] = new Object[]{WxConsts.MASS_MSG_IMAGE, uploadMediaRes.getMediaId()};
@@ -134,7 +135,7 @@ public Object[][] massMessages() throws WxErrorException, IOException {
134135
try (InputStream inputStream = ClassLoader
135136
.getSystemResourceAsStream("mm.mp3")) {
136137
WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
137-
.mediaUpload(WxConsts.MEDIA_VOICE, WxConsts.FILE_MP3, inputStream);
138+
.mediaUpload(WxConsts.MEDIA_VOICE, TestConstants.FILE_MP3, inputStream);
138139
Assert.assertNotNull(uploadMediaRes);
139140
Assert.assertNotNull(uploadMediaRes.getMediaId());
140141
messages[2] = new Object[]{WxConsts.MASS_MSG_VOICE, uploadMediaRes.getMediaId()};
@@ -147,7 +148,7 @@ public Object[][] massMessages() throws WxErrorException, IOException {
147148
.getSystemResourceAsStream("mm.jpeg")) {
148149
// 上传照片到媒体库
149150
WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
150-
.mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, inputStream);
151+
.mediaUpload(WxConsts.MEDIA_IMAGE, TestConstants.FILE_JPG, inputStream);
151152
Assert.assertNotNull(uploadMediaRes);
152153
Assert.assertNotNull(uploadMediaRes.getMediaId());
153154

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import me.chanjar.weixin.common.util.fs.FileUtils;
88
import me.chanjar.weixin.mp.api.WxMpService;
99
import me.chanjar.weixin.mp.api.test.ApiTestModule;
10+
import me.chanjar.weixin.mp.api.test.TestConstants;
1011
import me.chanjar.weixin.mp.bean.material.*;
1112
import org.testng.annotations.*;
1213

@@ -45,10 +46,10 @@ public class WxMpMaterialServiceImplTest {
4546
@DataProvider
4647
public Object[][] mediaFiles() {
4748
return new Object[][]{
48-
new Object[]{WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, "mm.jpeg"},
49-
new Object[]{WxConsts.MEDIA_VOICE, WxConsts.FILE_MP3, "mm.mp3"},
50-
new Object[]{WxConsts.MEDIA_VIDEO, WxConsts.FILE_MP4, "mm.mp4"},
51-
new Object[]{WxConsts.MEDIA_THUMB, WxConsts.FILE_JPG, "mm.jpeg"}
49+
new Object[]{WxConsts.MEDIA_IMAGE, TestConstants.FILE_JPG, "mm.jpeg"},
50+
new Object[]{WxConsts.MEDIA_VOICE, TestConstants.FILE_MP3, "mm.mp3"},
51+
new Object[]{WxConsts.MEDIA_VIDEO, TestConstants.FILE_MP4, "mm.mp4"},
52+
new Object[]{WxConsts.MEDIA_THUMB, TestConstants.FILE_JPG, "mm.jpeg"}
5253
};
5354
}
5455

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package me.chanjar.weixin.mp.api.test;
2+
3+
/**
4+
* <pre>
5+
* 仅供测试使用的一些常量
6+
* Created by Binary Wang on 2017-3-9.
7+
* </pre>
8+
*/
9+
public class TestConstants {
10+
///////////////////////
11+
// 文件类型
12+
///////////////////////
13+
public static final String FILE_JPG = "jpeg";
14+
public static final String FILE_MP3 = "mp3";
15+
public static final String FILE_AMR = "amr";
16+
public static final String FILE_MP4 = "mp4";
17+
}

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoImageHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import me.chanjar.weixin.common.session.WxSessionManager;
77
import me.chanjar.weixin.mp.api.WxMpMessageHandler;
88
import me.chanjar.weixin.mp.api.WxMpService;
9+
import me.chanjar.weixin.mp.api.test.TestConstants;
910
import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
1011
import me.chanjar.weixin.mp.bean.message.WxMpXmlOutImageMessage;
1112
import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
@@ -18,7 +19,7 @@ public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> co
1819
WxMpService wxMpService, WxSessionManager sessionManager) {
1920
try {
2021
WxMediaUploadResult wxMediaUploadResult = wxMpService.getMaterialService()
21-
.mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, ClassLoader.getSystemResourceAsStream("mm.jpeg"));
22+
.mediaUpload(WxConsts.MEDIA_IMAGE, TestConstants.FILE_JPG, ClassLoader.getSystemResourceAsStream("mm.jpeg"));
2223
WxMpXmlOutImageMessage m
2324
= WxMpXmlOutMessage
2425
.IMAGE()

0 commit comments

Comments
 (0)