mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Refactor AssertExistsAndLoadBean to use generics (#20797)
* Refactor AssertExistsAndLoadBean to use generics * Fix tests Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
		@@ -17,13 +17,13 @@ import (
 | 
			
		||||
func TestRepoAssignees(t *testing.T) {
 | 
			
		||||
	assert.NoError(t, unittest.PrepareTestDatabase())
 | 
			
		||||
 | 
			
		||||
	repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}).(*repo_model.Repository)
 | 
			
		||||
	repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
 | 
			
		||||
	users, err := repo_model.GetRepoAssignees(db.DefaultContext, repo2)
 | 
			
		||||
	assert.NoError(t, err)
 | 
			
		||||
	assert.Len(t, users, 1)
 | 
			
		||||
	assert.Equal(t, users[0].ID, int64(2))
 | 
			
		||||
 | 
			
		||||
	repo21 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 21}).(*repo_model.Repository)
 | 
			
		||||
	repo21 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 21})
 | 
			
		||||
	users, err = repo_model.GetRepoAssignees(db.DefaultContext, repo21)
 | 
			
		||||
	assert.NoError(t, err)
 | 
			
		||||
	assert.Len(t, users, 3)
 | 
			
		||||
@@ -36,7 +36,7 @@ func TestRepoGetReviewers(t *testing.T) {
 | 
			
		||||
	assert.NoError(t, unittest.PrepareTestDatabase())
 | 
			
		||||
 | 
			
		||||
	// test public repo
 | 
			
		||||
	repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}).(*repo_model.Repository)
 | 
			
		||||
	repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
 | 
			
		||||
 | 
			
		||||
	ctx := db.DefaultContext
 | 
			
		||||
	reviewers, err := repo_model.GetReviewers(ctx, repo1, 2, 2)
 | 
			
		||||
@@ -54,7 +54,7 @@ func TestRepoGetReviewers(t *testing.T) {
 | 
			
		||||
	assert.Len(t, reviewers, 3)
 | 
			
		||||
 | 
			
		||||
	// test private user repo
 | 
			
		||||
	repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}).(*repo_model.Repository)
 | 
			
		||||
	repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
 | 
			
		||||
 | 
			
		||||
	reviewers, err = repo_model.GetReviewers(ctx, repo2, 2, 4)
 | 
			
		||||
	assert.NoError(t, err)
 | 
			
		||||
@@ -62,7 +62,7 @@ func TestRepoGetReviewers(t *testing.T) {
 | 
			
		||||
	assert.EqualValues(t, reviewers[0].ID, 2)
 | 
			
		||||
 | 
			
		||||
	// test private org repo
 | 
			
		||||
	repo3 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3}).(*repo_model.Repository)
 | 
			
		||||
	repo3 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3})
 | 
			
		||||
 | 
			
		||||
	reviewers, err = repo_model.GetReviewers(ctx, repo3, 2, 1)
 | 
			
		||||
	assert.NoError(t, err)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user