mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-26 06:16:56 +09:00
test: consolidate Go tests (#39962)
Consolidate all Go tests. Coverage is identical to before. Go tests are around 5% faster while being 7% smaller. No non-test code is touched.
This commit is contained in:
silverwind authored and 
GitHub committed
1 parent
ce7364e215
commit
8abda62312
388 files changed
+18410
-29561
No files matched your search
@@ -10,6 +10,7 @@ import (
|
||||
repo_model "gitea.dev/models/repo"
|
||||
"gitea.dev/models/unittest"
|
||||
"gitea.dev/modules/git"
|
||||
api "gitea.dev/modules/structs"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
@@ -52,49 +53,27 @@ func TestPushCommits_ToAPIPayloadCommits(t *testing.T) {
|
||||
assert.Len(t, payloadCommits, 3)
|
||||
assert.NotNil(t, headCommit)
|
||||
|
||||
assert.Equal(t, "69554a6", payloadCommits[0].ID)
|
||||
assert.Equal(t, "not signed commit", payloadCommits[0].Message)
|
||||
assert.Equal(t, "https://try.gitea.io/user2/repo16/commit/69554a6", payloadCommits[0].URL)
|
||||
assert.Equal(t, "User2", payloadCommits[0].Committer.Name)
|
||||
assert.Equal(t, "user2", payloadCommits[0].Committer.UserName)
|
||||
assert.Equal(t, "User2", payloadCommits[0].Author.Name)
|
||||
assert.Equal(t, "user2", payloadCommits[0].Author.UserName)
|
||||
assert.Equal(t, []string{}, payloadCommits[0].Added)
|
||||
assert.Equal(t, []string{}, payloadCommits[0].Removed)
|
||||
assert.Equal(t, []string{"readme.md"}, payloadCommits[0].Modified)
|
||||
|
||||
assert.Equal(t, "27566bd", payloadCommits[1].ID)
|
||||
assert.Equal(t, "good signed commit (with not yet validated email)", payloadCommits[1].Message)
|
||||
assert.Equal(t, "https://try.gitea.io/user2/repo16/commit/27566bd", payloadCommits[1].URL)
|
||||
assert.Equal(t, "User2", payloadCommits[1].Committer.Name)
|
||||
assert.Equal(t, "user2", payloadCommits[1].Committer.UserName)
|
||||
assert.Equal(t, "User2", payloadCommits[1].Author.Name)
|
||||
assert.Equal(t, "user2", payloadCommits[1].Author.UserName)
|
||||
assert.Equal(t, []string{}, payloadCommits[1].Added)
|
||||
assert.Equal(t, []string{}, payloadCommits[1].Removed)
|
||||
assert.Equal(t, []string{"readme.md"}, payloadCommits[1].Modified)
|
||||
|
||||
assert.Equal(t, "5099b81", payloadCommits[2].ID)
|
||||
assert.Equal(t, "good signed commit", payloadCommits[2].Message)
|
||||
assert.Equal(t, "https://try.gitea.io/user2/repo16/commit/5099b81", payloadCommits[2].URL)
|
||||
assert.Equal(t, "User2", payloadCommits[2].Committer.Name)
|
||||
assert.Equal(t, "user2", payloadCommits[2].Committer.UserName)
|
||||
assert.Equal(t, "User2", payloadCommits[2].Author.Name)
|
||||
assert.Equal(t, "user2", payloadCommits[2].Author.UserName)
|
||||
assert.Equal(t, []string{"readme.md"}, payloadCommits[2].Added)
|
||||
assert.Equal(t, []string{}, payloadCommits[2].Removed)
|
||||
assert.Equal(t, []string{}, payloadCommits[2].Modified)
|
||||
|
||||
assert.Equal(t, "69554a6", headCommit.ID)
|
||||
assert.Equal(t, "not signed commit", headCommit.Message)
|
||||
assert.Equal(t, "https://try.gitea.io/user2/repo16/commit/69554a6", headCommit.URL)
|
||||
assert.Equal(t, "User2", headCommit.Committer.Name)
|
||||
assert.Equal(t, "user2", headCommit.Committer.UserName)
|
||||
assert.Equal(t, "User2", headCommit.Author.Name)
|
||||
assert.Equal(t, "user2", headCommit.Author.UserName)
|
||||
assert.Equal(t, []string{}, headCommit.Added)
|
||||
assert.Equal(t, []string{}, headCommit.Removed)
|
||||
assert.Equal(t, []string{"readme.md"}, headCommit.Modified)
|
||||
for _, tt := range []struct {
|
||||
commit *api.PayloadCommit
|
||||
id, message, url string
|
||||
added, modified []string
|
||||
}{
|
||||
{payloadCommits[0], "69554a6", "not signed commit", "https://try.gitea.io/user2/repo16/commit/69554a6", []string{}, []string{"readme.md"}},
|
||||
{payloadCommits[1], "27566bd", "good signed commit (with not yet validated email)", "https://try.gitea.io/user2/repo16/commit/27566bd", []string{}, []string{"readme.md"}},
|
||||
{payloadCommits[2], "5099b81", "good signed commit", "https://try.gitea.io/user2/repo16/commit/5099b81", []string{"readme.md"}, []string{}},
|
||||
{headCommit, "69554a6", "not signed commit", "https://try.gitea.io/user2/repo16/commit/69554a6", []string{}, []string{"readme.md"}},
|
||||
} {
|
||||
assert.Equal(t, tt.id, tt.commit.ID)
|
||||
assert.Equal(t, tt.message, tt.commit.Message)
|
||||
assert.Equal(t, tt.url, tt.commit.URL)
|
||||
assert.Equal(t, "User2", tt.commit.Committer.Name)
|
||||
assert.Equal(t, "user2", tt.commit.Committer.UserName)
|
||||
assert.Equal(t, "User2", tt.commit.Author.Name)
|
||||
assert.Equal(t, "user2", tt.commit.Author.UserName)
|
||||
assert.Equal(t, tt.added, tt.commit.Added)
|
||||
assert.Equal(t, []string{}, tt.commit.Removed)
|
||||
assert.Equal(t, tt.modified, tt.commit.Modified)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCommitToPushCommit(t *testing.T) {
|
||||
|
||||
@@ -11,22 +11,17 @@ import (
|
||||
)
|
||||
|
||||
func Test_getLicense(t *testing.T) {
|
||||
type args struct {
|
||||
name string
|
||||
values *LicenseValues
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
license string
|
||||
values *LicenseValues
|
||||
want string
|
||||
wantErr assert.ErrorAssertionFunc
|
||||
}{
|
||||
{
|
||||
name: "regular",
|
||||
args: args{
|
||||
name: "MIT",
|
||||
values: &LicenseValues{Owner: "Gitea", Year: "2023"},
|
||||
},
|
||||
name: "regular",
|
||||
license: "MIT",
|
||||
values: &LicenseValues{Owner: "Gitea", Year: "2023"},
|
||||
want: `MIT License
|
||||
|
||||
Copyright (c) 2023 Gitea
|
||||
@@ -35,41 +30,33 @@ Permission is hereby granted`,
|
||||
wantErr: assert.NoError,
|
||||
},
|
||||
{
|
||||
name: "license not found",
|
||||
args: args{
|
||||
name: "notfound",
|
||||
},
|
||||
name: "license not found",
|
||||
license: "notfound",
|
||||
wantErr: assert.Error,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got, err := GetLicense(tt.args.name, tt.args.values)
|
||||
if !tt.wantErr(t, err, fmt.Sprintf("GetLicense(%v, %v)", tt.args.name, tt.args.values)) {
|
||||
got, err := GetLicense(tt.license, tt.values)
|
||||
if !tt.wantErr(t, err, fmt.Sprintf("GetLicense(%v, %v)", tt.license, tt.values)) {
|
||||
return
|
||||
}
|
||||
assert.Contains(t, string(got), tt.want, "GetLicense(%v, %v)", tt.args.name, tt.args.values)
|
||||
assert.Contains(t, string(got), tt.want, "GetLicense(%v, %v)", tt.license, tt.values)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func Test_fillLicensePlaceholder(t *testing.T) {
|
||||
type args struct {
|
||||
name string
|
||||
values *LicenseValues
|
||||
origin string
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
want string
|
||||
name string
|
||||
license string
|
||||
origin string
|
||||
want string
|
||||
}{
|
||||
{
|
||||
name: "owner",
|
||||
args: args{
|
||||
name: "regular",
|
||||
values: &LicenseValues{Year: "2023", Owner: "Gitea", Email: "teabot@gitea.io", Repo: "gitea"},
|
||||
origin: `
|
||||
name: "owner",
|
||||
license: "regular",
|
||||
origin: `
|
||||
<name of author>
|
||||
<owner>
|
||||
[NAME]
|
||||
@@ -81,7 +68,6 @@ func Test_fillLicensePlaceholder(t *testing.T) {
|
||||
<author's name or designee>
|
||||
[one or more legally recognised persons or entities offering the Work under the terms and conditions of this Licence]
|
||||
`,
|
||||
},
|
||||
want: `
|
||||
Gitea
|
||||
Gitea
|
||||
@@ -96,39 +82,31 @@ Gitea
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: "email",
|
||||
args: args{
|
||||
name: "regular",
|
||||
values: &LicenseValues{Year: "2023", Owner: "Gitea", Email: "teabot@gitea.io", Repo: "gitea"},
|
||||
origin: `
|
||||
name: "email",
|
||||
license: "regular",
|
||||
origin: `
|
||||
[EMAIL]
|
||||
`,
|
||||
},
|
||||
want: `
|
||||
teabot@gitea.io
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: "repo",
|
||||
args: args{
|
||||
name: "regular",
|
||||
values: &LicenseValues{Year: "2023", Owner: "Gitea", Email: "teabot@gitea.io", Repo: "gitea"},
|
||||
origin: `
|
||||
name: "repo",
|
||||
license: "regular",
|
||||
origin: `
|
||||
<program>
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
`,
|
||||
},
|
||||
want: `
|
||||
gitea
|
||||
gitea
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: "year",
|
||||
args: args{
|
||||
name: "regular",
|
||||
values: &LicenseValues{Year: "2023", Owner: "Gitea", Email: "teabot@gitea.io", Repo: "gitea"},
|
||||
origin: `
|
||||
name: "year",
|
||||
license: "regular",
|
||||
origin: `
|
||||
<year>
|
||||
[YEAR]
|
||||
{YEAR}
|
||||
@@ -136,7 +114,6 @@ gitea
|
||||
[Year]
|
||||
[year]
|
||||
`,
|
||||
},
|
||||
want: `
|
||||
2023
|
||||
2023
|
||||
@@ -147,18 +124,15 @@ gitea
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: "0BSD",
|
||||
args: args{
|
||||
name: "0BSD",
|
||||
values: &LicenseValues{Year: "2023", Owner: "Gitea", Email: "teabot@gitea.io", Repo: "gitea"},
|
||||
origin: `
|
||||
name: "0BSD",
|
||||
license: "0BSD",
|
||||
origin: `
|
||||
Copyright (C) YEAR by AUTHOR EMAIL
|
||||
|
||||
...
|
||||
|
||||
... THE AUTHOR BE LIABLE FOR ...
|
||||
`,
|
||||
},
|
||||
want: `
|
||||
Copyright (C) 2023 by Gitea teabot@gitea.io
|
||||
|
||||
@@ -170,7 +144,8 @@ Copyright (C) 2023 by Gitea teabot@gitea.io
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
assert.Equalf(t, tt.want, string(fillLicensePlaceholder(tt.args.name, tt.args.values, []byte(tt.args.origin))), "fillLicensePlaceholder(%v, %v, %v)", tt.args.name, tt.args.values, tt.args.origin)
|
||||
values := &LicenseValues{Year: "2023", Owner: "Gitea", Email: "teabot@gitea.io", Repo: "gitea"}
|
||||
assert.Equalf(t, tt.want, string(fillLicensePlaceholder(tt.license, values, []byte(tt.origin))), "fillLicensePlaceholder(%v, %v, %v)", tt.license, values, tt.origin)
|
||||
})
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user