fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-21 17:01:35 +00:00
Code Issues Projects Releases Wiki Activity

Do not shadow assert

Browse Source
This commit is contained in:
Jae Kwon
2017-12-26 00:36:58 -08:00
parent 6ec8c1602f
commit bf644b0984
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/bytes_test.go
View File

@ -10,23 +10,20 @@ import (
// This is a trivial test for protobuf compatibility. // This is a trivial test for protobuf compatibility.
func TestMarshal(t *testing.T) { func TestMarshal(t *testing.T) {
assert := assert.New(t)
b := []byte("hello world") b := []byte("hello world")
dataB := Bytes(b) dataB := Bytes(b)
b2, err := dataB.Marshal() b2, err := dataB.Marshal()
assert.Nil(err) assert.Nil(t, err)
assert.Equal(b, b2) assert.Equal(t, b, b2)
var dataB2 Bytes var dataB2 Bytes
err = (&dataB2).Unmarshal(b) err = (&dataB2).Unmarshal(b)
assert.Nil(err) assert.Nil(t, err)
assert.Equal(dataB, dataB2) assert.Equal(t, dataB, dataB2)
} }
// Test that the hex encoding works. // Test that the hex encoding works.
func TestJSONMarshal(t *testing.T) { func TestJSONMarshal(t *testing.T) {
assert := assert.New(t)
type TestStruct struct { type TestStruct struct {
B1 []byte B1 []byte
@ -51,7 +48,7 @@ func TestJSONMarshal(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
assert.Equal(string(jsonBytes), tc.expected) assert.Equal(t, string(jsonBytes), tc.expected)
// TODO do fuzz testing to ensure that unmarshal fails // TODO do fuzz testing to ensure that unmarshal fails
@ -61,8 +58,8 @@ func TestJSONMarshal(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
assert.Equal(ts2.B1, tc.input) assert.Equal(t, ts2.B1, tc.input)
assert.Equal(ts2.B2, Bytes(tc.input)) assert.Equal(t, ts2.B2, Bytes(tc.input))
}) })
} }
} }