Fixed assert statements. (#16089)

3 files changed, 9 insertions, 9 deletions

diff --git a/modules/git/parse_nogogit_test.go b/modules/git/parse_nogogit_test.go
index a9e7dcc7f8..502c38d4e8 100644
--- a/modules/git/parse_nogogit_test.go
+++ b/modules/git/parse_nogogit_test.go
@@ -58,7 +58,7 @@ func TestParseTreeEntries(t *testing.T) {
 	for _, testCase := range testCases {
 		entries, err := ParseTreeEntries([]byte(testCase.Input))
 		assert.NoError(t, err)
-		assert.EqualValues(t, len(testCase.Expected), len(entries))
+		assert.Len(t, entries, len(testCase.Expected))
 		for i, entry := range entries {
 			assert.EqualValues(t, testCase.Expected[i].ID, entry.ID)
 			assert.EqualValues(t, testCase.Expected[i].name, entry.name)
diff --git a/modules/git/repo_commit_test.go b/modules/git/repo_commit_test.go
index 3eedaa6b6e..8f8acbdfed 100644
--- a/modules/git/repo_commit_test.go
+++ b/modules/git/repo_commit_test.go
@@ -72,9 +72,9 @@ func TestIsCommitInBranch(t *testing.T) {
 
 	result, err := bareRepo1.IsCommitInBranch("2839944139e0de9737a044f78b0e4b40d989a9e3", "branch1")
 	assert.NoError(t, err)
-	assert.Equal(t, true, result)
+	assert.True(t, result)
 
 	result, err = bareRepo1.IsCommitInBranch("2839944139e0de9737a044f78b0e4b40d989a9e3", "branch2")
 	assert.NoError(t, err)
-	assert.Equal(t, false, result)
+	assert.False(t, result)
 }
diff --git a/modules/git/tree_entry_test.go b/modules/git/tree_entry_test.go
index 16cfbc4fc3..3382de4102 100644
--- a/modules/git/tree_entry_test.go
+++ b/modules/git/tree_entry_test.go
@@ -71,33 +71,33 @@ func TestFollowLink(t *testing.T) {
 	// should be able to dereference to target
 	target, err := lnk.FollowLink()
 	assert.NoError(t, err)
-	assert.Equal(t, target.Name(), "hello")
+	assert.Equal(t, "hello", target.Name())
 	assert.False(t, target.IsLink())
-	assert.Equal(t, target.ID.String(), "b14df6442ea5a1b382985a6549b85d435376c351")
+	assert.Equal(t, "b14df6442ea5a1b382985a6549b85d435376c351", target.ID.String())
 
 	// should error when called on normal file
 	target, err = commit.Tree.GetTreeEntryByPath("file1.txt")
 	assert.NoError(t, err)
 	_, err = target.FollowLink()
-	assert.Equal(t, err.Error(), "file1.txt: not a symlink")
+	assert.EqualError(t, err, "file1.txt: not a symlink")
 
 	// should error for broken links
 	target, err = commit.Tree.GetTreeEntryByPath("foo/broken_link")
 	assert.NoError(t, err)
 	assert.True(t, target.IsLink())
 	_, err = target.FollowLink()
-	assert.Equal(t, err.Error(), "broken_link: broken link")
+	assert.EqualError(t, err, "broken_link: broken link")
 
 	// should error for external links
 	target, err = commit.Tree.GetTreeEntryByPath("foo/outside_repo")
 	assert.NoError(t, err)
 	assert.True(t, target.IsLink())
 	_, err = target.FollowLink()
-	assert.Equal(t, err.Error(), "outside_repo: points outside of repo")
+	assert.EqualError(t, err, "outside_repo: points outside of repo")
 
 	// testing fix for short link bug
 	target, err = commit.Tree.GetTreeEntryByPath("foo/link_short")
 	assert.NoError(t, err)
 	_, err = target.FollowLink()
-	assert.Equal(t, err.Error(), "link_short: broken link")
+	assert.EqualError(t, err, "link_short: broken link")
 }