chore: use compare vs testutil for proto comparison (#4807)

kythe · Jan 27, 2021 · bd329db · bd329db
1 parent 6eaf95d
commit bd329db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/kythe/go/storage/stream/BUILD b/kythe/go/storage/stream/BUILD
@@ -22,7 +22,6 @@ go_test(
     library = "stream",
     visibility = ["//visibility:private"],
     deps = [
-        "//kythe/go/test/testutil",
         "//kythe/go/util/compare",
     ],
 )
diff --git a/kythe/go/storage/stream/stream_test.go b/kythe/go/storage/stream/stream_test.go
@@ -23,7 +23,6 @@ import (
 	"testing"
 
 	"kythe.io/kythe/go/platform/delimited"
-	"kythe.io/kythe/go/test/testutil"
 	"kythe.io/kythe/go/util/compare"
 
 	"google.golang.org/protobuf/encoding/protojson"
@@ -38,8 +37,8 @@ func TestReader(t *testing.T) {
 
 	var i int
 	if err := NewReader(r)(func(e *spb.Entry) error {
-		if err := testutil.DeepEqual(testEntries[i], e); err != nil {
-			t.Errorf("testEntries[%d]: %v", i, err)
+		if diff := compare.ProtoDiff(testEntries[i], e); diff != "" {
+			t.Errorf("testEntries[%d]: %s", i, diff)
 		}
 		i++
 		return nil
@@ -57,8 +56,8 @@ func TestJSONReader(t *testing.T) {
 
 	var i int
 	if err := NewJSONReader(r)(func(e *spb.Entry) error {
-		if err := testutil.DeepEqual(testEntries[i], e); err != nil {
-			t.Errorf("testEntries[%d]: %v", i, err)
+		if diff := compare.ProtoDiff(testEntries[i], e); diff != "" {
+			t.Errorf("testEntries[%d]: %s", i, diff)
 		}
 		i++
 		return nil