Skip to content
This repository has been archived by the owner on Mar 29, 2018. It is now read-only.

Commit

Permalink
test cleanup, removed lots of Println debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
@iandouglas
iandouglas committed Sep 23, 2016
1 parent 2b1508c commit 96802ae
Show file tree
Hide file tree
Showing 10 changed files with 111 additions and 295 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -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"),
})
Expand Down
40 changes: 4 additions & 36 deletions client.go
View file
Expand Up @@ -4,7 +4,6 @@ import (
"bytes"
"encoding/json"
"errors"
"fmt"
"gopkg.in/LeisureLink/httpsig.v1"
"io/ioutil"
"net/http"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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
}
Expand Down
9 changes: 5 additions & 4 deletions client_test.go
View file
Expand Up @@ -3,6 +3,7 @@ package getstream_test
import (
"testing"

"github.com/pborman/uuid"
getstream "github.com/GetStream/stream-go"
)

Expand Down Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand Down Expand Up @@ -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"),
})
Expand Down Expand Up @@ -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"),
}
Expand Down
17 changes: 5 additions & 12 deletions error_test.go
View file
Expand Up @@ -2,7 +2,6 @@ package getstream_test

import (
"encoding/json"
"fmt"
"testing"
"time"

Expand All @@ -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{
Expand All @@ -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)
}
}

Expand All @@ -56,8 +50,7 @@ func TestErrorBadDuration(t *testing.T) {
}

if testError.Duration() != time.Duration(0) {
t.Fail()
return
t.Fatal()
}

}
100 changes: 28 additions & 72 deletions feed_aggregated_test.go
View file
Expand Up @@ -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
Expand All @@ -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"),
})
Expand Down Expand Up @@ -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},
Expand Down Expand Up @@ -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"),
})
Expand Down Expand Up @@ -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"),
})
Expand Down Expand Up @@ -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)
Expand All @@ -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)

}

0 comments on commit 96802ae

Please sign in to comment.