use testify package

This commit is contained in:
Anton Kaliaev
2017-03-10 12:03:16 +04:00
parent 1a3573bf17
commit d66ebbd904
2 changed files with 25 additions and 60 deletions

View File

@ -11,5 +11,8 @@ test:
get_deps: get_deps:
@echo "--> Running go get" @echo "--> Running go get"
@go get -v -d $(PACKAGES) @go get -v -d $(PACKAGES)
@go list -f '{{join .TestImports "\n"}}' ./... | \
grep -v /vendor/ | sort | uniq | \
xargs go get -v -d
.PHONY: all test get_deps .PHONY: all test get_deps

View File

@ -9,6 +9,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
client "github.com/tendermint/go-rpc/client" client "github.com/tendermint/go-rpc/client"
server "github.com/tendermint/go-rpc/server" server "github.com/tendermint/go-rpc/server"
types "github.com/tendermint/go-rpc/types" types "github.com/tendermint/go-rpc/types"
@ -105,13 +107,9 @@ func testURI(t *testing.T, cl *client.URIClient) {
} }
var result Result var result Result
_, err := cl.Call("status", params, &result) _, err := cl.Call("status", params, &result)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
got := result.(*ResultStatus).Value got := result.(*ResultStatus).Value
if got != val { assert.Equal(t, got, val)
t.Fatalf("Got: %v .... Expected: %v \n", got, val)
}
} }
func testJSONRPC(t *testing.T, cl *client.JSONRPCClient) { func testJSONRPC(t *testing.T, cl *client.JSONRPCClient) {
@ -121,13 +119,9 @@ func testJSONRPC(t *testing.T, cl *client.JSONRPCClient) {
} }
var result Result var result Result
_, err := cl.Call("status", params, &result) _, err := cl.Call("status", params, &result)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
got := result.(*ResultStatus).Value got := result.(*ResultStatus).Value
if got != val { assert.Equal(t, got, val)
t.Fatalf("Got: %v .... Expected: %v \n", got, val)
}
} }
func testWS(t *testing.T, cl *client.WSClient) { func testWS(t *testing.T, cl *client.WSClient) {
@ -141,21 +135,15 @@ func testWS(t *testing.T, cl *client.WSClient) {
Method: "status", Method: "status",
Params: params, Params: params,
}) })
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
select { select {
case msg := <-cl.ResultsCh: case msg := <-cl.ResultsCh:
result := new(Result) result := new(Result)
wire.ReadJSONPtr(result, msg, &err) wire.ReadJSONPtr(result, msg, &err)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
got := (*result).(*ResultStatus).Value got := (*result).(*ResultStatus).Value
if got != val { assert.Equal(t, got, val)
t.Fatalf("Got: %v .... Expected: %v \n", got, val)
}
case err := <-cl.ErrorsCh: case err := <-cl.ErrorsCh:
t.Fatal(err) t.Fatal(err)
} }
@ -186,18 +174,14 @@ func TestJSONRPC_UNIX(t *testing.T) {
func TestWS_TCP(t *testing.T) { func TestWS_TCP(t *testing.T) {
cl := client.NewWSClient(tcpAddr, websocketEndpoint) cl := client.NewWSClient(tcpAddr, websocketEndpoint)
_, err := cl.Start() _, err := cl.Start()
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
testWS(t, cl) testWS(t, cl)
} }
func TestWS_UNIX(t *testing.T) { func TestWS_UNIX(t *testing.T) {
cl := client.NewWSClient(unixAddr, websocketEndpoint) cl := client.NewWSClient(unixAddr, websocketEndpoint)
_, err := cl.Start() _, err := cl.Start()
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
testWS(t, cl) testWS(t, cl)
} }
@ -210,13 +194,9 @@ func TestHexStringArg(t *testing.T) {
} }
var result Result var result Result
_, err := cl.Call("status", params, &result) _, err := cl.Call("status", params, &result)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
got := result.(*ResultStatus).Value got := result.(*ResultStatus).Value
if got != val { assert.Equal(t, got, val)
t.Fatalf("Got: %v .... Expected: %v \n", got, val)
}
} }
func TestQuotedStringArg(t *testing.T) { func TestQuotedStringArg(t *testing.T) {
@ -228,22 +208,16 @@ func TestQuotedStringArg(t *testing.T) {
} }
var result Result var result Result
_, err := cl.Call("status", params, &result) _, err := cl.Call("status", params, &result)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
got := result.(*ResultStatus).Value got := result.(*ResultStatus).Value
if got != val { assert.Equal(t, got, val)
t.Fatalf("Got: %v .... Expected: %v \n", got, val)
}
} }
func randBytes(t *testing.T) []byte { func randBytes(t *testing.T) []byte {
n := rand.Intn(10) + 2 n := rand.Intn(10) + 2
buf := make([]byte, n) buf := make([]byte, n)
_, err := crand.Read(buf) _, err := crand.Read(buf)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
return bytes.Replace(buf, []byte("="), []byte{100}, -1) return bytes.Replace(buf, []byte("="), []byte{100}, -1)
} }
@ -256,21 +230,15 @@ func TestByteSliceViaJSONRPC(t *testing.T) {
} }
var result Result var result Result
_, err := cl.Call("bytes", params, &result) _, err := cl.Call("bytes", params, &result)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
got := result.(*ResultBytes).Value got := result.(*ResultBytes).Value
if bytes.Compare(got, val) != 0 { assert.Equal(t, got, val)
t.Fatalf("Got: %v .... Expected: %v \n", got, val)
}
} }
func TestWSNewWSRPCFunc(t *testing.T) { func TestWSNewWSRPCFunc(t *testing.T) {
cl := client.NewWSClient(unixAddr, websocketEndpoint) cl := client.NewWSClient(unixAddr, websocketEndpoint)
_, err := cl.Start() _, err := cl.Start()
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
defer cl.Stop() defer cl.Stop()
val := "acbd" val := "acbd"
@ -283,21 +251,15 @@ func TestWSNewWSRPCFunc(t *testing.T) {
Method: "status_ws", Method: "status_ws",
Params: params, Params: params,
}) })
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
select { select {
case msg := <-cl.ResultsCh: case msg := <-cl.ResultsCh:
result := new(Result) result := new(Result)
wire.ReadJSONPtr(result, msg, &err) wire.ReadJSONPtr(result, msg, &err)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
got := (*result).(*ResultStatus).Value got := (*result).(*ResultStatus).Value
if got != val { assert.Equal(t, got, val)
t.Fatalf("Got: %v .... Expected: %v \n", got, val)
}
case err := <-cl.ErrorsCh: case err := <-cl.ErrorsCh:
t.Fatal(err) t.Fatal(err)
} }