From 09b4bbe839126192ec65d86b61d5a940e8fe20e5 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sun, 3 Apr 2016 21:05:32 +0800 Subject: [PATCH] remove duplicate of testing. Signed-off-by: Bo-Yi Wu --- gorush/notification_test.go | 4 +--- gorush/server_test.go | 44 +++---------------------------------- 2 files changed, 4 insertions(+), 44 deletions(-) diff --git a/gorush/notification_test.go b/gorush/notification_test.go index 48e1846..45173f4 100644 --- a/gorush/notification_test.go +++ b/gorush/notification_test.go @@ -6,8 +6,8 @@ import ( "github.com/google/go-gcm" "github.com/stretchr/testify/assert" "log" - "testing" "os" + "testing" ) func TestDisabledAndroidIosConf(t *testing.T) { @@ -228,7 +228,6 @@ func TestPushToAndroidWrongAPIKey(t *testing.T) { PushConf.Android.Enabled = true PushConf.Android.ApiKey = os.Getenv("ANDROID_API_KEY") + "a" - req := RequestPushNotification{ Tokens: []string{"aaaaaa", "bbbbb"}, Platform: 2, @@ -245,7 +244,6 @@ func TestPushToAndroidWrongToken(t *testing.T) { PushConf.Android.Enabled = true PushConf.Android.ApiKey = os.Getenv("ANDROID_API_KEY") - req := RequestPushNotification{ Tokens: []string{"aaaaaa", "bbbbb"}, Platform: 2, diff --git a/gorush/server_test.go b/gorush/server_test.go index 5dbdfd7..543ec8a 100644 --- a/gorush/server_test.go +++ b/gorush/server_test.go @@ -26,6 +26,8 @@ func TestPrintGoPushVersion(t *testing.T) { func TestRunNormalServer(t *testing.T) { initTest() + gin.SetMode(gin.TestMode) + router := gin.New() go func() { @@ -199,47 +201,7 @@ func TestDisabledAndroidPushHandler(t *testing.T) { }) } -func TestAndroidWrongAPIKey(t *testing.T) { - initTest() - - PushConf.Android.Enabled = true - PushConf.Android.ApiKey = os.Getenv("ANDROID_API_KEY") + "a" - - r := gofight.New() - - r.POST("/api/push"). - SetJSON(gofight.D{ - "tokens": []string{"aaaaaa", "bbbbb"}, - "platform": 2, - "message": "Welcome", - }). - Run(GetMainEngine(), func(r gofight.HttpResponse, rq gofight.HttpRequest) { - - assert.Equal(t, http.StatusOK, r.Code) - }) -} - -func TestAndroidWrongToken(t *testing.T) { - initTest() - - PushConf.Android.Enabled = true - PushConf.Android.ApiKey = os.Getenv("ANDROID_API_KEY") - - r := gofight.New() - - r.POST("/api/push"). - SetJSON(gofight.D{ - "tokens": []string{"aaaaaa", "bbbbb"}, - "platform": 2, - "message": "Welcome", - }). - Run(GetMainEngine(), func(r gofight.HttpResponse, rq gofight.HttpRequest) { - - assert.Equal(t, http.StatusOK, r.Code) - }) -} - -func TestAndroidRightToken(t *testing.T) { +func TestAndroidPushHandler(t *testing.T) { initTest() PushConf.Android.Enabled = true