lfs: use github.com/stretchr/testify for assertions

api/http_response_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/github/git-lfs/api"
-	"github.com/technoweenie/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestWrappedHttpResponsesMatchInternal(t *testing.T) {

auth/ssh_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/github/git-lfs/config"
-	"github.com/technoweenie/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSSHGetExeAndArgsSsh(t *testing.T) {

config/config_test.go

@@ -3,7 +3,7 @@ package config
 import (
 	"testing"
 
-	"github.com/technoweenie/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestEndpointDefaultsToOrigin(t *testing.T) {
@@ -363,7 +363,7 @@ func TestBatchAbsentIsTrue(t *testing.T) {
 	config := &Configuration{}
 
 	v := config.BatchTransfer()
-	assert.Equal(t, true, v)
+	assert.True(t, v)
 }
 
 func TestAccessConfig(t *testing.T) {
@@ -438,8 +438,8 @@ func TestAccessAbsentConfig(t *testing.T) {
 	config := &Configuration{}
 	assert.Equal(t, "none", config.Access("download"))
 	assert.Equal(t, "none", config.Access("upload"))
-	assert.Equal(t, false, config.PrivateAccess("download"))
-	assert.Equal(t, false, config.PrivateAccess("upload"))
+	assert.False(t, config.PrivateAccess("download"))
+	assert.False(t, config.PrivateAccess("upload"))
 }
 
 func TestLoadValidExtension(t *testing.T) {
@@ -481,10 +481,10 @@ func TestFetchPruneConfigDefault(t *testing.T) {
 	assert.Equal(t, 7, fp.FetchRecentRefsDays)
 	assert.Equal(t, 0, fp.FetchRecentCommitsDays)
 	assert.Equal(t, 3, fp.PruneOffsetDays)
-	assert.Equal(t, true, fp.FetchRecentRefsIncludeRemotes)
+	assert.True(t, fp.FetchRecentRefsIncludeRemotes)
 	assert.Equal(t, 3, fp.PruneOffsetDays)
 	assert.Equal(t, "origin", fp.PruneRemoteName)
-	assert.Equal(t, false, fp.PruneVerifyRemoteAlways)
+	assert.False(t, fp.PruneVerifyRemoteAlways)
 
 }
 func TestFetchPruneConfigCustom(t *testing.T) {
@@ -502,8 +502,8 @@ func TestFetchPruneConfigCustom(t *testing.T) {
 
 	assert.Equal(t, 12, fp.FetchRecentRefsDays)
 	assert.Equal(t, 9, fp.FetchRecentCommitsDays)
-	assert.Equal(t, false, fp.FetchRecentRefsIncludeRemotes)
+	assert.False(t, fp.FetchRecentRefsIncludeRemotes)
 	assert.Equal(t, 30, fp.PruneOffsetDays)
 	assert.Equal(t, "upstream", fp.PruneRemoteName)
-	assert.Equal(t, true, fp.PruneVerifyRemoteAlways)
+	assert.True(t, fp.PruneVerifyRemoteAlways)
 }

config/extension_test.go

@@ -3,7 +3,7 @@ package config
 import (
 	"testing"
 
-	"github.com/technoweenie/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSortExtensions(t *testing.T) {
@@ -32,7 +32,7 @@ func TestSortExtensions(t *testing.T) {
 
 	sorted, err := SortExtensions(m)
 
-	assert.Equal(t, err, nil)
+	assert.Nil(t, err)
 
 	for i, ext := range sorted {
 		name := names[i]
@@ -61,6 +61,6 @@ func TestSortExtensionsDuplicatePriority(t *testing.T) {
 
 	sorted, err := SortExtensions(m)
 
-	assert.NotEqual(t, err, nil)
-	assert.Equal(t, len(sorted), 0)
+	assert.NotNil(t, err)
+	assert.Empty(t, sorted)
 }

git/git_test.go

@@ -10,7 +10,7 @@ import (
 
 	. "github.com/github/git-lfs/git"
 	"github.com/github/git-lfs/test"
-	"github.com/technoweenie/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCurrentRefAndCurrentRemoteRef(t *testing.T) {
@@ -51,25 +51,25 @@ func TestCurrentRefAndCurrentRemoteRef(t *testing.T) {
 	outputs := repo.AddCommits(inputs)
 	// last commit was on branch3
 	ref, err := CurrentRef()
-	assert.Equal(t, nil, err)
+	assert.Nil(t, err)
 	assert.Equal(t, &Ref{"branch3", RefTypeLocalBranch, outputs[3].Sha}, ref)
 	test.RunGitCommand(t, true, "checkout", "master")
 	ref, err = CurrentRef()
-	assert.Equal(t, nil, err)
+	assert.Nil(t, err)
 	assert.Equal(t, &Ref{"master", RefTypeLocalBranch, outputs[2].Sha}, ref)
 	// Check remote
 	repo.AddRemote("origin")
 	test.RunGitCommand(t, true, "push", "-u", "origin", "master:someremotebranch")
 	ref, err = CurrentRemoteRef()
-	assert.Equal(t, nil, err)
+	assert.Nil(t, err)
 	assert.Equal(t, &Ref{"origin/someremotebranch", RefTypeRemoteBranch, outputs[2].Sha}, ref)
 
 	refname, err := RemoteRefNameForCurrentBranch()
-	assert.Equal(t, nil, err)
+	assert.Nil(t, err)
 	assert.Equal(t, "refs/remotes/origin/someremotebranch", refname)
 
 	remote, err := RemoteForCurrentBranch()
-	assert.Equal(t, nil, err)
+	assert.Nil(t, err)
 	assert.Equal(t, "origin", remote)
 }
 
@@ -262,16 +262,16 @@ func TestWorkTrees(t *testing.T) {
 }
 
 func TestVersionCompare(t *testing.T) {
-	assert.Equal(t, true, IsVersionAtLeast("2.6.0", "2.6.0"))
-	assert.Equal(t, true, IsVersionAtLeast("2.6.0", "2.6"))
-	assert.Equal(t, true, IsVersionAtLeast("2.6.0", "2"))
-	assert.Equal(t, true, IsVersionAtLeast("2.6.10", "2.6.5"))
-	assert.Equal(t, true, IsVersionAtLeast("2.8.1", "2.7.2"))
-
-	assert.Equal(t, false, IsVersionAtLeast("1.6.0", "2"))
-	assert.Equal(t, false, IsVersionAtLeast("2.5.0", "2.6"))
-	assert.Equal(t, false, IsVersionAtLeast("2.5.0", "2.5.1"))
-	assert.Equal(t, false, IsVersionAtLeast("2.5.2", "2.5.10"))
+	assert.True(t, IsVersionAtLeast("2.6.0", "2.6.0"))
+	assert.True(t, IsVersionAtLeast("2.6.0", "2.6"))
+	assert.True(t, IsVersionAtLeast("2.6.0", "2"))
+	assert.True(t, IsVersionAtLeast("2.6.10", "2.6.5"))
+	assert.True(t, IsVersionAtLeast("2.8.1", "2.7.2"))
+
+	assert.False(t, IsVersionAtLeast("1.6.0", "2"))
+	assert.False(t, IsVersionAtLeast("2.5.0", "2.6"))
+	assert.False(t, IsVersionAtLeast("2.5.0", "2.5.1"))
+	assert.False(t, IsVersionAtLeast("2.5.2", "2.5.10"))
 }
 
 func TestGitAndRootDirs(t *testing.T) {
@@ -321,33 +321,33 @@ func TestGetTrackedFiles(t *testing.T) {
 	repo.AddCommits(inputs)
 
 	tracked, err := GetTrackedFiles("*.txt")
-	assert.Equal(t, nil, err)
+	assert.Nil(t, err)
 	sort.Strings(tracked) // for direct comparison
 	fulllist := []string{"file1.txt", "file2.txt", "file3.txt", "file4.txt", "folder1/anotherfile.txt", "folder1/file10.txt", "folder2/folder3/deep.txt", "folder2/something.txt"}
 	assert.Equal(t, fulllist, tracked)
 
 	tracked, err = GetTrackedFiles("*file*.txt")
-	assert.Equal(t, nil, err)
+	assert.Nil(t, err)
 	sort.Strings(tracked)
 	sublist := []string{"file1.txt", "file2.txt", "file3.txt", "file4.txt", "folder1/anotherfile.txt", "folder1/file10.txt"}
 	assert.Equal(t, sublist, tracked)
 
 	tracked, err = GetTrackedFiles("folder1/*")
-	assert.Equal(t, nil, err)
+	assert.Nil(t, err)
 	sort.Strings(tracked)
 	sublist = []string{"folder1/anotherfile.txt", "folder1/file10.txt"}
 	assert.Equal(t, sublist, tracked)
 
 	tracked, err = GetTrackedFiles("folder2/*")
-	assert.Equal(t, nil, err)
+	assert.Nil(t, err)
 	sort.Strings(tracked)
 	sublist = []string{"folder2/folder3/deep.txt", "folder2/something.txt"}
 	assert.Equal(t, sublist, tracked)
 
 	// relative dir
 	os.Chdir("folder1")
 	tracked, err = GetTrackedFiles("*.txt")
-	assert.Equal(t, nil, err)
+	assert.Nil(t, err)
 	sort.Strings(tracked)
 	sublist = []string{"anotherfile.txt", "file10.txt"}
 	assert.Equal(t, sublist, tracked)
@@ -357,29 +357,29 @@ func TestGetTrackedFiles(t *testing.T) {
 	ioutil.WriteFile("z_newfile.txt", []byte("Hello world"), 0644)
 	test.RunGitCommand(t, true, "add", "z_newfile.txt")
 	tracked, err = GetTrackedFiles("*.txt")
-	assert.Equal(t, nil, err)
+	assert.Nil(t, err)
 	sort.Strings(tracked)
 	fulllist = append(fulllist, "z_newfile.txt")
 	assert.Equal(t, fulllist, tracked)
 
 	// Test includes modified files (not staged)
 	ioutil.WriteFile("file1.txt", []byte("Modifications"), 0644)
 	tracked, err = GetTrackedFiles("*.txt")
-	assert.Equal(t, nil, err)
+	assert.Nil(t, err)
 	sort.Strings(tracked)
 	assert.Equal(t, fulllist, tracked)
 
 	// Test includes modified files (staged)
 	test.RunGitCommand(t, true, "add", "file1.txt")
 	tracked, err = GetTrackedFiles("*.txt")
-	assert.Equal(t, nil, err)
+	assert.Nil(t, err)
 	sort.Strings(tracked)
 	assert.Equal(t, fulllist, tracked)
 
 	// Test excludes deleted files (not committed)
 	test.RunGitCommand(t, true, "rm", "file2.txt")
 	tracked, err = GetTrackedFiles("*.txt")
-	assert.Equal(t, nil, err)
+	assert.Nil(t, err)
 	sort.Strings(tracked)
 	deletedlist := []string{"file1.txt", "file3.txt", "file4.txt", "folder1/anotherfile.txt", "folder1/file10.txt", "folder2/folder3/deep.txt", "folder2/something.txt", "z_newfile.txt"}
 	assert.Equal(t, deletedlist, tracked)