Skip to content

Commit 86c85c1

Browse files
lunnyzeripath
lunny
and
zeripath
authored
Refactor AssertExistsAndLoadBean to use generics (#20797)
* Refactor AssertExistsAndLoadBean to use generics * Fix tests Co-authored-by: zeripath <[email protected]>
1 parent e3308a0 commit 86c85c1

File tree

159 files changed

+888
-888
lines changed

Some content is hidden

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

159 files changed

+888
-888
lines changed

Diff for: ‎integrations/admin_user_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func makeRequest(t *testing.T, formData user_model.User, headerCode int) {
6161
})
6262

6363
session.MakeRequest(t, req, headerCode)
64-
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: formData.ID}).(*user_model.User)
64+
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: formData.ID})
6565
assert.Equal(t, formData.Name, user.Name)
6666
assert.Equal(t, formData.LoginName, user.LoginName)
6767
assert.Equal(t, formData.Email, user.Email)

Diff for: ‎integrations/api_admin_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestAPIAdminCreateAndDeleteSSHKey(t *testing.T) {
2222
defer prepareTestEnv(t)()
2323
// user1 is an admin user
2424
session := loginUser(t, "user1")
25-
keyOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user2"}).(*user_model.User)
25+
keyOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user2"})
2626

2727
token := getTokenForLoggedInUser(t, session)
2828
urlStr := fmt.Sprintf("/api/v1/admin/users/%s/keys?token=%s", keyOwner.Name, token)
@@ -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 := unittest.AssertExistsAndLoadBean(t, &user_model.User{LoginName: "user2"}).(*user_model.User)
197+
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{LoginName: "user2"})
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 = unittest.AssertExistsAndLoadBean(t, &user_model.User{LoginName: "user2"}).(*user_model.User)
208+
user2 = unittest.AssertExistsAndLoadBean(t, &user_model.User{LoginName: "user2"})
209209
assert.True(t, user2.IsRestricted)
210210
}

Diff for: ‎integrations/api_comment_test.go

+25-25
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ func TestAPIListRepoComments(t *testing.T) {
2424
defer prepareTestEnv(t)()
2525

2626
comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{},
27-
unittest.Cond("type = ?", issues_model.CommentTypeComment)).(*issues_model.Comment)
28-
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: comment.IssueID}).(*issues_model.Issue)
29-
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID}).(*repo_model.Repository)
30-
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}).(*user_model.User)
27+
unittest.Cond("type = ?", issues_model.CommentTypeComment))
28+
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: comment.IssueID})
29+
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID})
30+
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
3131

3232
session := loginUser(t, repoOwner.Name)
3333
link, _ := url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments", repoOwner.Name, repo.Name))
@@ -70,10 +70,10 @@ func TestAPIListIssueComments(t *testing.T) {
7070
defer prepareTestEnv(t)()
7171

7272
comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{},
73-
unittest.Cond("type = ?", issues_model.CommentTypeComment)).(*issues_model.Comment)
74-
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: comment.IssueID}).(*issues_model.Issue)
75-
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID}).(*repo_model.Repository)
76-
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}).(*user_model.User)
73+
unittest.Cond("type = ?", issues_model.CommentTypeComment))
74+
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: comment.IssueID})
75+
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID})
76+
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
7777

7878
session := loginUser(t, repoOwner.Name)
7979
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/%d/comments",
@@ -91,9 +91,9 @@ func TestAPICreateComment(t *testing.T) {
9191
defer prepareTestEnv(t)()
9292
const commentBody = "Comment body"
9393

94-
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{}).(*issues_model.Issue)
95-
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID}).(*repo_model.Repository)
96-
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}).(*user_model.User)
94+
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{})
95+
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID})
96+
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
9797

9898
session := loginUser(t, repoOwner.Name)
9999
token := getTokenForLoggedInUser(t, session)
@@ -113,10 +113,10 @@ func TestAPICreateComment(t *testing.T) {
113113
func TestAPIGetComment(t *testing.T) {
114114
defer prepareTestEnv(t)()
115115

116-
comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 2}).(*issues_model.Comment)
116+
comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 2})
117117
assert.NoError(t, comment.LoadIssue())
118-
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: comment.Issue.RepoID}).(*repo_model.Repository)
119-
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}).(*user_model.User)
118+
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: comment.Issue.RepoID})
119+
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
120120

121121
session := loginUser(t, repoOwner.Name)
122122
token := getTokenForLoggedInUser(t, session)
@@ -142,10 +142,10 @@ func TestAPIEditComment(t *testing.T) {
142142
const newCommentBody = "This is the new comment body"
143143

144144
comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{},
145-
unittest.Cond("type = ?", issues_model.CommentTypeComment)).(*issues_model.Comment)
146-
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: comment.IssueID}).(*issues_model.Issue)
147-
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID}).(*repo_model.Repository)
148-
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}).(*user_model.User)
145+
unittest.Cond("type = ?", issues_model.CommentTypeComment))
146+
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: comment.IssueID})
147+
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID})
148+
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
149149

150150
session := loginUser(t, repoOwner.Name)
151151
token := getTokenForLoggedInUser(t, session)
@@ -167,10 +167,10 @@ func TestAPIDeleteComment(t *testing.T) {
167167
defer prepareTestEnv(t)()
168168

169169
comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{},
170-
unittest.Cond("type = ?", issues_model.CommentTypeComment)).(*issues_model.Comment)
171-
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: comment.IssueID}).(*issues_model.Issue)
172-
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID}).(*repo_model.Repository)
173-
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}).(*user_model.User)
170+
unittest.Cond("type = ?", issues_model.CommentTypeComment))
171+
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: comment.IssueID})
172+
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID})
173+
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
174174

175175
session := loginUser(t, repoOwner.Name)
176176
token := getTokenForLoggedInUser(t, session)
@@ -185,9 +185,9 @@ func TestAPIListIssueTimeline(t *testing.T) {
185185
defer prepareTestEnv(t)()
186186

187187
// load comment
188-
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1}).(*issues_model.Issue)
189-
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID}).(*repo_model.Repository)
190-
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}).(*user_model.User)
188+
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
189+
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID})
190+
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
191191

192192
// make request
193193
session := loginUser(t, repoOwner.Name)

Diff for: ‎integrations/api_issue_label_test.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
func TestAPIModifyLabels(t *testing.T) {
2323
assert.NoError(t, unittest.LoadFixtures())
2424

25-
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}).(*repo_model.Repository)
26-
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}).(*user_model.User)
25+
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
26+
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
2727
session := loginUser(t, owner.Name)
2828
token := getTokenForLoggedInUser(t, session)
2929
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/labels?token=%s", owner.Name, repo.Name, token)
@@ -37,7 +37,7 @@ func TestAPIModifyLabels(t *testing.T) {
3737
resp := session.MakeRequest(t, req, http.StatusCreated)
3838
apiLabel := new(api.Label)
3939
DecodeJSON(t, resp, &apiLabel)
40-
dbLabel := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: apiLabel.ID, RepoID: repo.ID}).(*issues_model.Label)
40+
dbLabel := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: apiLabel.ID, RepoID: repo.ID})
4141
assert.EqualValues(t, dbLabel.Name, apiLabel.Name)
4242
assert.EqualValues(t, strings.TrimLeft(dbLabel.Color, "#"), apiLabel.Color)
4343

@@ -91,10 +91,10 @@ func TestAPIModifyLabels(t *testing.T) {
9191
func TestAPIAddIssueLabels(t *testing.T) {
9292
assert.NoError(t, unittest.LoadFixtures())
9393

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

9999
session := loginUser(t, owner.Name)
100100
token := getTokenForLoggedInUser(t, session)
@@ -114,10 +114,10 @@ func TestAPIAddIssueLabels(t *testing.T) {
114114
func TestAPIReplaceIssueLabels(t *testing.T) {
115115
assert.NoError(t, unittest.LoadFixtures())
116116

117-
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}).(*repo_model.Repository)
118-
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{RepoID: repo.ID}).(*issues_model.Issue)
119-
label := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{RepoID: repo.ID}).(*issues_model.Label)
120-
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}).(*user_model.User)
117+
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
118+
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{RepoID: repo.ID})
119+
label := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{RepoID: repo.ID})
120+
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
121121

122122
session := loginUser(t, owner.Name)
123123
token := getTokenForLoggedInUser(t, session)
@@ -140,8 +140,8 @@ func TestAPIReplaceIssueLabels(t *testing.T) {
140140
func TestAPIModifyOrgLabels(t *testing.T) {
141141
assert.NoError(t, unittest.LoadFixtures())
142142

143-
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3}).(*repo_model.Repository)
144-
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}).(*user_model.User)
143+
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3})
144+
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
145145
user := "user1"
146146
session := loginUser(t, user)
147147
token := getTokenForLoggedInUser(t, session)
@@ -156,7 +156,7 @@ func TestAPIModifyOrgLabels(t *testing.T) {
156156
resp := session.MakeRequest(t, req, http.StatusCreated)
157157
apiLabel := new(api.Label)
158158
DecodeJSON(t, resp, &apiLabel)
159-
dbLabel := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: apiLabel.ID, OrgID: owner.ID}).(*issues_model.Label)
159+
dbLabel := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: apiLabel.ID, OrgID: owner.ID})
160160
assert.EqualValues(t, dbLabel.Name, apiLabel.Name)
161161
assert.EqualValues(t, strings.TrimLeft(dbLabel.Color, "#"), apiLabel.Color)
162162

Diff for: ‎integrations/api_issue_milestone_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
func TestAPIIssuesMilestone(t *testing.T) {
2222
defer prepareTestEnv(t)()
2323

24-
milestone := unittest.AssertExistsAndLoadBean(t, &issues_model.Milestone{ID: 1}).(*issues_model.Milestone)
25-
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: milestone.RepoID}).(*repo_model.Repository)
26-
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}).(*user_model.User)
24+
milestone := unittest.AssertExistsAndLoadBean(t, &issues_model.Milestone{ID: 1})
25+
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: milestone.RepoID})
26+
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
2727
assert.Equal(t, int64(1), int64(milestone.NumIssues))
2828
assert.Equal(t, structs.StateOpen, milestone.State())
2929

Diff for: ‎integrations/api_issue_reaction_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ import (
2323
func TestAPIIssuesReactions(t *testing.T) {
2424
defer prepareTestEnv(t)()
2525

26-
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1}).(*issues_model.Issue)
26+
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
2727
_ = issue.LoadRepo(db.DefaultContext)
28-
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: issue.Repo.OwnerID}).(*user_model.User)
28+
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: issue.Repo.OwnerID})
2929

3030
session := loginUser(t, owner.Name)
3131
token := getTokenForLoggedInUser(t, session)
3232

33-
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}).(*user_model.User)
33+
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
3434
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/reactions?token=%s",
3535
owner.Name, issue.Repo.Name, issue.Index, token)
3636

@@ -80,17 +80,17 @@ func TestAPIIssuesReactions(t *testing.T) {
8080
func TestAPICommentReactions(t *testing.T) {
8181
defer prepareTestEnv(t)()
8282

83-
comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 2}).(*issues_model.Comment)
83+
comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 2})
8484
_ = comment.LoadIssue()
8585
issue := comment.Issue
8686
_ = issue.LoadRepo(db.DefaultContext)
87-
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: issue.Repo.OwnerID}).(*user_model.User)
87+
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: issue.Repo.OwnerID})
8888

8989
session := loginUser(t, owner.Name)
9090
token := getTokenForLoggedInUser(t, session)
9191

92-
user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}).(*user_model.User)
93-
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}).(*user_model.User)
92+
user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
93+
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
9494
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d/reactions?token=%s",
9595
owner.Name, issue.Repo.Name, comment.ID, token)
9696

Diff for: ‎integrations/api_issue_stopwatch_test.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ import (
2121
func TestAPIListStopWatches(t *testing.T) {
2222
defer prepareTestEnv(t)()
2323

24-
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}).(*repo_model.Repository)
25-
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}).(*user_model.User)
24+
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
25+
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
2626

2727
session := loginUser(t, owner.Name)
2828
token := getTokenForLoggedInUser(t, session)
2929
req := NewRequestf(t, "GET", "/api/v1/user/stopwatches?token=%s", token)
3030
resp := session.MakeRequest(t, req, http.StatusOK)
3131
var apiWatches []*api.StopWatch
3232
DecodeJSON(t, resp, &apiWatches)
33-
stopwatch := unittest.AssertExistsAndLoadBean(t, &issues_model.Stopwatch{UserID: owner.ID}).(*issues_model.Stopwatch)
34-
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: stopwatch.IssueID}).(*issues_model.Issue)
33+
stopwatch := unittest.AssertExistsAndLoadBean(t, &issues_model.Stopwatch{UserID: owner.ID})
34+
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: stopwatch.IssueID})
3535
if assert.Len(t, apiWatches, 1) {
3636
assert.EqualValues(t, stopwatch.CreatedUnix.AsTime().Unix(), apiWatches[0].Created.Unix())
3737
assert.EqualValues(t, issue.Index, apiWatches[0].IssueIndex)
@@ -45,10 +45,10 @@ func TestAPIListStopWatches(t *testing.T) {
4545
func TestAPIStopStopWatches(t *testing.T) {
4646
defer prepareTestEnv(t)()
4747

48-
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2}).(*issues_model.Issue)
48+
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
4949
_ = issue.LoadRepo(db.DefaultContext)
50-
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: issue.Repo.OwnerID}).(*user_model.User)
51-
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}).(*user_model.User)
50+
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: issue.Repo.OwnerID})
51+
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
5252

5353
session := loginUser(t, user.Name)
5454
token := getTokenForLoggedInUser(t, session)
@@ -61,10 +61,10 @@ func TestAPIStopStopWatches(t *testing.T) {
6161
func TestAPICancelStopWatches(t *testing.T) {
6262
defer prepareTestEnv(t)()
6363

64-
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1}).(*issues_model.Issue)
64+
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
6565
_ = issue.LoadRepo(db.DefaultContext)
66-
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: issue.Repo.OwnerID}).(*user_model.User)
67-
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}).(*user_model.User)
66+
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: issue.Repo.OwnerID})
67+
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
6868

6969
session := loginUser(t, user.Name)
7070
token := getTokenForLoggedInUser(t, session)
@@ -77,10 +77,10 @@ func TestAPICancelStopWatches(t *testing.T) {
7777
func TestAPIStartStopWatches(t *testing.T) {
7878
defer prepareTestEnv(t)()
7979

80-
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 3}).(*issues_model.Issue)
80+
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 3})
8181
_ = issue.LoadRepo(db.DefaultContext)
82-
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: issue.Repo.OwnerID}).(*user_model.User)
83-
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}).(*user_model.User)
82+
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: issue.Repo.OwnerID})
83+
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
8484

8585
session := loginUser(t, user.Name)
8686
token := getTokenForLoggedInUser(t, session)

0 commit comments

Comments
 (0)