From 86002dd4be416b2e1a613e0b68cebd0fb2380f3a Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sat, 9 Apr 2016 14:16:36 +0800 Subject: [PATCH] testing string format of log. Signed-off-by: Bo-Yi Wu --- gorush/notification_test.go | 20 +++++++++++++++++++- gorush/server_test.go | 2 -- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/gorush/notification_test.go b/gorush/notification_test.go index 17c5697..c4c45b0 100644 --- a/gorush/notification_test.go +++ b/gorush/notification_test.go @@ -261,7 +261,7 @@ func TestPushToAndroidWrongToken(t *testing.T) { assert.True(t, success) } -func TestPushToAndroidRightToken(t *testing.T) { +func TestPushToAndroidRightTokenForJSONLog(t *testing.T) { PushConf = BuildDefaultPushConf() PushConf.Android.Enabled = true @@ -281,6 +281,24 @@ func TestPushToAndroidRightToken(t *testing.T) { assert.True(t, success) } +func TestPushToAndroidRightTokenForStringLog(t *testing.T) { + PushConf = BuildDefaultPushConf() + + PushConf.Android.Enabled = true + PushConf.Android.ApiKey = os.Getenv("ANDROID_API_KEY") + + android_token := os.Getenv("ANDROID_TEST_TOKEN") + + req := RequestPushNotification{ + Tokens: []string{android_token, "bbbbb"}, + Platform: 2, + Message: "Welcome", + } + + success := PushToAndroid(req) + assert.True(t, success) +} + func TestOverwriteAndroidApiKey(t *testing.T) { PushConf = BuildDefaultPushConf() diff --git a/gorush/server_test.go b/gorush/server_test.go index 0049695..b108dda 100644 --- a/gorush/server_test.go +++ b/gorush/server_test.go @@ -205,8 +205,6 @@ func TestHalfSuccessAndroidPushHandler(t *testing.T) { PushConf.Android.Enabled = true PushConf.Android.ApiKey = os.Getenv("ANDROID_API_KEY") - // log for json - PushConf.Log.Format = "json" android_token := os.Getenv("ANDROID_TEST_TOKEN")