aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
authorLunny Xiao2023-02-20 00:12:01 +0800
committerGitHub2023-02-20 00:12:01 +0800
commitc53ad052d8bd040ecd269d9757ce9885396a04af (patch)
tree7142da12dc9511445c76d3bf5616f1c220441a84 /models
parent2b02343e218755c36c6a45da8a53c06dfff843a1 (diff)
Refactor the setting to make unit test easier (#22405)
Some bugs caused by less unit tests in fundamental packages. This PR refactor `setting` package so that create a unit test will be easier than before. - All `LoadFromXXX` files has been splited as two functions, one is `InitProviderFromXXX` and `LoadCommonSettings`. The first functions will only include the code to create or new a ini file. The second function will load common settings. - It also renames all functions in setting from `newXXXService` to `loadXXXSetting` or `loadXXXFrom` to make the function name less confusing. - Move `XORMLog` to `SQLLog` because it's a better name for that. Maybe we should finally move these `loadXXXSetting` into the `XXXInit` function? Any idea? --------- Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: delvh <dev.lh@web.de>
Diffstat (limited to 'models')
-rw-r--r--models/asymkey/main_test.go2
-rw-r--r--models/dbfs/main_test.go2
-rw-r--r--models/issues/main_test.go2
-rw-r--r--models/main_test.go2
-rw-r--r--models/migrations/base/tests.go6
5 files changed, 7 insertions, 7 deletions
diff --git a/models/asymkey/main_test.go b/models/asymkey/main_test.go
index 82a408ece..7f8657189 100644
--- a/models/asymkey/main_test.go
+++ b/models/asymkey/main_test.go
@@ -13,7 +13,7 @@ import (
func init() {
setting.SetCustomPathAndConf("", "", "")
- setting.LoadForTest()
+ setting.InitProviderAndLoadCommonSettingsForTest()
}
func TestMain(m *testing.M) {
diff --git a/models/dbfs/main_test.go b/models/dbfs/main_test.go
index 7a820b2d8..9dce663ee 100644
--- a/models/dbfs/main_test.go
+++ b/models/dbfs/main_test.go
@@ -13,7 +13,7 @@ import (
func init() {
setting.SetCustomPathAndConf("", "", "")
- setting.LoadForTest()
+ setting.InitProviderAndLoadCommonSettingsForTest()
}
func TestMain(m *testing.M) {
diff --git a/models/issues/main_test.go b/models/issues/main_test.go
index 93e05f33f..de84da30e 100644
--- a/models/issues/main_test.go
+++ b/models/issues/main_test.go
@@ -20,7 +20,7 @@ import (
func init() {
setting.SetCustomPathAndConf("", "", "")
- setting.LoadForTest()
+ setting.InitProviderAndLoadCommonSettingsForTest()
}
func TestFixturesAreConsistent(t *testing.T) {
diff --git a/models/main_test.go b/models/main_test.go
index cc4eebfe7..b5919bb28 100644
--- a/models/main_test.go
+++ b/models/main_test.go
@@ -20,7 +20,7 @@ import (
func init() {
setting.SetCustomPathAndConf("", "", "")
- setting.LoadForTest()
+ setting.InitProviderAndLoadCommonSettingsForTest()
}
// TestFixturesAreConsistent assert that test fixtures are consistent
diff --git a/models/migrations/base/tests.go b/models/migrations/base/tests.go
index a9bcd20f6..2f1b24664 100644
--- a/models/migrations/base/tests.go
+++ b/models/migrations/base/tests.go
@@ -149,13 +149,13 @@ func MainTest(m *testing.M) {
setting.AppDataPath = tmpDataPath
setting.SetCustomPathAndConf("", "", "")
- setting.LoadForTest()
+ setting.InitProviderAndLoadCommonSettingsForTest()
if err = git.InitFull(context.Background()); err != nil {
fmt.Printf("Unable to InitFull: %v\n", err)
os.Exit(1)
}
- setting.InitDBConfig()
- setting.NewLogServices(true)
+ setting.LoadDBSetting()
+ setting.InitLogs(true)
exitStatus := m.Run()