]> Sergey Matveev's repositories - btrtrc.git/commitdiff
bencode: Update some test code
authorMatt Joiner <anacrolix@gmail.com>
Tue, 23 Feb 2016 10:47:00 +0000 (21:47 +1100)
committerMatt Joiner <anacrolix@gmail.com>
Tue, 23 Feb 2016 10:47:00 +0000 (21:47 +1100)
bencode/both_test.go

index d837b6193230271ca5f885919b29ad52cfd9320a..b0bb074d38af6b17e236e06a19a5105528a4f499 100644 (file)
@@ -1,35 +1,31 @@
 package bencode
 
-import "testing"
-import "bytes"
-import "io/ioutil"
+import (
+       "bytes"
+       "io/ioutil"
+       "testing"
+
+       "github.com/stretchr/testify/assert"
+       "github.com/stretchr/testify/require"
+)
 
 func loadFile(name string, t *testing.T) []byte {
        data, err := ioutil.ReadFile(name)
-       if err != nil {
-               t.Fatal(err)
-       }
+       require.NoError(t, err)
        return data
 }
 
 func testFileInterface(t *testing.T, filename string) {
        data1 := loadFile(filename, t)
-       var iface interface{}
 
+       var iface interface{}
        err := Unmarshal(data1, &iface)
-       if err != nil {
-               t.Fatal(err)
-       }
+       require.NoError(t, err)
 
        data2, err := Marshal(iface)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       if !bytes.Equal(data1, data2) {
-               t.Fatalf("equality expected\n")
-       }
+       require.NoError(t, err)
 
+       assert.EqualValues(t, data1, data2)
 }
 
 func TestBothInterface(t *testing.T) {