Skip to content

Commit 65f7bce

Browse files
wxiaoguangwxiaoguang
committed
fix imports
1 parent 54bdc1e commit 65f7bce

Some content is hidden

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

64 files changed

+125
-64
lines changed

‎models/access_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109

10+
"code.gitea.io/gitea/models/unittest"
11+
1112
"code.gitea.io/gitea/models/db"
1213
"github.com/stretchr/testify/assert"
1314
)

‎models/action_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"path"
109
"testing"
1110

11+
"code.gitea.io/gitea/models/unittest"
12+
1213
"code.gitea.io/gitea/models/db"
1314
"code.gitea.io/gitea/modules/setting"
1415

‎models/admin_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109

10+
"code.gitea.io/gitea/models/unittest"
11+
1112
"code.gitea.io/gitea/models/db"
1213
"github.com/stretchr/testify/assert"
1314
)

‎models/attachment_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109

10+
"code.gitea.io/gitea/models/unittest"
11+
1112
"code.gitea.io/gitea/models/db"
1213
"code.gitea.io/gitea/models/unit"
1314
"github.com/stretchr/testify/assert"

‎models/branches_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109

10+
"code.gitea.io/gitea/models/unittest"
11+
1112
"code.gitea.io/gitea/models/db"
1213
"github.com/stretchr/testify/assert"
1314
)

‎models/commit_status_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109

10+
"code.gitea.io/gitea/models/unittest"
11+
1112
"code.gitea.io/gitea/models/db"
1213
"code.gitea.io/gitea/modules/structs"
1314
"github.com/stretchr/testify/assert"

‎models/consistency_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109

10+
"code.gitea.io/gitea/models/unittest"
11+
1112
"code.gitea.io/gitea/models/db"
1213
"github.com/stretchr/testify/assert"
1314
)

‎models/db/paginator/main_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package paginator
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"path/filepath"
109
"testing"
10+
11+
"code.gitea.io/gitea/models/unittest"
1112
)
1213

1314
func TestMain(m *testing.M) {

‎models/db/unit_tests.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ import (
1313
"xorm.io/xorm"
1414
)
1515

16-
1716
// Code in this file is mainly used by models.CheckConsistencyFor, which is not in the unit test for various reasons.
1817
// In the future if we can decouple CheckConsistencyFor into separate unit test code, then this file can be moved into unittest package too.
1918

20-
2119
// NonexistentID an ID that will never exist
2220
const NonexistentID = int64(math.MaxInt64)
2321

‎models/engine_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
package models
66

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

12+
"code.gitea.io/gitea/models/unittest"
13+
1314
"code.gitea.io/gitea/models/db"
1415
"code.gitea.io/gitea/modules/setting"
1516

‎models/fixture_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
package models
66

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

12+
"code.gitea.io/gitea/models/unittest"
13+
1314
"code.gitea.io/gitea/modules/util"
1415

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

‎models/gpg_key_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109
"time"
1110

11+
"code.gitea.io/gitea/models/unittest"
12+
1213
"code.gitea.io/gitea/models/db"
1314
"code.gitea.io/gitea/modules/timeutil"
1415

‎models/issue_assignees_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109

10+
"code.gitea.io/gitea/models/unittest"
11+
1112
"code.gitea.io/gitea/models/db"
1213
"github.com/stretchr/testify/assert"
1314
)

‎models/issue_comment_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109
"time"
1110

11+
"code.gitea.io/gitea/models/unittest"
12+
1213
"code.gitea.io/gitea/models/db"
1314
"github.com/stretchr/testify/assert"
1415
)

‎models/issue_dependency_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109

10+
"code.gitea.io/gitea/models/unittest"
11+
1112
"code.gitea.io/gitea/models/db"
1213
"github.com/stretchr/testify/assert"
1314
)

‎models/issue_label_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"html/template"
109
"testing"
1110

11+
"code.gitea.io/gitea/models/unittest"
12+
1213
"code.gitea.io/gitea/models/db"
1314
"github.com/stretchr/testify/assert"
1415
)

‎models/issue_list_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109

10+
"code.gitea.io/gitea/models/unittest"
11+
1112
"code.gitea.io/gitea/models/db"
1213
"code.gitea.io/gitea/modules/setting"
1314

‎models/issue_milestone_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"sort"
109
"testing"
1110

11+
"code.gitea.io/gitea/models/unittest"
12+
1213
"code.gitea.io/gitea/models/db"
1314
"code.gitea.io/gitea/modules/setting"
1415
api "code.gitea.io/gitea/modules/structs"

‎models/issue_reaction_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
package models
55

66
import (
7-
"code.gitea.io/gitea/models/unittest"
87
"testing"
98

9+
"code.gitea.io/gitea/models/unittest"
10+
1011
"code.gitea.io/gitea/models/db"
1112
"code.gitea.io/gitea/modules/setting"
1213

‎models/issue_stopwatch_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109

10+
"code.gitea.io/gitea/models/unittest"
11+
1112
"code.gitea.io/gitea/models/db"
1213
"code.gitea.io/gitea/modules/timeutil"
1314

‎models/issue_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"fmt"
109
"sort"
1110
"sync"
1211
"testing"
1312
"time"
1413

14+
"code.gitea.io/gitea/models/unittest"
15+
1516
"code.gitea.io/gitea/models/db"
1617
"github.com/stretchr/testify/assert"
1718
)

‎models/issue_tracked_time_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109
"time"
1110

11+
"code.gitea.io/gitea/models/unittest"
12+
1213
"code.gitea.io/gitea/models/db"
1314
"github.com/stretchr/testify/assert"
1415
)

‎models/issue_user_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109

10+
"code.gitea.io/gitea/models/unittest"
11+
1112
"code.gitea.io/gitea/models/db"
1213
"github.com/stretchr/testify/assert"
1314
)

‎models/issue_watch_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109

10+
"code.gitea.io/gitea/models/unittest"
11+
1112
"code.gitea.io/gitea/models/db"
1213
"github.com/stretchr/testify/assert"
1314
)

‎models/issue_xref_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
package models
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"fmt"
109
"testing"
1110

11+
"code.gitea.io/gitea/models/unittest"
12+
1213
"code.gitea.io/gitea/models/db"
1314
"code.gitea.io/gitea/modules/references"
1415

‎models/issues/content_history_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package issues
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109

10+
"code.gitea.io/gitea/models/unittest"
11+
1112
"code.gitea.io/gitea/models/db"
1213
"code.gitea.io/gitea/modules/timeutil"
1314

‎models/issues/main_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package issues
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"path/filepath"
109
"testing"
10+
11+
"code.gitea.io/gitea/models/unittest"
1112
)
1213

1314
func TestMain(m *testing.M) {

‎models/login/main_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package login
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"path/filepath"
109
"testing"
10+
11+
"code.gitea.io/gitea/models/unittest"
1112
)
1213

1314
func TestMain(m *testing.M) {

‎models/login/oauth2_application_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package login
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"testing"
109

10+
"code.gitea.io/gitea/models/unittest"
11+
1112
"code.gitea.io/gitea/models/db"
1213

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

‎models/login/source_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
package login
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"strings"
109
"testing"
1110

11+
"code.gitea.io/gitea/models/unittest"
12+
1213
"code.gitea.io/gitea/models/db"
1314
"code.gitea.io/gitea/modules/json"
1415

‎models/login/u2f_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
package login
66

77
import (
8-
"code.gitea.io/gitea/models/unittest"
98
"encoding/hex"
109
"testing"
1110

11+
"code.gitea.io/gitea/models/unittest"
12+
1213
"code.gitea.io/gitea/models/db"
1314

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

0 commit comments

Comments
 (0)