Skip to content

Commit 81926d6

Browse files
wxiaoguanglunny
wxiaoguang
and
lunny
authored
Decouple unit test, remove intermediate unittestbridge package (#17662)
Co-authored-by: Lunny Xiao <[email protected]>
1 parent 23bd7b1 commit 81926d6

File tree

151 files changed

+1719
-1781
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+1719
-1781
lines changed

‎integrations/admin_user_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models"
13-
"code.gitea.io/gitea/models/db"
13+
"code.gitea.io/gitea/models/unittest"
1414

1515
"github.com/stretchr/testify/assert"
1616
)
@@ -61,7 +61,7 @@ func makeRequest(t *testing.T, formData models.User, headerCode int) {
6161
})
6262

6363
session.MakeRequest(t, req, headerCode)
64-
user := db.AssertExistsAndLoadBean(t, &models.User{ID: formData.ID}).(*models.User)
64+
user := unittest.AssertExistsAndLoadBean(t, &models.User{ID: formData.ID}).(*models.User)
6565
assert.Equal(t, formData.Name, user.Name)
6666
assert.Equal(t, formData.LoginName, user.LoginName)
6767
assert.Equal(t, formData.Email, user.Email)
@@ -79,5 +79,5 @@ func TestAdminDeleteUser(t *testing.T) {
7979
session.MakeRequest(t, req, http.StatusOK)
8080

8181
assertUserDeleted(t, 8)
82-
models.CheckConsistencyFor(t, &models.User{})
82+
unittest.CheckConsistencyFor(t, &models.User{})
8383
}

‎integrations/api_admin_org_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"testing"
1212

1313
"code.gitea.io/gitea/models"
14-
"code.gitea.io/gitea/models/db"
14+
"code.gitea.io/gitea/models/unittest"
1515
api "code.gitea.io/gitea/modules/structs"
1616

1717
"github.com/stretchr/testify/assert"
@@ -43,7 +43,7 @@ func TestAPIAdminOrgCreate(t *testing.T) {
4343
assert.Equal(t, org.Location, apiOrg.Location)
4444
assert.Equal(t, org.Visibility, apiOrg.Visibility)
4545

46-
db.AssertExistsAndLoadBean(t, &models.User{
46+
unittest.AssertExistsAndLoadBean(t, &models.User{
4747
Name: org.UserName,
4848
LowerName: strings.ToLower(org.UserName),
4949
FullName: org.FullName,

‎integrations/api_admin_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models"
13-
"code.gitea.io/gitea/models/db"
13+
"code.gitea.io/gitea/models/unittest"
1414
"code.gitea.io/gitea/modules/json"
1515
api "code.gitea.io/gitea/modules/structs"
1616

@@ -21,7 +21,7 @@ func TestAPIAdminCreateAndDeleteSSHKey(t *testing.T) {
2121
defer prepareTestEnv(t)()
2222
// user1 is an admin user
2323
session := loginUser(t, "user1")
24-
keyOwner := db.AssertExistsAndLoadBean(t, &models.User{Name: "user2"}).(*models.User)
24+
keyOwner := unittest.AssertExistsAndLoadBean(t, &models.User{Name: "user2"}).(*models.User)
2525

2626
token := getTokenForLoggedInUser(t, session)
2727
urlStr := fmt.Sprintf("/api/v1/admin/users/%s/keys?token=%s", keyOwner.Name, token)
@@ -33,7 +33,7 @@ func TestAPIAdminCreateAndDeleteSSHKey(t *testing.T) {
3333

3434
var newPublicKey api.PublicKey
3535
DecodeJSON(t, resp, &newPublicKey)
36-
db.AssertExistsAndLoadBean(t, &models.PublicKey{
36+
unittest.AssertExistsAndLoadBean(t, &models.PublicKey{
3737
ID: newPublicKey.ID,
3838
Name: newPublicKey.Title,
3939
Content: newPublicKey.Key,
@@ -44,7 +44,7 @@ func TestAPIAdminCreateAndDeleteSSHKey(t *testing.T) {
4444
req = NewRequestf(t, "DELETE", "/api/v1/admin/users/%s/keys/%d?token=%s",
4545
keyOwner.Name, newPublicKey.ID, token)
4646
session.MakeRequest(t, req, http.StatusNoContent)
47-
db.AssertNotExistsBean(t, &models.PublicKey{ID: newPublicKey.ID})
47+
unittest.AssertNotExistsBean(t, &models.PublicKey{ID: newPublicKey.ID})
4848
}
4949

5050
func TestAPIAdminDeleteMissingSSHKey(t *testing.T) {
@@ -53,7 +53,7 @@ func TestAPIAdminDeleteMissingSSHKey(t *testing.T) {
5353
session := loginUser(t, "user1")
5454

5555
token := getTokenForLoggedInUser(t, session)
56-
req := NewRequestf(t, "DELETE", "/api/v1/admin/users/user1/keys/%d?token=%s", db.NonexistentID, token)
56+
req := NewRequestf(t, "DELETE", "/api/v1/admin/users/user1/keys/%d?token=%s", unittest.NonexistentID, token)
5757
session.MakeRequest(t, req, http.StatusNotFound)
5858
}
5959

@@ -128,7 +128,7 @@ func TestAPIListUsers(t *testing.T) {
128128
}
129129
}
130130
assert.True(t, found)
131-
numberOfUsers := db.GetCount(t, &models.User{}, "type = 0")
131+
numberOfUsers := unittest.GetCount(t, &models.User{}, "type = 0")
132132
assert.Equal(t, numberOfUsers, len(users))
133133
}
134134

@@ -194,7 +194,7 @@ func TestAPIEditUser(t *testing.T) {
194194
json.Unmarshal(resp.Body.Bytes(), &errMap)
195195
assert.EqualValues(t, "email is not allowed to be empty string", errMap["message"].(string))
196196

197-
user2 := db.AssertExistsAndLoadBean(t, &models.User{LoginName: "user2"}).(*models.User)
197+
user2 := unittest.AssertExistsAndLoadBean(t, &models.User{LoginName: "user2"}).(*models.User)
198198
assert.False(t, user2.IsRestricted)
199199
bTrue := true
200200
req = NewRequestWithJSON(t, "PATCH", urlStr, api.EditUserOption{
@@ -205,6 +205,6 @@ func TestAPIEditUser(t *testing.T) {
205205
Restricted: &bTrue,
206206
})
207207
session.MakeRequest(t, req, http.StatusOK)
208-
user2 = db.AssertExistsAndLoadBean(t, &models.User{LoginName: "user2"}).(*models.User)
208+
user2 = unittest.AssertExistsAndLoadBean(t, &models.User{LoginName: "user2"}).(*models.User)
209209
assert.True(t, user2.IsRestricted)
210210
}

‎integrations/api_comment_test.go‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"testing"
1212

1313
"code.gitea.io/gitea/models"
14-
"code.gitea.io/gitea/models/db"
14+
"code.gitea.io/gitea/models/unittest"
1515
"code.gitea.io/gitea/modules/convert"
1616
api "code.gitea.io/gitea/modules/structs"
1717

@@ -21,11 +21,11 @@ import (
2121
func TestAPIListRepoComments(t *testing.T) {
2222
defer prepareTestEnv(t)()
2323

24-
comment := db.AssertExistsAndLoadBean(t, &models.Comment{},
25-
db.Cond("type = ?", models.CommentTypeComment)).(*models.Comment)
26-
issue := db.AssertExistsAndLoadBean(t, &models.Issue{ID: comment.IssueID}).(*models.Issue)
27-
repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: issue.RepoID}).(*models.Repository)
28-
repoOwner := db.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
24+
comment := unittest.AssertExistsAndLoadBean(t, &models.Comment{},
25+
unittest.Cond("type = ?", models.CommentTypeComment)).(*models.Comment)
26+
issue := unittest.AssertExistsAndLoadBean(t, &models.Issue{ID: comment.IssueID}).(*models.Issue)
27+
repo := unittest.AssertExistsAndLoadBean(t, &models.Repository{ID: issue.RepoID}).(*models.Repository)
28+
repoOwner := unittest.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
2929

3030
session := loginUser(t, repoOwner.Name)
3131
link, _ := url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments", repoOwner.Name, repo.Name))
@@ -37,9 +37,9 @@ func TestAPIListRepoComments(t *testing.T) {
3737
assert.Len(t, apiComments, 2)
3838
for _, apiComment := range apiComments {
3939
c := &models.Comment{ID: apiComment.ID}
40-
db.AssertExistsAndLoadBean(t, c,
41-
db.Cond("type = ?", models.CommentTypeComment))
42-
db.AssertExistsAndLoadBean(t, &models.Issue{ID: c.IssueID, RepoID: repo.ID})
40+
unittest.AssertExistsAndLoadBean(t, c,
41+
unittest.Cond("type = ?", models.CommentTypeComment))
42+
unittest.AssertExistsAndLoadBean(t, &models.Issue{ID: c.IssueID, RepoID: repo.ID})
4343
}
4444

4545
//test before and since filters
@@ -67,11 +67,11 @@ func TestAPIListRepoComments(t *testing.T) {
6767
func TestAPIListIssueComments(t *testing.T) {
6868
defer prepareTestEnv(t)()
6969

70-
comment := db.AssertExistsAndLoadBean(t, &models.Comment{},
71-
db.Cond("type = ?", models.CommentTypeComment)).(*models.Comment)
72-
issue := db.AssertExistsAndLoadBean(t, &models.Issue{ID: comment.IssueID}).(*models.Issue)
73-
repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: issue.RepoID}).(*models.Repository)
74-
repoOwner := db.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
70+
comment := unittest.AssertExistsAndLoadBean(t, &models.Comment{},
71+
unittest.Cond("type = ?", models.CommentTypeComment)).(*models.Comment)
72+
issue := unittest.AssertExistsAndLoadBean(t, &models.Issue{ID: comment.IssueID}).(*models.Issue)
73+
repo := unittest.AssertExistsAndLoadBean(t, &models.Repository{ID: issue.RepoID}).(*models.Repository)
74+
repoOwner := unittest.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
7575

7676
session := loginUser(t, repoOwner.Name)
7777
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/%d/comments",
@@ -80,18 +80,18 @@ func TestAPIListIssueComments(t *testing.T) {
8080

8181
var comments []*api.Comment
8282
DecodeJSON(t, resp, &comments)
83-
expectedCount := db.GetCount(t, &models.Comment{IssueID: issue.ID},
84-
db.Cond("type = ?", models.CommentTypeComment))
83+
expectedCount := unittest.GetCount(t, &models.Comment{IssueID: issue.ID},
84+
unittest.Cond("type = ?", models.CommentTypeComment))
8585
assert.EqualValues(t, expectedCount, len(comments))
8686
}
8787

8888
func TestAPICreateComment(t *testing.T) {
8989
defer prepareTestEnv(t)()
9090
const commentBody = "Comment body"
9191

92-
issue := db.AssertExistsAndLoadBean(t, &models.Issue{}).(*models.Issue)
93-
repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: issue.RepoID}).(*models.Repository)
94-
repoOwner := db.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
92+
issue := unittest.AssertExistsAndLoadBean(t, &models.Issue{}).(*models.Issue)
93+
repo := unittest.AssertExistsAndLoadBean(t, &models.Repository{ID: issue.RepoID}).(*models.Repository)
94+
repoOwner := unittest.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
9595

9696
session := loginUser(t, repoOwner.Name)
9797
token := getTokenForLoggedInUser(t, session)
@@ -105,16 +105,16 @@ func TestAPICreateComment(t *testing.T) {
105105
var updatedComment api.Comment
106106
DecodeJSON(t, resp, &updatedComment)
107107
assert.EqualValues(t, commentBody, updatedComment.Body)
108-
db.AssertExistsAndLoadBean(t, &models.Comment{ID: updatedComment.ID, IssueID: issue.ID, Content: commentBody})
108+
unittest.AssertExistsAndLoadBean(t, &models.Comment{ID: updatedComment.ID, IssueID: issue.ID, Content: commentBody})
109109
}
110110

111111
func TestAPIGetComment(t *testing.T) {
112112
defer prepareTestEnv(t)()
113113

114-
comment := db.AssertExistsAndLoadBean(t, &models.Comment{ID: 2}).(*models.Comment)
114+
comment := unittest.AssertExistsAndLoadBean(t, &models.Comment{ID: 2}).(*models.Comment)
115115
assert.NoError(t, comment.LoadIssue())
116-
repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: comment.Issue.RepoID}).(*models.Repository)
117-
repoOwner := db.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
116+
repo := unittest.AssertExistsAndLoadBean(t, &models.Repository{ID: comment.Issue.RepoID}).(*models.Repository)
117+
repoOwner := unittest.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
118118

119119
session := loginUser(t, repoOwner.Name)
120120
token := getTokenForLoggedInUser(t, session)
@@ -139,11 +139,11 @@ func TestAPIEditComment(t *testing.T) {
139139
defer prepareTestEnv(t)()
140140
const newCommentBody = "This is the new comment body"
141141

142-
comment := db.AssertExistsAndLoadBean(t, &models.Comment{},
143-
db.Cond("type = ?", models.CommentTypeComment)).(*models.Comment)
144-
issue := db.AssertExistsAndLoadBean(t, &models.Issue{ID: comment.IssueID}).(*models.Issue)
145-
repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: issue.RepoID}).(*models.Repository)
146-
repoOwner := db.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
142+
comment := unittest.AssertExistsAndLoadBean(t, &models.Comment{},
143+
unittest.Cond("type = ?", models.CommentTypeComment)).(*models.Comment)
144+
issue := unittest.AssertExistsAndLoadBean(t, &models.Issue{ID: comment.IssueID}).(*models.Issue)
145+
repo := unittest.AssertExistsAndLoadBean(t, &models.Repository{ID: issue.RepoID}).(*models.Repository)
146+
repoOwner := unittest.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
147147

148148
session := loginUser(t, repoOwner.Name)
149149
token := getTokenForLoggedInUser(t, session)
@@ -158,23 +158,23 @@ func TestAPIEditComment(t *testing.T) {
158158
DecodeJSON(t, resp, &updatedComment)
159159
assert.EqualValues(t, comment.ID, updatedComment.ID)
160160
assert.EqualValues(t, newCommentBody, updatedComment.Body)
161-
db.AssertExistsAndLoadBean(t, &models.Comment{ID: comment.ID, IssueID: issue.ID, Content: newCommentBody})
161+
unittest.AssertExistsAndLoadBean(t, &models.Comment{ID: comment.ID, IssueID: issue.ID, Content: newCommentBody})
162162
}
163163

164164
func TestAPIDeleteComment(t *testing.T) {
165165
defer prepareTestEnv(t)()
166166

167-
comment := db.AssertExistsAndLoadBean(t, &models.Comment{},
168-
db.Cond("type = ?", models.CommentTypeComment)).(*models.Comment)
169-
issue := db.AssertExistsAndLoadBean(t, &models.Issue{ID: comment.IssueID}).(*models.Issue)
170-
repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: issue.RepoID}).(*models.Repository)
171-
repoOwner := db.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
167+
comment := unittest.AssertExistsAndLoadBean(t, &models.Comment{},
168+
unittest.Cond("type = ?", models.CommentTypeComment)).(*models.Comment)
169+
issue := unittest.AssertExistsAndLoadBean(t, &models.Issue{ID: comment.IssueID}).(*models.Issue)
170+
repo := unittest.AssertExistsAndLoadBean(t, &models.Repository{ID: issue.RepoID}).(*models.Repository)
171+
repoOwner := unittest.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
172172

173173
session := loginUser(t, repoOwner.Name)
174174
token := getTokenForLoggedInUser(t, session)
175175
req := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/issues/comments/%d?token=%s",
176176
repoOwner.Name, repo.Name, comment.ID, token)
177177
session.MakeRequest(t, req, http.StatusNoContent)
178178

179-
db.AssertNotExistsBean(t, &models.Comment{ID: comment.ID})
179+
unittest.AssertNotExistsBean(t, &models.Comment{ID: comment.ID})
180180
}

‎integrations/api_issue_label_test.go‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"code.gitea.io/gitea/models/unittest"
1414

1515
"code.gitea.io/gitea/models"
16-
"code.gitea.io/gitea/models/db"
1716
api "code.gitea.io/gitea/modules/structs"
1817

1918
"github.com/stretchr/testify/assert"
@@ -22,8 +21,8 @@ import (
2221
func TestAPIModifyLabels(t *testing.T) {
2322
assert.NoError(t, unittest.LoadFixtures())
2423

25-
repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: 2}).(*models.Repository)
26-
owner := db.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
24+
repo := unittest.AssertExistsAndLoadBean(t, &models.Repository{ID: 2}).(*models.Repository)
25+
owner := unittest.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
2726
session := loginUser(t, owner.Name)
2827
token := getTokenForLoggedInUser(t, session)
2928
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/labels?token=%s", owner.Name, repo.Name, token)
@@ -37,7 +36,7 @@ func TestAPIModifyLabels(t *testing.T) {
3736
resp := session.MakeRequest(t, req, http.StatusCreated)
3837
apiLabel := new(api.Label)
3938
DecodeJSON(t, resp, &apiLabel)
40-
dbLabel := db.AssertExistsAndLoadBean(t, &models.Label{ID: apiLabel.ID, RepoID: repo.ID}).(*models.Label)
39+
dbLabel := unittest.AssertExistsAndLoadBean(t, &models.Label{ID: apiLabel.ID, RepoID: repo.ID}).(*models.Label)
4140
assert.EqualValues(t, dbLabel.Name, apiLabel.Name)
4241
assert.EqualValues(t, strings.TrimLeft(dbLabel.Color, "#"), apiLabel.Color)
4342

@@ -92,10 +91,10 @@ func TestAPIModifyLabels(t *testing.T) {
9291
func TestAPIAddIssueLabels(t *testing.T) {
9392
assert.NoError(t, unittest.LoadFixtures())
9493

95-
repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
96-
issue := db.AssertExistsAndLoadBean(t, &models.Issue{RepoID: repo.ID}).(*models.Issue)
97-
_ = db.AssertExistsAndLoadBean(t, &models.Label{RepoID: repo.ID, ID: 2}).(*models.Label)
98-
owner := db.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
94+
repo := unittest.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
95+
issue := unittest.AssertExistsAndLoadBean(t, &models.Issue{RepoID: repo.ID}).(*models.Issue)
96+
_ = unittest.AssertExistsAndLoadBean(t, &models.Label{RepoID: repo.ID, ID: 2}).(*models.Label)
97+
owner := unittest.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
9998

10099
session := loginUser(t, owner.Name)
101100
token := getTokenForLoggedInUser(t, session)
@@ -107,18 +106,18 @@ func TestAPIAddIssueLabels(t *testing.T) {
107106
resp := session.MakeRequest(t, req, http.StatusOK)
108107
var apiLabels []*api.Label
109108
DecodeJSON(t, resp, &apiLabels)
110-
assert.Len(t, apiLabels, db.GetCount(t, &models.IssueLabel{IssueID: issue.ID}))
109+
assert.Len(t, apiLabels, unittest.GetCount(t, &models.IssueLabel{IssueID: issue.ID}))
111110

112-
db.AssertExistsAndLoadBean(t, &models.IssueLabel{IssueID: issue.ID, LabelID: 2})
111+
unittest.AssertExistsAndLoadBean(t, &models.IssueLabel{IssueID: issue.ID, LabelID: 2})
113112
}
114113

115114
func TestAPIReplaceIssueLabels(t *testing.T) {
116115
assert.NoError(t, unittest.LoadFixtures())
117116

118-
repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
119-
issue := db.AssertExistsAndLoadBean(t, &models.Issue{RepoID: repo.ID}).(*models.Issue)
120-
label := db.AssertExistsAndLoadBean(t, &models.Label{RepoID: repo.ID}).(*models.Label)
121-
owner := db.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
117+
repo := unittest.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
118+
issue := unittest.AssertExistsAndLoadBean(t, &models.Issue{RepoID: repo.ID}).(*models.Issue)
119+
label := unittest.AssertExistsAndLoadBean(t, &models.Label{RepoID: repo.ID}).(*models.Label)
120+
owner := unittest.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
122121

123122
session := loginUser(t, owner.Name)
124123
token := getTokenForLoggedInUser(t, session)
@@ -134,15 +133,15 @@ func TestAPIReplaceIssueLabels(t *testing.T) {
134133
assert.EqualValues(t, label.ID, apiLabels[0].ID)
135134
}
136135

137-
db.AssertCount(t, &models.IssueLabel{IssueID: issue.ID}, 1)
138-
db.AssertExistsAndLoadBean(t, &models.IssueLabel{IssueID: issue.ID, LabelID: label.ID})
136+
unittest.AssertCount(t, &models.IssueLabel{IssueID: issue.ID}, 1)
137+
unittest.AssertExistsAndLoadBean(t, &models.IssueLabel{IssueID: issue.ID, LabelID: label.ID})
139138
}
140139

141140
func TestAPIModifyOrgLabels(t *testing.T) {
142141
assert.NoError(t, unittest.LoadFixtures())
143142

144-
repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: 3}).(*models.Repository)
145-
owner := db.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
143+
repo := unittest.AssertExistsAndLoadBean(t, &models.Repository{ID: 3}).(*models.Repository)
144+
owner := unittest.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
146145
user := "user1"
147146
session := loginUser(t, user)
148147
token := getTokenForLoggedInUser(t, session)
@@ -157,7 +156,7 @@ func TestAPIModifyOrgLabels(t *testing.T) {
157156
resp := session.MakeRequest(t, req, http.StatusCreated)
158157
apiLabel := new(api.Label)
159158
DecodeJSON(t, resp, &apiLabel)
160-
dbLabel := db.AssertExistsAndLoadBean(t, &models.Label{ID: apiLabel.ID, OrgID: owner.ID}).(*models.Label)
159+
dbLabel := unittest.AssertExistsAndLoadBean(t, &models.Label{ID: apiLabel.ID, OrgID: owner.ID}).(*models.Label)
161160
assert.EqualValues(t, dbLabel.Name, apiLabel.Name)
162161
assert.EqualValues(t, strings.TrimLeft(dbLabel.Color, "#"), apiLabel.Color)
163162

‎integrations/api_issue_milestone_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models"
13-
"code.gitea.io/gitea/models/db"
13+
"code.gitea.io/gitea/models/unittest"
1414
"code.gitea.io/gitea/modules/structs"
1515

1616
"github.com/stretchr/testify/assert"
@@ -19,9 +19,9 @@ import (
1919
func TestAPIIssuesMilestone(t *testing.T) {
2020
defer prepareTestEnv(t)()
2121

22-
milestone := db.AssertExistsAndLoadBean(t, &models.Milestone{ID: 1}).(*models.Milestone)
23-
repo := db.AssertExistsAndLoadBean(t, &models.Repository{ID: milestone.RepoID}).(*models.Repository)
24-
owner := db.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
22+
milestone := unittest.AssertExistsAndLoadBean(t, &models.Milestone{ID: 1}).(*models.Milestone)
23+
repo := unittest.AssertExistsAndLoadBean(t, &models.Repository{ID: milestone.RepoID}).(*models.Repository)
24+
owner := unittest.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
2525
assert.Equal(t, int64(1), int64(milestone.NumIssues))
2626
assert.Equal(t, structs.StateOpen, milestone.State())
2727

0 commit comments

Comments
 (0)