From 8d2b57ee397874901bda1ce63ef15dd1905adf55 Mon Sep 17 00:00:00 2001 From: Liuchy1 Date: Wed, 6 May 2015 16:00:40 +0800 Subject: [PATCH 1/3] add log for api example --- README.md | 12 +++-- .../cn/jpush/api/examples/IMGroupExample.java | 51 ++++++++++++------- .../cn/jpush/api/examples/IMUserExample.java | 47 +++++++++++------ 3 files changed, 71 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index 7fa5c733..8f48b202 100644 --- a/README.md +++ b/README.md @@ -258,9 +258,11 @@ String res = client.registerUsers(users.toArray(regUsers)); System.out.println(res); } catch (APIConnectionException e) { - e.printStackTrace(); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } ``` @@ -274,9 +276,11 @@ String res = client.createGroup("test_user", "test_gname1", "description", "test_user"); System.out.println(res); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } ``` diff --git a/example/main/java/cn/jpush/api/examples/IMGroupExample.java b/example/main/java/cn/jpush/api/examples/IMGroupExample.java index a561072f..c04c3303 100644 --- a/example/main/java/cn/jpush/api/examples/IMGroupExample.java +++ b/example/main/java/cn/jpush/api/examples/IMGroupExample.java @@ -1,11 +1,14 @@ -package cn.jpush.api.jmessage; +package cn.jpush.api.examples; +import cn.jpush.api.jmessage.JMessageClient; import cn.jpush.api.common.resp.APIConnectionException; import cn.jpush.api.jmessage.base.connection.APIRequestException; public class IMGroupExample { + protected static final Logger LOG = LoggerFactory.getLogger(IMGroupExample.class); + private static final String appkey = "242780bfdd7315dc1989fe2b"; private static final String masterSecret = "2f5ced2bef64167950e63d13"; @@ -15,9 +18,11 @@ public static void testCreateGroup() { String res = client.createGroup("test_user", "test_gname1", "description", "test_user"); System.out.println(res); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -28,9 +33,11 @@ public static void testGetGroupInfo() { String res = client.getGroupInfo(10003767); System.out.println(res); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -41,9 +48,11 @@ public static void testGetGroupMemberList() { String res = client.getGroupMembers(10003767); System.out.println(res); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -54,9 +63,11 @@ public static void testGetGroupListByAppkey() { String res = client.getGroupListByAppkey(0, 30); System.out.println(res); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -69,9 +80,11 @@ public static void testManageGroup() { client.addOrRemoveMembers(10003767, addList, null ); client.addOrRemoveMembers(10003767, null, removeList); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -81,9 +94,11 @@ public static void testUpdateGroupInfo() { try { client.updateGroupInfo(10003767, "test_gname_new", "update desc"); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -93,17 +108,15 @@ public static void testDeleteGroup() { try { client.deleteGroup(10003765); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } public static void main(String[] args) { // testGetGroupInfo(); -// testGetGroupListByAppkey(); -// testUpdateGroupInfo(); -// testDeleteGroup(); - } } diff --git a/example/main/java/cn/jpush/api/examples/IMUserExample.java b/example/main/java/cn/jpush/api/examples/IMUserExample.java index e6913158..d1b76c6e 100644 --- a/example/main/java/cn/jpush/api/examples/IMUserExample.java +++ b/example/main/java/cn/jpush/api/examples/IMUserExample.java @@ -1,5 +1,6 @@ -package cn.jpush.api.jmessage; +package cn.jpush.api.examples; +import cn.jpush.api.jmessage.JMessageClient; import cn.jpush.api.common.resp.APIConnectionException; import cn.jpush.api.jmessage.base.connection.APIRequestException; @@ -42,9 +43,11 @@ public static void testRegisterUsers() { String res = client.registerUsers(users.toArray(regUsers)); System.out.println(res); } catch (APIConnectionException e) { - e.printStackTrace(); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -55,9 +58,11 @@ public static void testGetUserInfo() { String res = client.getUserInfo("test_user"); System.out.println(res); } catch (APIConnectionException e) { - e.printStackTrace(); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - e.printStackTrace(); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -67,9 +72,11 @@ public static void testUpdatePassword() { try { client.updateUserPassword("test_user", "test_new_pass"); } catch (APIConnectionException e) { - e.printStackTrace(); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - e.printStackTrace(); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -79,9 +86,11 @@ public static void testUpdateUserInfo() { try { client.updateUserInfo("test_user", "test_nick", "2000-01-12", "help me!", 1, "shenzhen", "nanshan", null); } catch (APIConnectionException e) { - e.printStackTrace(); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - e.printStackTrace(); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -92,9 +101,11 @@ public static void testGetUsers() { String res = client.getUserList(0, 30); System.out.println(res); } catch (APIConnectionException e) { - e.printStackTrace(); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - e.printStackTrace(); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -105,9 +116,11 @@ public static void testGetGroupsByUser() { String res = client.getGroupListByUser("test_user"); System.out.println(res); } catch (APIConnectionException e) { - e.printStackTrace(); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - e.printStackTrace(); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -117,14 +130,16 @@ public static void testDeleteUser() { try { client.deleteUser("test_user_119"); } catch (APIConnectionException e) { - e.printStackTrace(); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - e.printStackTrace(); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } public static void main(String[] args) { - testRegisterUsers(); + testGetGroupsByUser(); } } From 5ba489bf0b5c4d8e344f39c96bb69896fdbcfb76 Mon Sep 17 00:00:00 2001 From: Liuchy1 Date: Wed, 6 May 2015 17:04:47 +0800 Subject: [PATCH 2/3] add log for jmessage api test case --- .../cn/jpush/api/examples/IMGroupExample.java | 12 +- .../cn/jpush/api/examples/IMUserExample.java | 10 +- .../api/jmessage/group/GroupClientTest.java | 123 ++++++++---- .../api/jmessage/user/UserClientTest.java | 180 ++++++++++++------ 4 files changed, 214 insertions(+), 111 deletions(-) diff --git a/example/main/java/cn/jpush/api/examples/IMGroupExample.java b/example/main/java/cn/jpush/api/examples/IMGroupExample.java index c04c3303..67714d23 100644 --- a/example/main/java/cn/jpush/api/examples/IMGroupExample.java +++ b/example/main/java/cn/jpush/api/examples/IMGroupExample.java @@ -1,10 +1,12 @@ package cn.jpush.api.examples; import cn.jpush.api.jmessage.JMessageClient; - import cn.jpush.api.common.resp.APIConnectionException; import cn.jpush.api.jmessage.base.connection.APIRequestException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class IMGroupExample { protected static final Logger LOG = LoggerFactory.getLogger(IMGroupExample.class); @@ -16,7 +18,7 @@ public static void testCreateGroup() { JMessageClient client = new JMessageClient(appkey, masterSecret); try { String res = client.createGroup("test_user", "test_gname1", "description", "test_user"); - System.out.println(res); + LOG.info(res); } catch (APIConnectionException e) { LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { @@ -31,7 +33,7 @@ public static void testGetGroupInfo() { try { String res = client.getGroupInfo(10003767); - System.out.println(res); + LOG.info(res); } catch (APIConnectionException e) { LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { @@ -46,7 +48,7 @@ public static void testGetGroupMemberList() { try { String res = client.getGroupMembers(10003767); - System.out.println(res); + LOG.info(res); } catch (APIConnectionException e) { LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { @@ -61,7 +63,7 @@ public static void testGetGroupListByAppkey() { try { String res = client.getGroupListByAppkey(0, 30); - System.out.println(res); + LOG.info(res); } catch (APIConnectionException e) { LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { diff --git a/example/main/java/cn/jpush/api/examples/IMUserExample.java b/example/main/java/cn/jpush/api/examples/IMUserExample.java index d1b76c6e..1db512b4 100644 --- a/example/main/java/cn/jpush/api/examples/IMUserExample.java +++ b/example/main/java/cn/jpush/api/examples/IMUserExample.java @@ -1,10 +1,10 @@ package cn.jpush.api.examples; import cn.jpush.api.jmessage.JMessageClient; - import cn.jpush.api.common.resp.APIConnectionException; import cn.jpush.api.jmessage.base.connection.APIRequestException; import cn.jpush.api.jmessage.base.model.RegisterInfo; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +41,7 @@ public static void testRegisterUsers() { RegisterInfo[] regUsers = new RegisterInfo[users.size()]; String res = client.registerUsers(users.toArray(regUsers)); - System.out.println(res); + LOG.info(res); } catch (APIConnectionException e) { LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { @@ -56,7 +56,7 @@ public static void testGetUserInfo() { try { String res = client.getUserInfo("test_user"); - System.out.println(res); + LOG.info(res); } catch (APIConnectionException e) { LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { @@ -99,7 +99,7 @@ public static void testGetUsers() { try { String res = client.getUserList(0, 30); - System.out.println(res); + LOG.info(res); } catch (APIConnectionException e) { LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { @@ -114,7 +114,7 @@ public static void testGetGroupsByUser() { try { String res = client.getGroupListByUser("test_user"); - System.out.println(res); + LOG.info(res); } catch (APIConnectionException e) { LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { diff --git a/src/test/java/cn/jpush/api/jmessage/group/GroupClientTest.java b/src/test/java/cn/jpush/api/jmessage/group/GroupClientTest.java index fcb857c3..d639482a 100644 --- a/src/test/java/cn/jpush/api/jmessage/group/GroupClientTest.java +++ b/src/test/java/cn/jpush/api/jmessage/group/GroupClientTest.java @@ -12,12 +12,16 @@ import com.google.gson.JsonPrimitive; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; public class GroupClientTest extends BaseTest { + private static Logger LOG = LoggerFactory.getLogger(GroupClientTest.class); + private GroupClient groupClient = null; @Before @@ -37,10 +41,12 @@ public void testGetGroupInfo() { assertEquals(200, res.responseCode); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); assertTrue(false); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); assertTrue(false); } } @@ -50,9 +56,11 @@ public void testGetGroupInfo_GidNegative() { try { groupClient.getGroupInfo(-1); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -67,10 +75,12 @@ public void testGetGroupMembers() { assertEquals(200, res.responseCode); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); assertTrue(false); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); assertTrue(false); } } @@ -80,9 +90,11 @@ public void testGetGroupMembers_GidNegative() { try { groupClient.getGroupMembers(-1); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -96,21 +108,22 @@ public void testGetGroupListByAppkey() { assertEquals(200, res.responseCode); - System.out.println(res.responseContent); try { JsonObject obj = parser.parse(res.responseContent).getAsJsonObject(); int count = obj.get("count").getAsInt(); assertEquals(2, count); } catch (Exception e) { - System.out.println(e.getMessage()); + LOG.error("parse response content error.", e); assertTrue(false); } } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); assertTrue(false); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); assertTrue(false); } } @@ -120,9 +133,11 @@ public void testGetGroupListByAppkey_StartNegative() { try { groupClient.getGroupListByAppkey(-1, 3); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -131,9 +146,11 @@ public void testGetGroupListByAppkey_CountNegative() { try { groupClient.getGroupListByAppkey(0, -1); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -142,9 +159,11 @@ public void testGetGroupListByAppkey_CountMoreThan500() { try { groupClient.getGroupListByAppkey(0, 501); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -177,15 +196,17 @@ public void testCreateGroup() { ResponseWrapper res1 = groupClient.deleteGroup(gid); assertEquals(204, res1.responseCode); } catch (Exception e) { - System.out.println(e.getMessage()); + LOG.error("parse response content error.", e); assertTrue(false); } } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); assertTrue(false); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); assertTrue(false); } } @@ -195,9 +216,11 @@ public void testCreateGroupNull() { try { groupClient.createGroup(null); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -223,10 +246,12 @@ public void testAddOrRemoveMembers() { assertEquals(204, res1.responseCode); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); assertTrue(false); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); assertTrue(false); } } @@ -236,9 +261,11 @@ public void testAddOrRemoveMembers_GidNegative() { try { groupClient.addOrRemoveMembers(-1, Members.newBuilder().build(), Members.newBuilder().build()); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -247,9 +274,11 @@ public void testAddOrRemoveMembers_AddRemoveBothNull() { try { groupClient.addOrRemoveMembers(10010, null, null); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -265,9 +294,11 @@ public void testDeleteGroup_GidNegative() { try { groupClient.deleteGroup(-1); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -283,10 +314,12 @@ public void testUpdateGroupInfo() { ResponseWrapper res1 = groupClient.updateGroupInfo(JUNIT_GID, null, "junit group desc"); assertEquals(204, res1.responseCode); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); assertTrue(false); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); assertTrue(false); } } @@ -296,9 +329,11 @@ public void testUpdateGroupInfo_GidNegative() { try { groupClient.updateGroupInfo(-1, "test_group", "group desc"); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -307,9 +342,11 @@ public void testUpdateGroupInfo_NameDescBothNull() { try { groupClient.updateGroupInfo(10010, null, null); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -318,9 +355,11 @@ public void testUpdateGroupInfo_NameOverLength() { try { groupClient.updateGroupInfo(10010, MORE_THAN_64, "test desc"); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -329,9 +368,11 @@ public void testUpdateGroupInfo_DescOverLength() { try { groupClient.updateGroupInfo(10010, "test_name", MORE_THAN_250); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } diff --git a/src/test/java/cn/jpush/api/jmessage/user/UserClientTest.java b/src/test/java/cn/jpush/api/jmessage/user/UserClientTest.java index 7c629315..9c391b02 100644 --- a/src/test/java/cn/jpush/api/jmessage/user/UserClientTest.java +++ b/src/test/java/cn/jpush/api/jmessage/user/UserClientTest.java @@ -13,6 +13,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; @@ -24,6 +26,7 @@ public class UserClientTest extends BaseTest { + private static Logger LOG = LoggerFactory.getLogger(UserClientTest.class); private UserClient userClient = null; @Before @@ -67,10 +70,12 @@ public void testRegisterUsers() { assertEquals(204, res1.responseCode); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); assertTrue(false); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); assertTrue(false); } } @@ -94,10 +99,12 @@ public void testRegisterUsers_exist() { assertEquals(201, res.responseCode); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); assertTrue(false); } catch (APIRequestException e) { - System.out.println(e.getMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); assertTrue(e.getErrorMessage().contains("exit")); } } @@ -107,9 +114,11 @@ public void testRegisterUserNull() { try { userClient.registerUsers(null); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -148,10 +157,12 @@ public void testRegisterAdmins() { userClient.deleteUser("junit_test_admin"); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); assertTrue(false); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); assertTrue(false); } } @@ -161,9 +172,11 @@ public void testRegisterAdminNull() { try { userClient.registerAdmins(null); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -179,10 +192,12 @@ public void testGetUserInfo() { assertEquals(200, res.responseCode); assertTrue(res.responseContent.contains(JUNIT_USER)); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); assertTrue(false); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); assertTrue(false); } } @@ -192,9 +207,11 @@ public void testGetUserInfoNull() { try { userClient.getUserInfo(null); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -203,9 +220,11 @@ public void testGetUserInfoEmpty() { try { userClient.getUserInfo(""); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -214,9 +233,11 @@ public void testGetUserInfoBlank() { try { userClient.getUserInfo(" "); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -227,13 +248,14 @@ public void testGetUserInfoBlank() { public void testUpdatePassword() { try { ResponseWrapper res = userClient.updatePassword(JUNIT_USER, "junit_new_password"); - System.out.println(res.responseContent); assertEquals(204, res.responseCode); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); assertTrue(false); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); assertTrue(false); } } @@ -243,9 +265,11 @@ public void testUpdatePassword_UsernameNull() { try { userClient.updatePassword(null, "password"); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -254,9 +278,11 @@ public void testUpdatePassword_UsernameBlank() { try { userClient.updatePassword(" ", "password"); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -265,9 +291,11 @@ public void testUpdatePassword_PasswordNull() { try { userClient.updatePassword("test_user", null); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -276,9 +304,11 @@ public void testUpdatePassword_PasswordBlank() { try { userClient.updatePassword("test_user", " "); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -287,9 +317,11 @@ public void testUpdatePassword_PasswordLengthNotEnough() { try { userClient.updatePassword("test_user", "123"); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -298,9 +330,11 @@ public void testUpdatePassword_PasswordOverLength() { try { userClient.updatePassword("test_user", MORE_THAN_128); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -326,10 +360,12 @@ public void testUpdateUserInfo() { assertEquals(204, res.responseCode); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); assertTrue(false); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); assertTrue(false); } } @@ -339,9 +375,11 @@ public void testUpdateUserInfo_UsernameNull() { try { userClient.updateUserInfo(null, UserPayload.newBuilder().build()); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -350,9 +388,11 @@ public void testUpdateUserInfo_UsernameBlank() { try { userClient.updateUserInfo(" ", UserPayload.newBuilder().build()); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -361,9 +401,11 @@ public void testUpdateUserInfo_PayloadNull() { try { userClient.updateUserInfo("test_user", null); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -381,15 +423,17 @@ public void testGetUserList() { JsonObject obj = parser.parse(res.responseContent).getAsJsonObject(); assertEquals(5, obj.get("count").getAsInt()); } catch (Exception e) { - System.out.println(e.getMessage()); + LOG.error("parse response content error.", e); assertTrue(false); } } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); assertTrue(false); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); assertTrue(false); } } @@ -399,9 +443,11 @@ public void testGetUserList_StartNegative() { try { userClient.getUserList(-1, 3); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -410,9 +456,11 @@ public void testGetUserList_CountNegative() { try { userClient.getUserList(0, -1); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -421,9 +469,11 @@ public void testGetUserList_CountMoreThan500() { try { userClient.getUserList(0, 501); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -438,10 +488,12 @@ public void testGetGroupList() { assertEquals(200, res.responseCode); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); assertTrue(false); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); assertTrue(false); } } @@ -451,9 +503,11 @@ public void testGetGroupList_UsernameNull() { try { userClient.getGroupList(null); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -462,9 +516,11 @@ public void testGetGroupList_UsernameBlank() { try { userClient.getGroupList(" "); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -480,9 +536,11 @@ public void testDeleteUser_UsernameNull() { try { userClient.deleteUser(null); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } @@ -491,9 +549,11 @@ public void testDeleteUser_UsernameBlank() { try { userClient.deleteUser(" "); } catch (APIConnectionException e) { - System.out.println(e.getMessage()); + LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { - System.out.println(e.getErrorMessage()); + LOG.error("Error response from JPush server. Should review and fix it. ", e); + LOG.info("HTTP Status: " + e.getStatus()); + LOG.info("Error Message: " + e.getMessage()); } } From 668ca6b764677526dfa509f42f1d62abee13930f Mon Sep 17 00:00:00 2001 From: Liuchy1 Date: Wed, 6 May 2015 17:16:59 +0800 Subject: [PATCH 3/3] modify Readme fix print log --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8f48b202..3b6f3452 100644 --- a/README.md +++ b/README.md @@ -256,7 +256,7 @@ RegisterInfo[] regUsers = new RegisterInfo[users.size()]; String res = client.registerUsers(users.toArray(regUsers)); - System.out.println(res); + LOG.info(res); } catch (APIConnectionException e) { LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) { @@ -274,7 +274,7 @@ JMessageClient client = new JMessageClient(appkey, masterSecret); try { String res = client.createGroup("test_user", "test_gname1", "description", "test_user"); - System.out.println(res); + LOG.info(res); } catch (APIConnectionException e) { LOG.error("Connection error. Should retry later. ", e); } catch (APIRequestException e) {