certusone
/
tendermint
mirror of https://github.com/certusone/tendermint.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use testify package

This commit is contained in:
Anton Kaliaev 2017-03-10 12:03:16 +04:00
parent 1a3573bf17
commit d66ebbd904
No known key found for this signature in database
GPG Key ID: 7B6881D965918214
2 changed files with 25 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -11,5 +11,8 @@ test:
get_deps:
@echo "--> Running go get"
@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

82
rpc_test.go
View File

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