bencode: Tidy up

diff --git a/bencode/encode.go b/bencode/encode.go
index 196aa09539b944e8ba3502bc722bce4c2c58eae2..d39fac0dd371fbdc658d4b9bcdbdd7c93240d368 100644 (file)
--- a/bencode/encode.go
+++ b/bencode/encode.go
@@ -1,11 +1,13 @@
 package bencode
 
-import "bufio"
-import "reflect"
-import "runtime"
-import "strconv"
-import "sync"
-import "sort"
+import (
+       "bufio"
+       "reflect"
+       "runtime"
+       "sort"
+       "strconv"
+       "sync"
+)
 
 func is_empty_value(v reflect.Value) bool {
        switch v.Kind() {
@@ -138,7 +140,6 @@ func (e *encoder) reflect_value(v reflect.Value) {
                        if ef.omit_empty && is_empty_value(field_value) {
                                continue
                        }
-
                        e.reflect_string(ef.tag)
                        e.reflect_value(field_value)
                }

diff --git a/bencode/encode_test.go b/bencode/encode_test.go
index ba19173379dc0c00e29bd304928eeeff230dfaea..a6b2dfd835f2aa267e5e5f1eb5d34b38de7ef60c 100644 (file)
--- a/bencode/encode_test.go
+++ b/bencode/encode_test.go
@@ -1,6 +1,10 @@
 package bencode
 
-import "testing"
+import (
+       "testing"
+
+       "github.com/stretchr/testify/assert"
+)
 import "bytes"
 import "fmt"
 
@@ -57,12 +61,7 @@ var random_encode_tests = []random_encode_test{
 func TestRandomEncode(t *testing.T) {
        for _, test := range random_encode_tests {
                data, err := Marshal(test.value)
-               if err != nil {
-                       t.Fatal(err)
-               }
-               if !bytes.Equal(data, []byte(test.expected)) {
-                       t.Errorf("got: %s, expected: %s\n",
-                               string(data), string(test.expected))
-               }
+               assert.NoError(t, err)
+               assert.EqualValues(t, test.expected, string(data))
        }
 }