server/beego
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update orm_test.go/TestInsertOrUpdate with table-driven.

Browse Source 
Update CHANGELOG

fix lint
This commit is contained in:
Yu Huang 2021-05-16 21:04:10 -04:00
parent 511714d616
commit 11dc5484ad
2 changed files with 86 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,4 +1,5 @@
# developing
- Update orm_test.go/TestInsertOrUpdate with table-driven. [4609](https://github.com/beego/beego/pull/4609)
- Add: Resp() method for web.Controller. [4588](https://github.com/beego/beego/pull/4588)
- Web mock and test support. [4565](https://github.com/beego/beego/pull/4565) [4574](https://github.com/beego/beego/pull/4574)
- Error codes definition of cache module. [4493](https://github.com/beego/beego/pull/4493)

153
client/orm/orm_test.go
View File

@ -2269,7 +2269,6 @@ func TestTransaction(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, int64(1), num)
}
func TestTxOrmRollbackUnlessCommit(t *testing.T) {
@ -2642,93 +2641,101 @@ func TestIgnoreCaseTag(t *testing.T) {
func TestInsertOrUpdate(t *testing.T) {
RegisterModel(new(User))
user := User{UserName: "unique_username133", Status: 1, Password: "o"}
user1 := User{UserName: "unique_username133", Status: 2, Password: "o"}
user2 := User{UserName: "unique_username133", Status: 3, Password: "oo"}
userName := "unique_username133"
column := "user_name"
user := User{UserName: userName, Status: 1, Password: "o"}
user1 := User{UserName: userName, Status: 2, Password: "o"}
user2 := User{UserName: userName, Status: 3, Password: "oo"}
dORM.Insert(&user)
test := User{UserName: "unique_username133"}
fmt.Println(dORM.Driver().Name())
if dORM.Driver().Name() == "sqlite3" {
fmt.Println("sqlite3 is nonsupport")
return
}
// test1
_, err := dORM.InsertOrUpdate(&user1, "user_name")
if err != nil {
fmt.Println(err)
if err.Error() == "postgres version must 9.5 or higher" || err.Error() == "`sqlite3` nonsupport InsertOrUpdate in beego" {
} else {
throwFailNow(t, err)
}
} else {
dORM.Read(&test, "user_name")
throwFailNow(t, AssertIs(user1.Status, test.Status))
}
// test2
_, err = dORM.InsertOrUpdate(&user2, "user_name")
if err != nil {
fmt.Println(err)
if err.Error() == "postgres version must 9.5 or higher" || err.Error() == "`sqlite3` nonsupport InsertOrUpdate in beego" {
} else {
throwFailNow(t, err)
}
} else {
dORM.Read(&test, "user_name")
throwFailNow(t, AssertIs(user2.Status, test.Status))
throwFailNow(t, AssertIs(user2.Password, strings.TrimSpace(test.Password)))
specs := []struct {
description string
user User
colConflitAndArgs []string
assertion func(expected User, actual User)
isPostgresCompatible bool
}{
{
description: "test1",
user: user1,
colConflitAndArgs: []string{column},
assertion: func(expected, actual User) {
throwFailNow(t, AssertIs(expected.Status, actual.Status))
},
isPostgresCompatible: true,
},
{
description: "test2",
user: user2,
colConflitAndArgs: []string{column},
assertion: func(expected, actual User) {
throwFailNow(t, AssertIs(expected.Status, actual.Status))
throwFailNow(t, AssertIs(expected.Password, strings.TrimSpace(actual.Password)))
},
isPostgresCompatible: true,
},
{
description: "test3 +",
user: user2,
colConflitAndArgs: []string{column, "status=status+1"},
assertion: func(expected, actual User) {
throwFailNow(t, AssertIs(expected.Status+1, actual.Status))
},
isPostgresCompatible: false,
},
{
description: "test4 -",
user: user2,
colConflitAndArgs: []string{column, "status=status-1"},
assertion: func(expected, actual User) {
throwFailNow(t, AssertIs((expected.Status+1)-1, actual.Status))
},
isPostgresCompatible: false,
},
{
description: "test5 *",
user: user2,
colConflitAndArgs: []string{column, "status=status*3"},
assertion: func(expected, actual User) {
throwFailNow(t, AssertIs(((expected.Status+1)-1)*3, actual.Status))
},
isPostgresCompatible: false,
},
{
description: "test6 /",
user: user2,
colConflitAndArgs: []string{column, "Status=Status/3"},
assertion: func(expected, actual User) {
throwFailNow(t, AssertIs((((expected.Status+1)-1)*3)/3, actual.Status))
},
isPostgresCompatible: false,
},
}
for _, spec := range specs {
// postgres ON CONFLICT DO UPDATE SET can`t use colu=colu+values
if IsPostgres {
return
if IsPostgres && !spec.isPostgresCompatible {
continue
}
// test3 +
_, err = dORM.InsertOrUpdate(&user2, "user_name", "status=status+1")
_, err := dORM.InsertOrUpdate(&spec.user, spec.colConflitAndArgs...)
if err != nil {
fmt.Println(err)
if err.Error() == "postgres version must 9.5 or higher" || err.Error() == "`sqlite3` nonsupport InsertOrUpdate in beego" {
} else {
if !(err.Error() == "postgres version must 9.5 or higher" || err.Error() == "`sqlite3` nonsupport InsertOrUpdate in beego") {
throwFailNow(t, err)
}
} else {
dORM.Read(&test, "user_name")
throwFailNow(t, AssertIs(user2.Status+1, test.Status))
continue
}
// test4 -
_, err = dORM.InsertOrUpdate(&user2, "user_name", "status=status-1")
if err != nil {
fmt.Println(err)
if err.Error() == "postgres version must 9.5 or higher" || err.Error() == "`sqlite3` nonsupport InsertOrUpdate in beego" {
} else {
throwFailNow(t, err)
}
} else {
dORM.Read(&test, "user_name")
throwFailNow(t, AssertIs((user2.Status+1)-1, test.Status))
}
// test5 *
_, err = dORM.InsertOrUpdate(&user2, "user_name", "status=status*3")
if err != nil {
fmt.Println(err)
if err.Error() == "postgres version must 9.5 or higher" || err.Error() == "`sqlite3` nonsupport InsertOrUpdate in beego" {
} else {
throwFailNow(t, err)
}
} else {
dORM.Read(&test, "user_name")
throwFailNow(t, AssertIs(((user2.Status+1)-1)*3, test.Status))
}
// test6 /
_, err = dORM.InsertOrUpdate(&user2, "user_name", "Status=Status/3")
if err != nil {
fmt.Println(err)
if err.Error() == "postgres version must 9.5 or higher" || err.Error() == "`sqlite3` nonsupport InsertOrUpdate in beego" {
} else {
throwFailNow(t, err)
}
} else {
dORM.Read(&test, "user_name")
throwFailNow(t, AssertIs((((user2.Status+1)-1)*3)/3, test.Status))
test := User{UserName: userName}
err = dORM.Read(&test, column)
throwFailNow(t, AssertIs(err, nil))
spec.assertion(spec.user, test)
}
}