From df64fa486555de6f403a795fd16c2e9e1d59e535 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 12 Nov 2021 22:36:47 +0800 Subject: Decouple unit test code from business code (#17623) --- routers/api/v1/repo/hook_test.go | 3 ++- routers/api/v1/repo/main_test.go | 4 ++-- routers/api/v1/repo/repo_test.go | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'routers/api') diff --git a/routers/api/v1/repo/hook_test.go b/routers/api/v1/repo/hook_test.go index 60fa6cead3..ff0aaf2938 100644 --- a/routers/api/v1/repo/hook_test.go +++ b/routers/api/v1/repo/hook_test.go @@ -9,6 +9,7 @@ import ( "testing" "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/test" @@ -17,7 +18,7 @@ import ( ) func TestTestHook(t *testing.T) { - db.PrepareTestEnv(t) + unittest.PrepareTestEnv(t) ctx := test.MockContext(t, "user2/repo1/wiki/_pages") ctx.SetParams(":id", "1") diff --git a/routers/api/v1/repo/main_test.go b/routers/api/v1/repo/main_test.go index 7a66370e05..f9ed886999 100644 --- a/routers/api/v1/repo/main_test.go +++ b/routers/api/v1/repo/main_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/unittest" ) func TestMain(m *testing.M) { - db.MainTest(m, filepath.Join("..", "..", "..", "..")) + unittest.MainTest(m, filepath.Join("..", "..", "..", "..")) } diff --git a/routers/api/v1/repo/repo_test.go b/routers/api/v1/repo/repo_test.go index e4fd4f9424..b992b93fd4 100644 --- a/routers/api/v1/repo/repo_test.go +++ b/routers/api/v1/repo/repo_test.go @@ -10,6 +10,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/modules/context" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/test" @@ -19,7 +20,7 @@ import ( ) func TestRepoEdit(t *testing.T) { - db.PrepareTestEnv(t) + unittest.PrepareTestEnv(t) ctx := test.MockContext(t, "user2/repo1") test.LoadRepo(t, ctx, 1) @@ -66,7 +67,7 @@ func TestRepoEdit(t *testing.T) { } func TestRepoEditNameChange(t *testing.T) { - db.PrepareTestEnv(t) + unittest.PrepareTestEnv(t) ctx := test.MockContext(t, "user2/repo1") test.LoadRepo(t, ctx, 1) -- cgit v1.2.3