Skip to content

Commit f55cd03

Browse files
authored
Make TestOneDevDownloadRepo work again & more resistant (#16987)
* Update TestOneDevDownloadRepo since OneDev api changed * Use test functions for migrations
1 parent bc81d12 commit f55cd03

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

modules/migrations/onedev_test.go

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestOneDevDownloadRepo(t *testing.T) {
3030
}
3131
repo, err := downloader.GetRepoInfo()
3232
assert.NoError(t, err)
33-
assert.EqualValues(t, &base.Repository{
33+
assertRepositoryEqual(t, &base.Repository{
3434
Name: "go-gitea-test_repo",
3535
Owner: "",
3636
Description: "Test repository for testing migration from OneDev to gitea",
@@ -40,9 +40,8 @@ func TestOneDevDownloadRepo(t *testing.T) {
4040

4141
milestones, err := downloader.GetMilestones()
4242
assert.NoError(t, err)
43-
assert.Len(t, milestones, 2)
4443
deadline := time.Unix(1620086400, 0)
45-
assert.EqualValues(t, []*base.Milestone{
44+
assertMilestonesEqual(t, []*base.Milestone{
4645
{
4746
Title: "1.0.0",
4847
Deadline: &deadline,
@@ -60,9 +59,8 @@ func TestOneDevDownloadRepo(t *testing.T) {
6059

6160
issues, isEnd, err := downloader.GetIssues(1, 2)
6261
assert.NoError(t, err)
63-
assert.Len(t, issues, 2)
6462
assert.False(t, isEnd)
65-
assert.EqualValues(t, []*base.Issue{
63+
assertIssuesEqual(t, []*base.Issue{
6664
{
6765
Number: 4,
6866
Title: "Hi there",
@@ -112,21 +110,19 @@ func TestOneDevDownloadRepo(t *testing.T) {
112110
},
113111
})
114112
assert.NoError(t, err)
115-
assert.Len(t, comments, 1)
116-
assert.EqualValues(t, []*base.Comment{
113+
assertCommentsEqual(t, []*base.Comment{
117114
{
118115
IssueIndex: 4,
119116
PosterName: "User 336",
120117
Created: time.Unix(1628549791, 128000000),
121118
Updated: time.Unix(1628549791, 128000000),
122-
Content: "it has a comment\r\n\r\nEDIT: that got edited",
119+
Content: "it has a comment\n\nEDIT: that got edited",
123120
},
124121
}, comments)
125122

126123
prs, _, err := downloader.GetPullRequests(1, 1)
127124
assert.NoError(t, err)
128-
assert.Len(t, prs, 1)
129-
assert.EqualValues(t, []*base.PullRequest{
125+
assertPullRequestsEqual(t, []*base.PullRequest{
130126
{
131127
Number: 5,
132128
Title: "Pull to add a new file",
@@ -158,8 +154,7 @@ func TestOneDevDownloadRepo(t *testing.T) {
158154
localID: 5,
159155
})
160156
assert.NoError(t, err)
161-
assert.Len(t, rvs, 1)
162-
assert.EqualValues(t, []*base.Review{
157+
assertReviewsEqual(t, []*base.Review{
163158
{
164159
IssueIndex: 5,
165160
ReviewerName: "User 317",

0 commit comments

Comments
 (0)