From 96802ae68bbe86b89fb44551e336d0d60a257d21 Mon Sep 17 00:00:00 2001 From: ian douglas Date: Thu, 22 Sep 2016 20:08:39 -0600 Subject: [PATCH] test cleanup, removed lots of Println debugging --- README.md | 2 +- client.go | 40 ++------------- client_test.go | 9 ++-- error_test.go | 17 ++----- feed_aggregated_test.go | 100 ++++++++++-------------------------- feed_flat_test.go | 74 +++++++-------------------- feed_notification_test.go | 104 +++++++++++--------------------------- getstream_test.go | 10 +--- main.go | 2 +- utils_test.go | 48 +++++++----------- 10 files changed, 111 insertions(+), 295 deletions(-) diff --git a/README.md b/README.md index 73f2560..30332b1 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ if err != nil { activity, err := feed.AddActivity(&Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: FeedID("flat:eric"), Actor: FeedID("flat:john"), }) diff --git a/client.go b/client.go index 92144c8..bbec251 100644 --- a/client.go +++ b/client.go @@ -4,7 +4,6 @@ import ( "bytes" "encoding/json" "errors" - "fmt" "gopkg.in/LeisureLink/httpsig.v1" "io/ioutil" "net/http" @@ -207,15 +206,12 @@ func ConvertUUIDToWord(uuid string) string { // get request helper func (c *Client) get(f Feed, path string, payload []byte, params map[string]string) ([]byte, error) { - res, err := c.request(f, "GET", path, payload, params) - return res, err + return c.request(f, "GET", path, payload, params) } // post request helper func (c *Client) post(f Feed, path string, payload []byte, params map[string]string) ([]byte, error) { - fmt.Println(f, "POST", path, string(payload), params) - res, err := c.request(f, "POST", path, payload, params) - return res, err + return c.request(f, "POST", path, payload, params) } // delete request helper @@ -281,13 +277,7 @@ func (c *Client) request(f Feed, method string, path string, payload []byte, par // } //} - fmt.Println("final auth/sig:", auth+"/"+sig) - - c.setAuthHeaders(req, f, auth, sig) - - fmt.Println("req.Body", req.Body) - fmt.Println("req.Header", req.Header) - fmt.Println("req.URL", req.URL) + c.setAuthSigAndHeaders(req, f, auth, sig) // perform the http request resp, err := c.HTTP.Do(req) @@ -305,11 +295,9 @@ func (c *Client) request(f Feed, method string, path string, payload []byte, par // handle the response switch { case resp.StatusCode/100 == 2: // SUCCESS - fmt.Println("200 success:", string(body)) return body, nil default: var respErr Error - fmt.Println("client.request non-200 success, body:", string(body)) err = json.Unmarshal(body, &respErr) if err != nil { return nil, err @@ -349,44 +337,24 @@ func (c *Client) setBaseHeaders(request *http.Request) { request.Header.Set("Date", t.Format("Mon, 2 Jan 2006 15:04:05 MST")) } -func (c *Client) setAuthHeaders(request *http.Request, f Feed, auth string, sig string) error { - // debugging - //fmt.Println("is feed nil?", f) - //fmt.Println("c.Config.APISecret:", c.Config.APISecret) - //fmt.Println("c.Config.Token:", c.Config.Token) - //if f != nil { - // fmt.Println("f.Token:", f.Token()) - // fmt.Println("f.Signature:", f.Signature()) - //} - - //fmt.Println(auth) - +func (c *Client) setAuthSigAndHeaders(request *http.Request, f Feed, auth string, sig string) error { if sig == "jwt" { - fmt.Println("--[ setAuthHeader: JWT ]---") request.Header.Set("stream-auth-type", "jwt") if f == nil { request.Header.Set("Authorization", c.Config.Token) - } else { } return nil } if sig == "sig" { - fmt.Println("--[ setAuthHeader: sig ]---") if auth == "feed" { - fmt.Println("-- feed auth") if f.Token() == "" { - fmt.Println("-- generating new token") f.GenerateToken(c.Signer) } - fmt.Println("-- feed signature:", f.Signature()) request.Header.Set("Authorization", f.Signature()) } else if auth == "app" { - fmt.Println("-- app auth, doing httpsig") signer, _ := httpsig.NewRequestSigner(c.Config.APIKey, c.Config.APISecret, "hmac-sha256") signer.SignRequest(request, []string{}, nil) - } else { - fmt.Println("****** we should not be here!") } return nil } diff --git a/client_test.go b/client_test.go index 03d71fa..c729097 100644 --- a/client_test.go +++ b/client_test.go @@ -3,6 +3,7 @@ package getstream_test import ( "testing" + "github.com/pborman/uuid" getstream "github.com/GetStream/stream-go" ) @@ -67,7 +68,7 @@ func TestFlatFeedInputValidation(t *testing.T) { t.Fatal(err) } - _, err = client.FlatFeed("user", "099978b6-3b72-4f5c-bc43-247ba6ae2dd9") + _, err = client.FlatFeed("user", uuid.New()) if err != nil { t.Fatal(err) } @@ -88,7 +89,7 @@ func TestNotificationFeedInputValidation(t *testing.T) { t.Fatal(err) } - _, err = client.NotificationFeed("user", "099978b6-3b72-4f5c-bc43-247ba6ae2dd9") + _, err = client.NotificationFeed("user", uuid.New()) if err != nil { t.Fatal(err) } @@ -172,7 +173,7 @@ func TestClientInitWithToken(t *testing.T) { activity, err := feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }) @@ -282,7 +283,7 @@ func TestAddActivityToMany(t *testing.T) { activity := &getstream.Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), } diff --git a/error_test.go b/error_test.go index 6b1a799..fb0314b 100644 --- a/error_test.go +++ b/error_test.go @@ -2,7 +2,6 @@ package getstream_test import ( "encoding/json" - "fmt" "testing" "time" @@ -16,9 +15,7 @@ func TestError(t *testing.T) { var getStreamError getstream.Error err := json.Unmarshal([]byte(errorResponse), &getStreamError) if err != nil { - fmt.Println(err) - t.Fail() - return + t.Fatal(err) } testError := getstream.Error{ @@ -30,18 +27,15 @@ func TestError(t *testing.T) { } if getStreamError != testError { - fmt.Println(err) - t.Fail() + t.Error(err) } if getStreamError.Duration() != time.Millisecond*36 { - fmt.Println(err) - t.Fail() + t.Error(err) } if getStreamError.Error() != "an exception (36ms): some detail" { - fmt.Println(err) - t.Fail() + t.Error(err) } } @@ -56,8 +50,7 @@ func TestErrorBadDuration(t *testing.T) { } if testError.Duration() != time.Duration(0) { - t.Fail() - return + t.Fatal() } } diff --git a/feed_aggregated_test.go b/feed_aggregated_test.go index d898d06..9981b17 100644 --- a/feed_aggregated_test.go +++ b/feed_aggregated_test.go @@ -2,39 +2,32 @@ package getstream_test import ( "encoding/json" - "fmt" - getstream "github.com/GetStream/stream-go" - "github.com/pborman/uuid" "testing" "time" + + "github.com/pborman/uuid" + getstream "github.com/GetStream/stream-go" ) -func ExampleAggregatedFeed_AddActivity() { - client, err := getstream.New(&getstream.Config{ - APIKey: "APIKey", - APISecret: "APISecret", - AppID: "AppID", - Location: "Region"}) +func TestExampleAggregatedFeed_AddActivity(t *testing.T) { + client, err := PreTestSetup() if err != nil { - fmt.Println(err) - return + t.Fatal(err) } - feed, err := client.AggregatedFeed("FeedSlug", "UserID") + feed, err := client.AggregatedFeed("flat", "UserID") if err != nil { - fmt.Println(err) - return + t.Fatal(err) } activity, err := feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }) if err != nil { - fmt.Println(err) - return + t.Fatal(err) } _ = activity @@ -53,7 +46,7 @@ func TestAggregatedFeedAddActivity(t *testing.T) { activity, err := feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }) @@ -89,7 +82,7 @@ func TestAggregatedFeedAddActivityWithTo(t *testing.T) { activity, err := feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), To: []getstream.Feed{toFeed}, @@ -155,7 +148,7 @@ func TestAggregatedFeedRemoveByForeignIDActivity(t *testing.T) { activity, err := feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "08f01c47-014f-11e4-aa8f-0cc47a024be0", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }) @@ -193,7 +186,7 @@ func TestAggregatedFeedActivities(t *testing.T) { _, err = feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }) @@ -376,9 +369,7 @@ func TestAggregatedActivityMetaData(t *testing.T) { dataB, err := json.Marshal(data) if err != nil { - fmt.Println(err) - t.Fail() - return + t.Fatal(err) } raw := json.RawMessage(dataB) @@ -399,86 +390,51 @@ func TestAggregatedActivityMetaData(t *testing.T) { b, err := json.Marshal(&activity) if err != nil { - fmt.Println(err) - t.Fail() - return + t.Fatal(err) } b2, err := json.Marshal(activity) if err != nil { - fmt.Println(err) - t.Fail() - return + t.Fatal(err) } resultActivity := getstream.Activity{} err = json.Unmarshal(b, &resultActivity) if err != nil { - fmt.Println(err) - t.Fail() + t.Error(err) } resultActivity2 := getstream.Activity{} err = json.Unmarshal(b2, &resultActivity2) if err != nil { - fmt.Println(err) - t.Fail() + t.Error(err) } if resultActivity.ForeignID != activity.ForeignID { - fmt.Println(activity.ForeignID) - fmt.Println(resultActivity.ForeignID) - t.Fail() + t.Error(activity.ForeignID, resultActivity.ForeignID) } if resultActivity.Actor != activity.Actor { - fmt.Println(activity.Actor) - fmt.Println(resultActivity.Actor) - t.Fail() + t.Error(activity.Actor, resultActivity.Actor) } if resultActivity.Origin != activity.Origin { - fmt.Println(activity.Origin) - fmt.Println(resultActivity.Origin) - t.Fail() + t.Error(activity.Origin, resultActivity.Origin) } if resultActivity.Verb != activity.Verb { - fmt.Println(activity.Verb) - fmt.Println(resultActivity.Verb) - t.Fail() + t.Error(activity.Verb, resultActivity.Verb) } if resultActivity.Object != activity.Object { - fmt.Println(activity.Object) - fmt.Println(resultActivity.Object) - t.Fail() + t.Error(activity.Object, resultActivity.Object) } if resultActivity.Target != activity.Target { - fmt.Println(activity.Target) - fmt.Println(resultActivity.Target) - t.Fail() + t.Error(activity.Target, resultActivity.Target) } if resultActivity.TimeStamp.Format("2006-01-02T15:04:05.999999") != activity.TimeStamp.Format("2006-01-02T15:04:05.999999") { - fmt.Println(activity.TimeStamp) - fmt.Println(resultActivity.TimeStamp) - t.Fail() + t.Error(activity.TimeStamp, resultActivity.TimeStamp) } if resultActivity.MetaData["meta"] != activity.MetaData["meta"] { - fmt.Println(activity.MetaData) - fmt.Println(resultActivity.MetaData) - t.Fail() + t.Error(activity.MetaData, resultActivity.MetaData) } if string(*resultActivity.Data) != string(*activity.Data) { - fmt.Println(string(*activity.Data)) - fmt.Println(string(*resultActivity.Data)) - t.Fail() + t.Error(string(*activity.Data), string(*resultActivity.Data)) } - - // fmt.Println(resultActivity) - // fmt.Println(resultActivity.ForeignID) - // fmt.Println(string(resultActivity.Data)) - // fmt.Println(resultActivity.MetaData) - // - // fmt.Println(resultActivity2) - // fmt.Println(resultActivity2.ForeignID) - // fmt.Println(string(resultActivity2.Data)) - // fmt.Println(resultActivity2.MetaData) - } diff --git a/feed_flat_test.go b/feed_flat_test.go index a0f44c1..b7f9a3b 100644 --- a/feed_flat_test.go +++ b/feed_flat_test.go @@ -2,7 +2,6 @@ package getstream_test import ( "encoding/json" - "fmt" "testing" "time" @@ -24,7 +23,7 @@ func TestExampleFlatFeedAddActivity(t *testing.T) { activity, err := feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }) @@ -76,7 +75,7 @@ func TestFlatFeedAddActivity(t *testing.T) { activity, err := feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }) @@ -117,7 +116,7 @@ func TestFlatFeedAddActivityWithTo(t *testing.T) { activity, err := feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), To: []getstream.Feed{feedTo, feedToB}, @@ -150,12 +149,9 @@ func TestFlatFeedUUID(t *testing.T) { var activities []*getstream.Activity for i := 0; i < 10; i++ { - - foreignID := uuid.New() - activity, err := feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: foreignID, + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }) @@ -222,7 +218,7 @@ func TestFlatFeedRemoveByForeignIDActivity(t *testing.T) { activity, err := feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "08f01c47-014f-11e4-aa8f-0cc47a024be0", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }) @@ -260,7 +256,7 @@ func TestFlatFeedGetActivities(t *testing.T) { _, err = feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }) @@ -297,12 +293,12 @@ func TestFlatFeedAddActivities(t *testing.T) { activities, err := feed.AddActivities([]*getstream.Activity{ &getstream.Activity{ Verb: "post", - ForeignID: "099978b6-3b72-4f5c-bc43-247ba6ae2dd9", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }, &getstream.Activity{ Verb: "walk", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:john"), Actor: getstream.FeedID("flat:eric"), }, @@ -515,55 +511,29 @@ func TestFlatActivityMetaData(t *testing.T) { } if resultActivity.ForeignID != activity.ForeignID { - fmt.Println(activity.ForeignID) - fmt.Println(resultActivity.ForeignID) - t.Fail() + t.Error(activity.ForeignID, resultActivity.ForeignID) } if resultActivity.Actor != activity.Actor { - fmt.Println(activity.Actor) - fmt.Println(resultActivity.Actor) - t.Fail() + t.Error(activity.Actor, resultActivity.Actor) } if resultActivity.Verb != activity.Verb { - fmt.Println(activity.Verb) - fmt.Println(resultActivity.Verb) - t.Fail() + t.Error(activity.Verb, resultActivity.Verb) } if resultActivity.Object != activity.Object { - fmt.Println(activity.Object) - fmt.Println(resultActivity.Object) - t.Fail() + t.Error(activity.Object, resultActivity.Object) } if resultActivity.Target != activity.Target { - fmt.Println(activity.Target) - fmt.Println(resultActivity.Target) - t.Fail() + t.Error(activity.Target, resultActivity.Target) } if resultActivity.TimeStamp.Format("2006-01-02T15:04:05.999999") != activity.TimeStamp.Format("2006-01-02T15:04:05.999999") { - fmt.Println(activity.TimeStamp) - fmt.Println(resultActivity.TimeStamp) - t.Fail() + t.Error(activity.TimeStamp, resultActivity.TimeStamp) } if resultActivity.MetaData["meta"] != activity.MetaData["meta"] { - fmt.Println(activity.MetaData) - fmt.Println(resultActivity.MetaData) - t.Fail() + t.Error(activity.MetaData, resultActivity.MetaData) } if string(*resultActivity.Data) != string(*activity.Data) { - fmt.Println(string(*activity.Data)) - fmt.Println(string(*resultActivity.Data)) - t.Fail() + t.Error(string(*activity.Data), string(*resultActivity.Data)) } - - // fmt.Println(resultActivity) - // fmt.Println(resultActivity.ForeignID) - // fmt.Println(string(resultActivity.Data)) - // fmt.Println(resultActivity.MetaData) - // - // fmt.Println(resultActivity2) - // fmt.Println(resultActivity2.ForeignID) - // fmt.Println(string(resultActivity2.Data)) - // fmt.Println(resultActivity2.MetaData) } func TestFlatFeedMultiFollow(t *testing.T) { @@ -576,7 +546,6 @@ func TestFlatFeedMultiFollow(t *testing.T) { if err != nil { t.Fatal(err) } - //bobFeed.Client.Signer.SignFeed(bobFeed.FeedIDWithoutColon()) sallyFeed, err := client.FlatFeed("flat", "sally") if err != nil { @@ -598,6 +567,7 @@ func TestFlatFeedMultiFollow(t *testing.T) { } // the tests below will verify that this multi-follow has succeeded + // need to verify functionality on our API before uncommenting and keeping these //followers, err := sallyFeed.FollowersWithLimitAndSkip(5, 0) //if err != nil { @@ -640,17 +610,11 @@ func TestFlatFeedUpdateActivities(t *testing.T) { t.Fatal(err) } - // make a feed for bob - fmt.Println("-----[ feed for bob ]-----") bobFeed, err := client.FlatFeed("flat", "bob") if err != nil { t.Fatal(err) } - fmt.Println("feedIDwithoutColon: ", bobFeed.FeedIDWithoutColon()) - fmt.Println("feed token: ", bobFeed.Token()) - // make one activity - fmt.Println("-----[ create activity 1 ]-----") activity1 := &getstream.Activity{ Verb: "post", ForeignID: uuid.New(), @@ -662,8 +626,6 @@ func TestFlatFeedUpdateActivities(t *testing.T) { t.Fatal(err) } - // make a second activity - fmt.Println("-----[ create activity 2 ]-----") activity2 := &getstream.Activity{ Verb: "post", ForeignID: uuid.New(), @@ -675,14 +637,12 @@ func TestFlatFeedUpdateActivities(t *testing.T) { t.Fatal(err) } - // now update those activities to have a different 'actor' value activity1.Actor = getstream.FeedID("flat:123") activity2.Actor = getstream.FeedID("flat:123") // push those activities to Stream // unlike the AddActivities method, the UpdateActivities call only returns an error value activities := []*getstream.Activity{activity1, activity2} - fmt.Println("-----[ update activities ]-----") err = bobFeed.UpdateActivities(activities) if err != nil { t.Fatal(err) diff --git a/feed_notification_test.go b/feed_notification_test.go index 9121cd0..a1aed57 100644 --- a/feed_notification_test.go +++ b/feed_notification_test.go @@ -2,39 +2,32 @@ package getstream_test import ( "encoding/json" - "fmt" - "github.com/GetStream/stream-go" - "github.com/pborman/uuid" "testing" "time" + + getstream "github.com/GetStream/stream-go" + "github.com/pborman/uuid" ) -func ExampleNotificationFeed_AddActivity() { - client, err := getstream.New(&getstream.Config{ - APIKey: "APIKey", - APISecret: "APISecret", - AppID: "AppID", - Location: "Region"}) +func TestExampleNotificationFeed_AddActivity(t *testing.T) { + client, err := PreTestSetup() if err != nil { - fmt.Println(err) - return + t.Fatal(err) } - feed, err := client.NotificationFeed("FeedSlug", "UserID") + feed, err := client.NotificationFeed("flat", "UserID") if err != nil { - fmt.Println(err) - return + t.Fatal(err) } activity, err := feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }) if err != nil { - fmt.Println(err) - return + t.Fatal(err) } _ = activity @@ -53,7 +46,7 @@ func TestNotificationFeedAddActivity(t *testing.T) { activity, err := feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }) @@ -89,7 +82,7 @@ func TestNotificationFeedAddActivityWithTo(t *testing.T) { activity, err := feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), To: []getstream.Feed{feedTo}, @@ -155,7 +148,7 @@ func TestNotificationFeedRemoveByForeignIDActivity(t *testing.T) { activity, err := feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "08f01c47-014f-11e4-aa8f-0cc47a024be0", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }) @@ -193,7 +186,7 @@ func TestNotificationFeedActivities(t *testing.T) { _, err = feed.AddActivity(&getstream.Activity{ Verb: "post", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }) @@ -228,12 +221,12 @@ func TestNotificationFeedAddActivities(t *testing.T) { activities, err := feed.AddActivities([]*getstream.Activity{ &getstream.Activity{ Verb: "post", - ForeignID: "099978b6-3b72-4f5c-bc43-247ba6ae2dd9", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:eric"), Actor: getstream.FeedID("flat:john"), }, &getstream.Activity{ Verb: "walk", - ForeignID: "48d024fe-3752-467a-8489-23febd1dec4e", + ForeignID: uuid.New(), Object: getstream.FeedID("flat:john"), Actor: getstream.FeedID("flat:eric"), }, @@ -450,9 +443,7 @@ func TestNotificationActivityMetaData(t *testing.T) { dataB, err := json.Marshal(data) if err != nil { - fmt.Println(err) - t.Fail() - return + t.Fatal(err) } raw := json.RawMessage(dataB) @@ -473,86 +464,51 @@ func TestNotificationActivityMetaData(t *testing.T) { b, err := json.Marshal(&activity) if err != nil { - fmt.Println(err) - t.Fail() - return + t.Fatal(err) } b2, err := json.Marshal(activity) if err != nil { - fmt.Println(err) - t.Fail() - return + t.Fatal(err) } resultActivity := getstream.Activity{} err = json.Unmarshal(b, &resultActivity) if err != nil { - fmt.Println(err) - t.Fail() + t.Fatal(err) } resultActivity2 := getstream.Activity{} err = json.Unmarshal(b2, &resultActivity2) if err != nil { - fmt.Println(err) - t.Fail() + t.Fatal(err) } if resultActivity.ForeignID != activity.ForeignID { - fmt.Println(activity.ForeignID) - fmt.Println(resultActivity.ForeignID) - t.Fail() + t.Error(activity.ForeignID, resultActivity.ForeignID) } if resultActivity.Actor != activity.Actor { - fmt.Println(activity.Actor) - fmt.Println(resultActivity.Actor) - t.Fail() + t.Error(activity.Actor, resultActivity.Actor) } if resultActivity.Origin != activity.Origin { - fmt.Println(activity.Origin) - fmt.Println(resultActivity.Origin) - t.Fail() + t.Error(activity.Origin, resultActivity.Origin) } if resultActivity.Verb != activity.Verb { - fmt.Println(activity.Verb) - fmt.Println(resultActivity.Verb) - t.Fail() + t.Error(activity.Verb, resultActivity.Verb) } if resultActivity.Object != activity.Object { - fmt.Println(activity.Object) - fmt.Println(resultActivity.Object) - t.Fail() + t.Error(activity.Object, resultActivity.Object) } if resultActivity.Target != activity.Target { - fmt.Println(activity.Target) - fmt.Println(resultActivity.Target) - t.Fail() + t.Error(activity.Target, resultActivity.Target) } if resultActivity.TimeStamp.Format("2006-01-02T15:04:05.999999") != activity.TimeStamp.Format("2006-01-02T15:04:05.999999") { - fmt.Println(activity.TimeStamp) - fmt.Println(resultActivity.TimeStamp) - t.Fail() + t.Error(activity.TimeStamp, resultActivity.TimeStamp) } if resultActivity.MetaData["meta"] != activity.MetaData["meta"] { - fmt.Println(activity.MetaData) - fmt.Println(resultActivity.MetaData) - t.Fail() + t.Error(activity.MetaData, resultActivity.MetaData) } if string(*resultActivity.Data) != string(*activity.Data) { - fmt.Println(string(*activity.Data)) - fmt.Println(string(*resultActivity.Data)) - t.Fail() + t.Error(string(*activity.Data), string(*resultActivity.Data)) } - - // fmt.Println(resultActivity) - // fmt.Println(resultActivity.ForeignID) - // fmt.Println(string(resultActivity.Data)) - // fmt.Println(resultActivity.MetaData) - // - // fmt.Println(resultActivity2) - // fmt.Println(resultActivity2.ForeignID) - // fmt.Println(string(resultActivity2.Data)) - // fmt.Println(resultActivity2.MetaData) - } diff --git a/getstream_test.go b/getstream_test.go index 680b96d..d1e29c8 100644 --- a/getstream_test.go +++ b/getstream_test.go @@ -1,9 +1,9 @@ package getstream_test import ( - "fmt" - getstream "github.com/GetStream/stream-go" "os" + + getstream "github.com/GetStream/stream-go" ) func PreTestSetup() (*getstream.Client, error) { @@ -36,8 +36,6 @@ func PostTestCleanUp( notifications []*getstream.Activity, aggregations []*getstream.Activity) error { - fmt.Println("Cleanup, aisle 1") - if len(flats) > 0 { feed, err := client.FlatFeed("flat", "bob") @@ -54,7 +52,6 @@ func PostTestCleanUp( } if len(notifications) > 0 { - feed, err := client.NotificationFeed("notification", "bob") if err != nil { return err @@ -69,7 +66,6 @@ func PostTestCleanUp( } if len(aggregations) > 0 { - feed, err := client.AggregatedFeed("aggregated", "bob") if err != nil { return err @@ -87,9 +83,7 @@ func PostTestCleanUp( } func PostTestCleanUpFollows(client *getstream.Client, flats []*getstream.FlatFeed) error { - fmt.Println("Cleanup, aisle 2") for _, flat := range flats { - followers, _ := flat.FollowersWithLimitAndSkip(300, 0) for _, follower := range followers { diff --git a/main.go b/main.go index 30f8a7f..de9d924 100644 --- a/main.go +++ b/main.go @@ -1,3 +1,3 @@ package getstream -const VERSION = "v1.0.0" +const VERSION = "v0.9.0" diff --git a/utils_test.go b/utils_test.go index 3b4fb18..e618f4c 100644 --- a/utils_test.go +++ b/utils_test.go @@ -1,73 +1,61 @@ package getstream_test import ( - "fmt" - "github.com/GetStream/stream-go" "testing" + + getstream "github.com/GetStream/stream-go" ) func TestFeedSlug(t *testing.T) { - slug, err := getstream.ValidateFeedSlug("foo") + feedSlug, err := getstream.ValidateFeedSlug("foo") if err != nil { - fmt.Println(err) - t.Fail() + t.Error(err) } - if slug != "foo" { - fmt.Println("feedSlug not 'foo'") - t.Fail() + if feedSlug != "foo" { + t.Error("feedSlug not 'foo'") } - slug, err = getstream.ValidateFeedSlug("f-o-o") + feedSlug, err = getstream.ValidateFeedSlug("f-o-o") if err != nil { - fmt.Println(err) - t.Fail() + t.Error(err) } - if slug != "f_o_o" { - fmt.Println("feedSlug not 'f_o_o'") - t.Fail() + if feedSlug != "f_o_o" { + t.Error("feedSlug not 'f_o_o'") } } func TestFeedID(t *testing.T) { feedID, err := getstream.ValidateFeedID("123") if err != nil { - fmt.Println(err) - t.Fail() + t.Error(err) } if feedID != "123" { - fmt.Println("feedID not '123'") - t.Fail() + t.Error("feedID not '123'") } feedID, err = getstream.ValidateFeedID("1-2-3") if err != nil { - fmt.Println(err) - t.Fail() + t.Error(err) } if feedID != "1_2_3" { - fmt.Println("feedSlug not '1_2_3'") - t.Fail() + t.Error("feedID not '1_2_3'") } } func TestUserID(t *testing.T) { userID, err := getstream.ValidateUserID("123") if err != nil { - fmt.Println(err) - t.Fail() + t.Error(err) } if userID != "123" { - fmt.Println("userID not '123'") - t.Fail() + t.Error("userID not '123'") } userID, err = getstream.ValidateUserID("1-2-3") if err != nil { - fmt.Println(err) - t.Fail() + t.Error(err) } if userID != "1_2_3" { - fmt.Println("userSlug not '1_2_3'") - t.Fail() + t.Error("userSlug not '1_2_3'") } }