Skip to content

Commit 88a3517

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent 65f7bce commit 88a3517

File tree

120 files changed

+118
-116
lines changed

Some content is hidden

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

120 files changed

+118
-116
lines changed

‎contrib/fixtures/fixture_generation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
package main
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"fmt"
109
"os"
1110
"path/filepath"
1211

1312
"code.gitea.io/gitea/models"
13+
"code.gitea.io/gitea/models/unittest"
1414
)
1515

1616
// To generate derivative fixtures, execute the following from Gitea's repository base dir:

‎contrib/pr/checkout.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Checkout a PR and load the tests data into sqlite database
99
*/
1010

1111
import (
12-
"code.gitea.io/gitea/models/unittest"
1312
"context"
1413
"flag"
1514
"fmt"
@@ -27,6 +26,7 @@ import (
2726

2827
"code.gitea.io/gitea/models"
2928
"code.gitea.io/gitea/models/db"
29+
"code.gitea.io/gitea/models/unittest"
3030
gitea_git "code.gitea.io/gitea/modules/git"
3131
"code.gitea.io/gitea/modules/markup"
3232
"code.gitea.io/gitea/modules/markup/external"

‎models/access_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"github.com/stretchr/testify/assert"
1413
)

‎models/action_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"testing"
1010

1111
"code.gitea.io/gitea/models/unittest"
12-
1312
"code.gitea.io/gitea/models/db"
1413
"code.gitea.io/gitea/modules/setting"
1514

‎models/admin_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"github.com/stretchr/testify/assert"
1413
)

‎models/attachment_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"code.gitea.io/gitea/models/unit"
1413
"github.com/stretchr/testify/assert"

‎models/branches_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"github.com/stretchr/testify/assert"
1413
)

‎models/commit_status_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"code.gitea.io/gitea/modules/structs"
1413
"github.com/stretchr/testify/assert"

‎models/consistency_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"github.com/stretchr/testify/assert"
1413
)

‎models/db/engine.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ func NewEngine() (*xorm.Engine, error) {
124124
return engine, nil
125125
}
126126

127+
//SyncAllTables sync the schemas of all tables, is required by unit test code
127128
func SyncAllTables() error {
128129
return x.StoreEngine("InnoDB").Sync2(tables...)
129130
}

‎models/db/paginator/paginator.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Copyright 2021 The Gitea Authors. All rights reserved.
2+
// Use of this source code is governed by a MIT-style
3+
// license that can be found in the LICENSE file.
4+
15
package paginator
26

37
// dummy only. in the future, the models/db/list_options.go should be moved here to decouple from db package

‎models/db/unit_tests.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
// NonexistentID an ID that will never exist
2020
const NonexistentID = int64(math.MaxInt64)
2121

22+
//SetUnitTestEngine is used by unit test code
2223
func SetUnitTestEngine(eng *xorm.Engine) {
2324
x = eng
2425
DefaultContext = &Context{

‎models/engine_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models/unittest"
13-
1413
"code.gitea.io/gitea/models/db"
1514
"code.gitea.io/gitea/modules/setting"
1615

‎models/fixture_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models/unittest"
13-
1413
"code.gitea.io/gitea/modules/util"
1514

1615
"github.com/stretchr/testify/assert"

‎models/gpg_key_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"time"
1010

1111
"code.gitea.io/gitea/models/unittest"
12-
1312
"code.gitea.io/gitea/models/db"
1413
"code.gitea.io/gitea/modules/timeutil"
1514

‎models/issue_assignees_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"github.com/stretchr/testify/assert"
1413
)

‎models/issue_comment_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"time"
1010

1111
"code.gitea.io/gitea/models/unittest"
12-
1312
"code.gitea.io/gitea/models/db"
1413
"github.com/stretchr/testify/assert"
1514
)

‎models/issue_dependency_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"github.com/stretchr/testify/assert"
1413
)

‎models/issue_label_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"testing"
1010

1111
"code.gitea.io/gitea/models/unittest"
12-
1312
"code.gitea.io/gitea/models/db"
1413
"github.com/stretchr/testify/assert"
1514
)

‎models/issue_list_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"code.gitea.io/gitea/modules/setting"
1413

‎models/issue_milestone_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"testing"
1010

1111
"code.gitea.io/gitea/models/unittest"
12-
1312
"code.gitea.io/gitea/models/db"
1413
"code.gitea.io/gitea/modules/setting"
1514
api "code.gitea.io/gitea/modules/structs"

‎models/issue_reaction_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"testing"
88

99
"code.gitea.io/gitea/models/unittest"
10-
1110
"code.gitea.io/gitea/models/db"
1211
"code.gitea.io/gitea/modules/setting"
1312

‎models/issue_stopwatch_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"code.gitea.io/gitea/modules/timeutil"
1413

‎models/issue_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"time"
1313

1414
"code.gitea.io/gitea/models/unittest"
15-
1615
"code.gitea.io/gitea/models/db"
1716
"github.com/stretchr/testify/assert"
1817
)

‎models/issue_tracked_time_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"time"
1010

1111
"code.gitea.io/gitea/models/unittest"
12-
1312
"code.gitea.io/gitea/models/db"
1413
"github.com/stretchr/testify/assert"
1514
)

‎models/issue_user_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"github.com/stretchr/testify/assert"
1413
)

‎models/issue_watch_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"github.com/stretchr/testify/assert"
1413
)

‎models/issue_xref_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"testing"
1010

1111
"code.gitea.io/gitea/models/unittest"
12-
1312
"code.gitea.io/gitea/models/db"
1413
"code.gitea.io/gitea/modules/references"
1514

‎models/issues/content_history_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"code.gitea.io/gitea/modules/timeutil"
1413

‎models/login/oauth2_application_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312

1413
"github.com/stretchr/testify/assert"

‎models/login/source_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"testing"
1010

1111
"code.gitea.io/gitea/models/unittest"
12-
1312
"code.gitea.io/gitea/models/db"
1413
"code.gitea.io/gitea/modules/json"
1514

‎models/login/u2f_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"testing"
1010

1111
"code.gitea.io/gitea/models/unittest"
12-
1312
"code.gitea.io/gitea/models/db"
1413

1514
"github.com/stretchr/testify/assert"

‎models/migrations/migrations_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"time"
1616

1717
"code.gitea.io/gitea/models/unittest"
18-
1918
"code.gitea.io/gitea/models/db"
2019
"code.gitea.io/gitea/modules/base"
2120
"code.gitea.io/gitea/modules/git"

‎models/notification_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"github.com/stretchr/testify/assert"
1413
)

‎models/org_team_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"testing"
1010

1111
"code.gitea.io/gitea/models/unittest"
12-
1312
"code.gitea.io/gitea/models/db"
1413
"github.com/stretchr/testify/assert"
1514
)

‎models/org_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"code.gitea.io/gitea/modules/setting"
1413
"code.gitea.io/gitea/modules/structs"

‎models/project_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/modules/timeutil"
1312

1413
"github.com/stretchr/testify/assert"

‎models/pull_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"code.gitea.io/gitea/models/unit"
1413
"github.com/stretchr/testify/assert"

‎models/repo_collaboration_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"github.com/stretchr/testify/assert"
1413
)

‎models/repo_list_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"code.gitea.io/gitea/modules/util"
1413

‎models/repo_permission_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"code.gitea.io/gitea/models/unit"
1413
"github.com/stretchr/testify/assert"

‎models/repo_pushmirror_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"time"
1010

1111
"code.gitea.io/gitea/models/unittest"
12-
1312
"code.gitea.io/gitea/modules/timeutil"
1413

1514
"github.com/stretchr/testify/assert"

‎models/repo_redirect_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"github.com/stretchr/testify/assert"
1413
)

‎models/repo_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"testing"
1414

1515
"code.gitea.io/gitea/models/unittest"
16-
1716
"code.gitea.io/gitea/models/db"
1817
"code.gitea.io/gitea/models/unit"
1918
"code.gitea.io/gitea/modules/markup"

‎models/repo_transfer_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"github.com/stretchr/testify/assert"
1413
)

‎models/repo_watch_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"code.gitea.io/gitea/modules/setting"
1413

‎models/review_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"github.com/stretchr/testify/assert"
1413
)

‎models/star_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11-
1211
"code.gitea.io/gitea/models/db"
1312
"github.com/stretchr/testify/assert"
1413
)

0 commit comments

Comments
 (0)