From fdde527e827c718e35c54f652a3a7af0defdb507 Mon Sep 17 00:00:00 2001
From: Murat Kabilov <murat.kabilov@zalando.de>
Date: Fri, 26 May 2017 18:34:05 +0200
Subject: [PATCH] simplify bytes check

---
 pkg/spec/postgresql_test.go | 12 +++++-------
 pkg/spec/types_test.go      |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkg/spec/postgresql_test.go b/pkg/spec/postgresql_test.go
index 073c1e7ab..a3e336c87 100644
--- a/pkg/spec/postgresql_test.go
+++ b/pkg/spec/postgresql_test.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/client-go/pkg/api/v1"
 )
 
-var parseTime = []struct {
+var parseTimeTests = []struct {
 	in                 string
 	out                time.Time
 	outWeekday         time.Weekday
@@ -323,8 +323,8 @@ func mustParseTime(s string) time.Time {
 }
 
 func TestParseTime(t *testing.T) {
-	for _, tt := range parseTime {
-		aTime, weekday, weekdayProvided, err := ParseTime(tt.in)
+	for _, tt := range parseTimeTests {
+		aTime, weekday, weekdayProvided, err := parseTime(tt.in)
 		if err != nil {
 			if err.Error() != tt.err.Error() {
 				t.Errorf("ParseTime expected error: %v, got: %v", err, tt.err)
@@ -387,7 +387,7 @@ func TestMarshalMaintenanceWindow(t *testing.T) {
 			continue
 		}
 
-		if bytes.Compare(s, tt.in) != 0 {
+		if !bytes.Equal(s, tt.in) {
 			t.Errorf("Expected Marshal: %s, got: %s", string(tt.in), string(s))
 		}
 	}
@@ -422,7 +422,7 @@ func TestMarshal(t *testing.T) {
 			t.Errorf("Marshal error: %v", err)
 			continue
 		}
-		if bytes.Compare(m, tt.marshal) != 0 {
+		if !bytes.Equal(m, tt.marshal) {
 			t.Errorf("Marshal Postgresql expected: %s, got: %s", string(tt.marshal), string(m))
 		}
 	}
@@ -437,8 +437,6 @@ func TestPostgresMeta(t *testing.T) {
 		if a := tt.out.GetObjectMeta(); reflect.DeepEqual(a, tt.out.Metadata) {
 			t.Errorf("GetObjectMeta expected: %v, got: %v", tt.out.Metadata, a)
 		}
-
-		return
 	}
 }
 
diff --git a/pkg/spec/types_test.go b/pkg/spec/types_test.go
index 65e234783..b690586e9 100644
--- a/pkg/spec/types_test.go
+++ b/pkg/spec/types_test.go
@@ -33,12 +33,12 @@ func TestNamespacedNameDecode(t *testing.T) {
 func TestNamespacedNameMarshal(t *testing.T) {
 	for _, tt := range nnTests {
 		var actual NamespacedName
-		err := actual.Decode(tt.s)
+
 		m, err := actual.MarshalJSON()
 		if err != nil {
 			t.Errorf("Marshal error: %v", err)
 		}
-		if bytes.Compare(m, tt.expectedMarshal) != 0 {
+		if bytes.Equal(m, tt.expectedMarshal) {
 			t.Errorf("Expected marshal: %v, got %#v", tt.expected, actual)
 		}
 	}