tests: tidy up gitutil testing structs

Signed-off-by: Justin Chadwell <[email protected]>

Author: jedevc

util/gitutil/git_protocol_test.go

@@ -44,8 +44,10 @@ func TestParseProtocol(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		remote, protocol := ParseProtocol(test.url)
-		require.Equal(t, remote, test.remote)
-		require.Equal(t, protocol, test.protocol)
+		t.Run(test.url, func(t *testing.T) {
+			protocol, remote, path := ParseProtocol(test.url)
+			require.Equal(t, test.protocol, protocol)
+			require.Equal(t, test.remote, remote)
+		})
 	}
 }

util/gitutil/git_ref_test.go

@@ -1,8 +1,9 @@
 package gitutil
 
 import (
-	"reflect"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestParseGitRef(t *testing.T) {
@@ -124,16 +125,10 @@ func TestParseGitRef(t *testing.T) {
 		t.Run(tt.ref, func(t *testing.T) {
 			got, err := ParseGitRef(tt.ref)
 			if tt.expected == nil {
-				if err == nil {
-					t.Errorf("expected an error for ParseGitRef(%q)", tt.ref)
-				}
+				require.Error(t, err)
 			} else {
-				if err != nil {
-					t.Errorf("got an unexpected error: ParseGitRef(%q): %v", tt.ref, err)
-				}
-				if !reflect.DeepEqual(got, tt.expected) {
-					t.Errorf("expected ParseGitRef(%q) to return %#v, got %#v", tt.ref, tt.expected, got)
-				}
+				require.NoError(t, err)
+				require.Equal(t, tt.expected, got)
 			}
 		})
 	}