pandaapo commented on code in PR #4603:
URL: https://github.com/apache/eventmesh/pull/4603#discussion_r1415210969
##########
eventmesh-connectors/eventmesh-connector-wechat/src/main/java/org/apache/eventmesh/connector/wechat/sink/connector/WeChatSinkConnector.java:
##########
@@ -166,9 +166,9 @@ private void sendMessage(ConnectRecord record) {
throw new IOException("message response is null.");
}
- if (messageResponse.getErrocode() != 0) {
+ if (messageResponse.getErrcode() != 0) {
throw new IllegalAccessException(String.format("Send message
to weCom error! errorCode=%s, errorMessage=%s",
Review Comment:
Please change "weCom" to "wechat".
##########
eventmesh-connectors/eventmesh-connector-wechat/src/test/java/org/apache/eventmesh/connector/wechat/sink/connector/WeChatSinkConnectorTest.java:
##########
@@ -95,31 +109,43 @@ public void setUp() throws Exception {
Mockito.doReturn(sendMessageRequestCall).when(okHttpClient).newCall(Mockito.argThat(sendMessageMatcher));
Mockito.doReturn(sendMessageResponse).when(sendMessageRequestCall).execute();
- weChatSinkConnector = new WeChatSinkConnector();
- WeChatSinkConfig weChatSinkConfig = (WeChatSinkConfig)
ConfigUtil.parse(weChatSinkConnector.configClass());
- weChatSinkConnector.init(weChatSinkConfig);
- Field clientField =
ReflectionSupport.findFields(weChatSinkConnector.getClass(),
- (f) -> f.getName().equals("okHttpClient"),
- HierarchyTraversalMode.BOTTOM_UP).get(0);
- clientField.setAccessible(true);
- clientField.set(weChatSinkConnector, okHttpClient);
- weChatSinkConnector.start();
+ List<ConnectRecord> records = new ArrayList<>();
+ RecordPartition partition = new RecordPartition();
+ RecordOffset offset = new RecordOffset();
+ ConnectRecord connectRecord = new ConnectRecord(partition, offset,
+ System.currentTimeMillis(), "Hello,
EventMesh!".getBytes(StandardCharsets.UTF_8));
+ records.add(connectRecord);
+
+ weChatSinkConnector.put(records);
+ verify(okHttpClient, times(2)).newCall(any(Request.class));
}
@Test
- public void testSendMessageToWeChat() throws Exception {
- final int times = 1;
- List<ConnectRecord> records = new ArrayList<>();
- for (int i = 0; i < times; i++) {
- RecordPartition partition = new RecordPartition();
- RecordOffset offset = new RecordOffset();
- ConnectRecord connectRecord = new ConnectRecord(partition, offset,
- System.currentTimeMillis(), "Hello,
EventMesh!".getBytes(StandardCharsets.UTF_8));
- records.add(connectRecord);
- }
+ public void testSendMessageToWeChatAbnormally() throws Exception {
+ Request sendMessageRequest = new
Request.Builder().url("https://api.weixin.qq.com/cgi-bin/message/template/send";).build();
+ String sendMessageResponseJson =
"{\"errcode\":42001,\"errmsg\":\"access_token expired rid:
656e8793-061949b5-738cb8f4\"}";
+ ResponseBody sendMessageBody =
ResponseBody.create(MediaType.parse("application/json; charset=utf-8"),
sendMessageResponseJson);
+ Response sendMessageResponse = new Response.Builder()
+ .code(200)
+ .protocol(Protocol.HTTP_1_0)
+ .request(sendMessageRequest)
+ .body(sendMessageBody)
+ .message("ok")
+ .build();
+ ArgumentMatcher<Request> sendMessageMatcher = (anyRequest) ->
+
sendMessageRequest.url().encodedPath().startsWith(anyRequest.url().encodedPath());
+ Call sendMessageRequestCall = Mockito.mock(Call.class);
+
Mockito.doReturn(sendMessageRequestCall).when(okHttpClient).newCall(Mockito.argThat(sendMessageMatcher));
+
Mockito.doReturn(sendMessageResponse).when(sendMessageRequestCall).execute();
+ RecordPartition partition = new RecordPartition();
+ RecordOffset offset = new RecordOffset();
+ List<ConnectRecord> records = new ArrayList<>();
+ ConnectRecord connectRecord = new ConnectRecord(partition, offset,
+ System.currentTimeMillis(), "Hello,
EventMesh!".getBytes(StandardCharsets.UTF_8));
+ records.add(connectRecord);
weChatSinkConnector.put(records);
- verify(okHttpClient, times(times + 1)).newCall(any(Request.class));
+ verify(okHttpClient, times(2)).newCall(any(Request.class));
Review Comment:
Is it better to use JUnit's assertThrows() to assert exceptions at this
point?
这时候使用JUnit的assertThrows()断言异常是不是更好一点？
##########
eventmesh-connectors/eventmesh-connector-wechat/src/test/java/org/apache/eventmesh/connector/wechat/sink/connector/WeChatSinkConnectorTest.java:
##########
@@ -95,31 +109,43 @@ public void setUp() throws Exception {
Mockito.doReturn(sendMessageRequestCall).when(okHttpClient).newCall(Mockito.argThat(sendMessageMatcher));
Mockito.doReturn(sendMessageResponse).when(sendMessageRequestCall).execute();
- weChatSinkConnector = new WeChatSinkConnector();
- WeChatSinkConfig weChatSinkConfig = (WeChatSinkConfig)
ConfigUtil.parse(weChatSinkConnector.configClass());
- weChatSinkConnector.init(weChatSinkConfig);
- Field clientField =
ReflectionSupport.findFields(weChatSinkConnector.getClass(),
- (f) -> f.getName().equals("okHttpClient"),
- HierarchyTraversalMode.BOTTOM_UP).get(0);
- clientField.setAccessible(true);
- clientField.set(weChatSinkConnector, okHttpClient);
- weChatSinkConnector.start();
+ List<ConnectRecord> records = new ArrayList<>();
+ RecordPartition partition = new RecordPartition();
+ RecordOffset offset = new RecordOffset();
+ ConnectRecord connectRecord = new ConnectRecord(partition, offset,
+ System.currentTimeMillis(), "Hello,
EventMesh!".getBytes(StandardCharsets.UTF_8));
+ records.add(connectRecord);
+
+ weChatSinkConnector.put(records);
+ verify(okHttpClient, times(2)).newCall(any(Request.class));
}
@Test
- public void testSendMessageToWeChat() throws Exception {
- final int times = 1;
- List<ConnectRecord> records = new ArrayList<>();
- for (int i = 0; i < times; i++) {
- RecordPartition partition = new RecordPartition();
- RecordOffset offset = new RecordOffset();
- ConnectRecord connectRecord = new ConnectRecord(partition, offset,
- System.currentTimeMillis(), "Hello,
EventMesh!".getBytes(StandardCharsets.UTF_8));
- records.add(connectRecord);
- }
+ public void testSendMessageToWeChatAbnormally() throws Exception {
+ Request sendMessageRequest = new
Request.Builder().url("https://api.weixin.qq.com/cgi-bin/message/template/send";).build();
+ String sendMessageResponseJson =
"{\"errcode\":42001,\"errmsg\":\"access_token expired rid:
656e8793-061949b5-738cb8f4\"}";
+ ResponseBody sendMessageBody =
ResponseBody.create(MediaType.parse("application/json; charset=utf-8"),
sendMessageResponseJson);
+ Response sendMessageResponse = new Response.Builder()
+ .code(200)
+ .protocol(Protocol.HTTP_1_0)
+ .request(sendMessageRequest)
+ .body(sendMessageBody)
+ .message("ok")
+ .build();
+ ArgumentMatcher<Request> sendMessageMatcher = (anyRequest) ->
+
sendMessageRequest.url().encodedPath().startsWith(anyRequest.url().encodedPath());
+ Call sendMessageRequestCall = Mockito.mock(Call.class);
+
Mockito.doReturn(sendMessageRequestCall).when(okHttpClient).newCall(Mockito.argThat(sendMessageMatcher));
+
Mockito.doReturn(sendMessageResponse).when(sendMessageRequestCall).execute();
+ RecordPartition partition = new RecordPartition();
+ RecordOffset offset = new RecordOffset();
+ List<ConnectRecord> records = new ArrayList<>();
+ ConnectRecord connectRecord = new ConnectRecord(partition, offset,
+ System.currentTimeMillis(), "Hello,
EventMesh!".getBytes(StandardCharsets.UTF_8));
+ records.add(connectRecord);
weChatSinkConnector.put(records);
- verify(okHttpClient, times(times + 1)).newCall(any(Request.class));
+ verify(okHttpClient, times(2)).newCall(any(Request.class));
Review Comment:
Is it better to use JUnit's assertThrows() to assert exceptions at this
point?
这时候使用JUnit的assertThrows()断言异常是不是更好一点？
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
