X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=ns_test.go;h=97e8deb2aac886d0c3aa1e4d1b31462a6ef34741;hb=8fa6c4b0000e2dc27fce9220db1a5eb8bf468e81;hp=dbdaa8d4c81505eca1059b8a04a5d16582fa9519;hpb=5f0a9472b5bf641e0fcaddd86b7f1e87a44ed739;p=netstring.git

diff --git a/ns_test.go b/ns_test.go
index dbdaa8d..97e8deb 100644
--- a/ns_test.go
+++ b/ns_test.go
@@ -36,7 +36,7 @@ func TestTrivial(t *testing.T) {
 	if n, err := w.WriteChunk([]byte("barz")); err != nil || n != 7 {
 		t.FailNow()
 	}
-	if string(buf.Bytes()) != "3:foo,4:barz," {
+	if buf.String() != "3:foo,4:barz," {
 		t.FailNow()
 	}
 	r := NewReader(&buf)
@@ -53,7 +53,7 @@ func TestTrivial(t *testing.T) {
 	if n, err := r.Read(m); err != nil || n != 4 {
 		t.FailNow()
 	}
-	if bytes.Compare(m, []byte("barz")) != 0 {
+	if !bytes.Equal(m, []byte("barz")) {
 		t.FailNow()
 	}
 }
@@ -73,7 +73,7 @@ func TestSymmetric(t *testing.T) {
 				return false
 			}
 			got, err := io.ReadAll(r)
-			if err != nil || bytes.Compare(got, data) != 0 {
+			if err != nil || !bytes.Equal(got, data) {
 				return false
 			}
 		}
@@ -107,14 +107,11 @@ func TestErrors(t *testing.T) {
 
 	b = bytes.NewBufferString("0:foobar,")
 	r = NewReader(b)
-	if _, err := r.Next(); err != nil {
-		t.FailNow()
-	}
-	if _, err := r.Read(data); err == nil {
+	if _, err := r.Next(); err == nil {
 		t.FailNow()
 	}
 
-	b = bytes.NewBufferString("0:foobar")
+	b = bytes.NewBufferString("6:foobar")
 	r = NewReader(b)
 	if _, err := r.Next(); err != nil {
 		t.FailNow()
@@ -123,12 +120,15 @@ func TestErrors(t *testing.T) {
 		t.FailNow()
 	}
 
-	b = bytes.NewBufferString("6:foobar")
+	b = bytes.NewBufferString(":foobar,")
 	r = NewReader(b)
-	if _, err := r.Next(); err != nil {
+	if _, err := r.Next(); err == nil {
 		t.FailNow()
 	}
-	if _, err := r.Read(data); err == nil {
+
+	b = bytes.NewBufferString("06:foobar,")
+	r = NewReader(b)
+	if _, err := r.Next(); err == nil {
 		t.FailNow()
 	}
 }