Use more specific test methods (#24265)

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>

cmd/migrate_storage_test.go

@@ -67,7 +67,7 @@ func TestMigratePackages(t *testing.T) {
 
 	entries, err := os.ReadDir(p)
 	assert.NoError(t, err)
-	assert.EqualValues(t, 2, len(entries))
+	assert.Len(t, entries, 2)
 	assert.EqualValues(t, "01", entries[0].Name())
 	assert.EqualValues(t, "tmp", entries[1].Name())
 }

models/db/list_test.go

@@ -40,7 +40,7 @@ func TestFind(t *testing.T) {
 	var repoUnits []repo_model.RepoUnit
 	err = db.Find(db.DefaultContext, &opts, &repoUnits)
 	assert.NoError(t, err)
-	assert.EqualValues(t, repoUnitCount, len(repoUnits))
+	assert.Len(t, repoUnits, repoUnitCount)
 
 	cnt, err := db.Count(db.DefaultContext, &opts, new(repo_model.RepoUnit))
 	assert.NoError(t, err)

models/git/branches_test.go

@@ -88,12 +88,12 @@ func TestFindRenamedBranch(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 	branch, exist, err := git_model.FindRenamedBranch(db.DefaultContext, 1, "dev")
 	assert.NoError(t, err)
-	assert.Equal(t, true, exist)
+	assert.True(t, exist)
 	assert.Equal(t, "master", branch.To)
 
 	_, exist, err = git_model.FindRenamedBranch(db.DefaultContext, 1, "unknow")
 	assert.NoError(t, err)
-	assert.Equal(t, false, exist)
+	assert.False(t, exist)
 }
 
 func TestRenameBranch(t *testing.T) {
@@ -115,7 +115,7 @@ func TestRenameBranch(t *testing.T) {
 		return nil
 	}))
 
-	assert.Equal(t, true, _isDefault)
+	assert.True(t, _isDefault)
 	repo1 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
 	assert.Equal(t, "main", repo1.DefaultBranch)
 

models/issues/pull_test.go

@@ -109,11 +109,11 @@ func TestHasUnmergedPullRequestsByHeadInfo(t *testing.T) {
 
 	exist, err := issues_model.HasUnmergedPullRequestsByHeadInfo(db.DefaultContext, 1, "branch2")
 	assert.NoError(t, err)
-	assert.Equal(t, true, exist)
+	assert.True(t, exist)
 
 	exist, err = issues_model.HasUnmergedPullRequestsByHeadInfo(db.DefaultContext, 1, "not_exist_branch")
 	assert.NoError(t, err)
-	assert.Equal(t, false, exist)
+	assert.False(t, exist)
 }
 
 func TestGetUnmergedPullRequestsByHeadInfo(t *testing.T) {

models/issues/tracked_time_test.go

@@ -35,7 +35,7 @@ func TestAddTime(t *testing.T) {
 	assert.Equal(t, int64(3661), tt.Time)
 
 	comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{Type: issues_model.CommentTypeAddTimeManual, PosterID: 3, IssueID: 1})
-	assert.Equal(t, comment.Content, "1 hour 1 minute")
+	assert.Equal(t, "1 hour 1 minute", comment.Content)
 }
 
 func TestGetTrackedTimes(t *testing.T) {

models/unittest/consistency.go

@@ -152,7 +152,7 @@ func init() {
 			Query()
 		assert.NoError(t, err)
 
-		assert.EqualValues(t, label.int("NumIssues"), len(issueLabels), "Unexpected number of issue for label id: %d", label.int("ID"))
+		assert.Len(t, issueLabels, label.int("NumIssues"), "Unexpected number of issue for label id: %d", label.int("ID"))
 
 		issueIDs := make([]int, len(issueLabels))
 		for i, issueLabel := range issueLabels {

models/user/user_test.go

@@ -36,10 +36,10 @@ func TestGetUserEmailsByNames(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 
 	// ignore none active user email
-	assert.Equal(t, []string{"user8@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user9"}))
-	assert.Equal(t, []string{"user8@example.com", "user5@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user5"}))
+	assert.ElementsMatch(t, []string{"user8@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user9"}))
+	assert.ElementsMatch(t, []string{"user8@example.com", "user5@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user5"}))
 
-	assert.Equal(t, []string{"user8@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user7"}))
+	assert.ElementsMatch(t, []string{"user8@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user7"}))
 }
 
 func TestCanCreateOrganization(t *testing.T) {

modules/git/repo_attribute_test.go

@@ -19,7 +19,7 @@ func Test_nulSeparatedAttributeWriter_ReadAttribute(t *testing.T) {
 
 	n, err := wr.Write([]byte(testStr))
 
-	assert.Equal(t, n, len(testStr))
+	assert.Len(t, testStr, n)
 	assert.NoError(t, err)
 	select {
 	case attr := <-wr.ReadAttribute():
@@ -32,7 +32,7 @@ func Test_nulSeparatedAttributeWriter_ReadAttribute(t *testing.T) {
 	// Write a second attribute again
 	n, err = wr.Write([]byte(testStr))
 
-	assert.Equal(t, n, len(testStr))
+	assert.Len(t, testStr, n)
 	assert.NoError(t, err)
 
 	select {

modules/git/repo_commit_test.go

@@ -97,6 +97,6 @@ func TestRepository_CommitsBetweenIDs(t *testing.T) {
 	for i, c := range cases {
 		commits, err := bareRepo1.CommitsBetweenIDs(c.NewID, c.OldID)
 		assert.NoError(t, err)
-		assert.Equal(t, c.ExpectedCommits, len(commits), "case %d", i)
+		assert.Len(t, commits, c.ExpectedCommits, "case %d", i)
 	}
 }

modules/git/repo_tag_test.go

@@ -26,7 +26,7 @@ func TestRepository_GetTags(t *testing.T) {
 		return
 	}
 	assert.Len(t, tags, 2)
-	assert.Equal(t, len(tags), total)
+	assert.Len(t, tags, total)
 	assert.EqualValues(t, "signed-tag", tags[0].Name)
 	assert.EqualValues(t, "36f97d9a96457e2bab511db30fe2db03893ebc64", tags[0].ID.String())
 	assert.EqualValues(t, "tag", tags[0].Type)

modules/indexer/code/indexer_test.go

@@ -69,7 +69,7 @@ func testIndexer(name string, t *testing.T, indexer Indexer) {
 			t.Run(kw.Keyword, func(t *testing.T) {
 				total, res, langs, err := indexer.Search(context.TODO(), kw.RepoIDs, "", kw.Keyword, 1, 10, false)
 				assert.NoError(t, err)
-				assert.EqualValues(t, len(kw.IDs), total)
+				assert.Len(t, kw.IDs, int(total))
 				assert.Len(t, langs, kw.Langs)
 
 				ids := make([]int64, 0, len(res))

modules/lfs/http_client_test.go

@@ -162,7 +162,7 @@ func TestHTTPClientDownload(t *testing.T) {
 		assert.NoError(t, err)
 
 		assert.Equal(t, "download", batchRequest.Operation)
-		assert.Equal(t, 1, len(batchRequest.Objects))
+		assert.Len(t, batchRequest.Objects, 1)
 		assert.Equal(t, p.Oid, batchRequest.Objects[0].Oid)
 		assert.Equal(t, p.Size, batchRequest.Objects[0].Size)
 
@@ -269,7 +269,7 @@ func TestHTTPClientUpload(t *testing.T) {
 		assert.NoError(t, err)
 
 		assert.Equal(t, "upload", batchRequest.Operation)
-		assert.Equal(t, 1, len(batchRequest.Objects))
+		assert.Len(t, batchRequest.Objects, 1)
 		assert.Equal(t, p.Oid, batchRequest.Objects[0].Oid)
 		assert.Equal(t, p.Size, batchRequest.Objects[0].Size)
 

modules/log/file_test.go

@@ -51,7 +51,7 @@ func TestFileLogger(t *testing.T) {
 
 	fileLogger := NewFileLogger()
 	realFileLogger, ok := fileLogger.(*FileLogger)
-	assert.Equal(t, true, ok)
+	assert.True(t, ok)
 
 	location, _ := time.LoadLocation("EST")
 

modules/markup/html_test.go

@@ -593,5 +593,5 @@ func TestIssue18471(t *testing.T) {
 	}, strings.NewReader(data), &res)
 
 	assert.NoError(t, err)
-	assert.Equal(t, res.String(), "<a href=\"http://domain/org/repo/compare/783b039...da951ce\" class=\"compare\"><code class=\"nohighlight\">783b039...da951ce</code></a>")
+	assert.Equal(t, "<a href=\"http://domain/org/repo/compare/783b039...da951ce\" class=\"compare\"><code class=\"nohighlight\">783b039...da951ce</code></a>", res.String())
 }

modules/packages/container/metadata_test.go

@@ -33,7 +33,7 @@ func TestParseImageConfig(t *testing.T) {
 	assert.Equal(t, projectURL, metadata.ProjectURL)
 	assert.Equal(t, repositoryURL, metadata.RepositoryURL)
 	assert.Equal(t, documentationURL, metadata.DocumentationURL)
-	assert.Equal(t, []string{"do it 1", "do it 2"}, metadata.ImageLayers)
+	assert.ElementsMatch(t, []string{"do it 1", "do it 2"}, metadata.ImageLayers)
 	assert.Equal(
 		t,
 		map[string]string{

modules/paginator/paginator_test.go

@@ -70,49 +70,49 @@ func TestPaginator(t *testing.T) {
 	t.Run("Generate pages", func(t *testing.T) {
 		p := New(0, 10, 1, 0)
 		pages := p.Pages()
-		assert.Equal(t, 0, len(pages))
+		assert.Empty(t, pages)
 	})
 
 	t.Run("Only current page", func(t *testing.T) {
 		p := New(0, 10, 1, 1)
 		pages := p.Pages()
-		assert.Equal(t, 1, len(pages))
+		assert.Len(t, pages, 1)
 		assert.Equal(t, 1, pages[0].Num())
 		assert.True(t, pages[0].IsCurrent())
 
 		p = New(1, 10, 1, 1)
 		pages = p.Pages()
-		assert.Equal(t, 1, len(pages))
+		assert.Len(t, pages, 1)
 		assert.Equal(t, 1, pages[0].Num())
 		assert.True(t, pages[0].IsCurrent())
 	})
 
 	t.Run("Total page number is less or equal", func(t *testing.T) {
 		p := New(1, 10, 1, 2)
 		pages := p.Pages()
-		assert.Equal(t, 1, len(pages))
+		assert.Len(t, pages, 1)
 		assert.Equal(t, 1, pages[0].Num())
 		assert.True(t, pages[0].IsCurrent())
 
 		p = New(11, 10, 1, 2)
 		pages = p.Pages()
-		assert.Equal(t, 2, len(pages))
+		assert.Len(t, pages, 2)
 		assert.Equal(t, 1, pages[0].Num())
 		assert.True(t, pages[0].IsCurrent())
 		assert.Equal(t, 2, pages[1].Num())
 		assert.False(t, pages[1].IsCurrent())
 
 		p = New(11, 10, 2, 2)
 		pages = p.Pages()
-		assert.Equal(t, 2, len(pages))
+		assert.Len(t, pages, 2)
 		assert.Equal(t, 1, pages[0].Num())
 		assert.False(t, pages[0].IsCurrent())
 		assert.Equal(t, 2, pages[1].Num())
 		assert.True(t, pages[1].IsCurrent())
 
 		p = New(25, 10, 2, 3)
 		pages = p.Pages()
-		assert.Equal(t, 3, len(pages))
+		assert.Len(t, pages, 3)
 		assert.Equal(t, 1, pages[0].Num())
 		assert.False(t, pages[0].IsCurrent())
 		assert.Equal(t, 2, pages[1].Num())
@@ -125,7 +125,7 @@ func TestPaginator(t *testing.T) {
 		// ... 2
 		p := New(11, 10, 2, 1)
 		pages := p.Pages()
-		assert.Equal(t, 2, len(pages))
+		assert.Len(t, pages, 2)
 		assert.Equal(t, -1, pages[0].Num())
 		assert.False(t, pages[0].IsCurrent())
 		assert.Equal(t, 2, pages[1].Num())
@@ -134,7 +134,7 @@ func TestPaginator(t *testing.T) {
 		// ... 2 3
 		p = New(21, 10, 2, 2)
 		pages = p.Pages()
-		assert.Equal(t, 3, len(pages))
+		assert.Len(t, pages, 3)
 		assert.Equal(t, -1, pages[0].Num())
 		assert.False(t, pages[0].IsCurrent())
 		assert.Equal(t, 2, pages[1].Num())
@@ -145,7 +145,7 @@ func TestPaginator(t *testing.T) {
 		// ... 2 3 4
 		p = New(31, 10, 3, 3)
 		pages = p.Pages()
-		assert.Equal(t, 4, len(pages))
+		assert.Len(t, pages, 4)
 		assert.Equal(t, -1, pages[0].Num())
 		assert.False(t, pages[0].IsCurrent())
 		assert.Equal(t, 2, pages[1].Num())
@@ -158,7 +158,7 @@ func TestPaginator(t *testing.T) {
 		// ... 3 4 5
 		p = New(41, 10, 4, 3)
 		pages = p.Pages()
-		assert.Equal(t, 4, len(pages))
+		assert.Len(t, pages, 4)
 		assert.Equal(t, -1, pages[0].Num())
 		assert.False(t, pages[0].IsCurrent())
 		assert.Equal(t, 3, pages[1].Num())
@@ -171,7 +171,7 @@ func TestPaginator(t *testing.T) {
 		// ... 4 5 6 7 8 9 10
 		p = New(100, 10, 9, 7)
 		pages = p.Pages()
-		assert.Equal(t, 8, len(pages))
+		assert.Len(t, pages, 8)
 		assert.Equal(t, -1, pages[0].Num())
 		assert.False(t, pages[0].IsCurrent())
 		assert.Equal(t, 4, pages[1].Num())
@@ -194,7 +194,7 @@ func TestPaginator(t *testing.T) {
 		// 1 ...
 		p := New(21, 10, 1, 1)
 		pages := p.Pages()
-		assert.Equal(t, 2, len(pages))
+		assert.Len(t, pages, 2)
 		assert.Equal(t, 1, pages[0].Num())
 		assert.True(t, pages[0].IsCurrent())
 		assert.Equal(t, -1, pages[1].Num())
@@ -203,7 +203,7 @@ func TestPaginator(t *testing.T) {
 		// 1 2 ...
 		p = New(21, 10, 1, 2)
 		pages = p.Pages()
-		assert.Equal(t, 3, len(pages))
+		assert.Len(t, pages, 3)
 		assert.Equal(t, 1, pages[0].Num())
 		assert.True(t, pages[0].IsCurrent())
 		assert.Equal(t, 2, pages[1].Num())
@@ -214,7 +214,7 @@ func TestPaginator(t *testing.T) {
 		// 1 2 3 ...
 		p = New(31, 10, 2, 3)
 		pages = p.Pages()
-		assert.Equal(t, 4, len(pages))
+		assert.Len(t, pages, 4)
 		assert.Equal(t, 1, pages[0].Num())
 		assert.False(t, pages[0].IsCurrent())
 		assert.Equal(t, 2, pages[1].Num())
@@ -227,7 +227,7 @@ func TestPaginator(t *testing.T) {
 		// 1 2 3 ...
 		p = New(41, 10, 2, 3)
 		pages = p.Pages()
-		assert.Equal(t, 4, len(pages))
+		assert.Len(t, pages, 4)
 		assert.Equal(t, 1, pages[0].Num())
 		assert.False(t, pages[0].IsCurrent())
 		assert.Equal(t, 2, pages[1].Num())
@@ -240,7 +240,7 @@ func TestPaginator(t *testing.T) {
 		// 1 2 3 4 5 6 7 ...
 		p = New(100, 10, 1, 7)
 		pages = p.Pages()
-		assert.Equal(t, 8, len(pages))
+		assert.Len(t, pages, 8)
 		assert.Equal(t, 1, pages[0].Num())
 		assert.True(t, pages[0].IsCurrent())
 		assert.Equal(t, 2, pages[1].Num())
@@ -261,7 +261,7 @@ func TestPaginator(t *testing.T) {
 		// 1 2 3 4 5 6 7 ...
 		p = New(100, 10, 2, 7)
 		pages = p.Pages()
-		assert.Equal(t, 8, len(pages))
+		assert.Len(t, pages, 8)
 		assert.Equal(t, 1, pages[0].Num())
 		assert.False(t, pages[0].IsCurrent())
 		assert.Equal(t, 2, pages[1].Num())
@@ -284,7 +284,7 @@ func TestPaginator(t *testing.T) {
 		// ... 2 3 ...
 		p := New(35, 10, 2, 2)
 		pages := p.Pages()
-		assert.Equal(t, 4, len(pages))
+		assert.Len(t, pages, 4)
 		assert.Equal(t, -1, pages[0].Num())
 		assert.False(t, pages[0].IsCurrent())
 		assert.Equal(t, 2, pages[1].Num())
@@ -297,7 +297,7 @@ func TestPaginator(t *testing.T) {
 		// ... 2 3 4 ...
 		p = New(49, 10, 3, 3)
 		pages = p.Pages()
-		assert.Equal(t, 5, len(pages))
+		assert.Len(t, pages, 5)
 		assert.Equal(t, -1, pages[0].Num())
 		assert.False(t, pages[0].IsCurrent())
 		assert.Equal(t, 2, pages[1].Num())

modules/queue/unique_queue_disk_channel_test.go

@@ -208,7 +208,7 @@ func TestPersistableChannelUniqueQueue(t *testing.T) {
 
 			mapLock.Lock()
 			assert.Equal(t, 101, len(executedInitial[name])+len(executedEmpty[name]))
-			assert.Equal(t, 0, len(hasEmpty[name]))
+			assert.Empty(t, hasEmpty[name])
 			mapLock.Unlock()
 		})
 		close(done)

modules/secret/secret_test.go

@@ -15,9 +15,9 @@ func TestEncryptDecrypt(t *testing.T) {
 
 	hex, _ = EncryptSecret("foo", "baz")
 	str, _ = DecryptSecret("foo", hex)
-	assert.Equal(t, str, "baz")
+	assert.Equal(t, "baz", str)
 
 	hex, _ = EncryptSecret("bar", "baz")
 	str, _ = DecryptSecret("foo", hex)
-	assert.NotEqual(t, str, "baz")
+	assert.NotEqual(t, "baz", str)
 }

modules/storage/local_test.go

@@ -89,6 +89,6 @@ func TestLocalStorageIterator(t *testing.T) {
 			return nil
 		})
 		assert.NoError(t, err)
-		assert.Equal(t, count, len(expected))
+		assert.Len(t, expected, count)
 	}
 }