diff --git a/workflow/cmd/workflow-app/main_test.go b/workflow/cmd/workflow-app/main_test.go index 59b88484..11121f8e 100644 --- a/workflow/cmd/workflow-app/main_test.go +++ b/workflow/cmd/workflow-app/main_test.go @@ -16,9 +16,9 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/task" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/approval/approval_test.go b/workflow/internal/approval/approval_test.go index bf9f5614..f7a99504 100644 --- a/workflow/internal/approval/approval_test.go +++ b/workflow/internal/approval/approval_test.go @@ -8,8 +8,8 @@ import ( "sync" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/approvalapi/handler_test.go b/workflow/internal/approvalapi/handler_test.go index 2186d46e..43f85f1e 100644 --- a/workflow/internal/approvalapi/handler_test.go +++ b/workflow/internal/approvalapi/handler_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/approval" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/backchannel/backchannel_test.go b/workflow/internal/backchannel/backchannel_test.go index 9b7699e4..e4b6d4a3 100644 --- a/workflow/internal/backchannel/backchannel_test.go +++ b/workflow/internal/backchannel/backchannel_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/caseobj" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/reminder" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/task" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" "github.com/jackc/pgx/v5/pgxpool" ) diff --git a/workflow/internal/backchannelapi/backchannelapi_test.go b/workflow/internal/backchannelapi/backchannelapi_test.go index ec7a27c0..0137aa1c 100644 --- a/workflow/internal/backchannelapi/backchannelapi_test.go +++ b/workflow/internal/backchannelapi/backchannelapi_test.go @@ -8,12 +8,12 @@ import ( "path/filepath" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/backchannel" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/caseobj" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/reminder" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/task" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) type alwaysValid struct{} diff --git a/workflow/internal/calendar/calendar_test.go b/workflow/internal/calendar/calendar_test.go index 0b5f1519..c2774236 100644 --- a/workflow/internal/calendar/calendar_test.go +++ b/workflow/internal/calendar/calendar_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/caseobj/caseobj_test.go b/workflow/internal/caseobj/caseobj_test.go index 7abd8be1..869cd29a 100644 --- a/workflow/internal/caseobj/caseobj_test.go +++ b/workflow/internal/caseobj/caseobj_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/caseoverview/caseoverview_test.go b/workflow/internal/caseoverview/caseoverview_test.go index 5ccec81c..e1f4d6b8 100644 --- a/workflow/internal/caseoverview/caseoverview_test.go +++ b/workflow/internal/caseoverview/caseoverview_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/caseobj" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/reminder" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/task" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" "github.com/jackc/pgx/v5/pgxpool" ) diff --git a/workflow/internal/caseoverviewapi/caseoverviewapi_test.go b/workflow/internal/caseoverviewapi/caseoverviewapi_test.go index 8b4189f2..6cd2204b 100644 --- a/workflow/internal/caseoverviewapi/caseoverviewapi_test.go +++ b/workflow/internal/caseoverviewapi/caseoverviewapi_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/caseobj" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/caseoverview" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/reminder" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/task" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/contracttest/contracttest_test.go b/workflow/internal/contracttest/contracttest_test.go index afafbe49..dffe8e10 100644 --- a/workflow/internal/contracttest/contracttest_test.go +++ b/workflow/internal/contracttest/contracttest_test.go @@ -13,6 +13,7 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/backchannel" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/backchannelapi" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/caseobj" @@ -20,7 +21,6 @@ import ( "gitea.perlbach24.de/scripte/nexarch/workflow/internal/moduleadapter" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/reminder" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/task" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) type alwaysValidVerifier struct{} diff --git a/workflow/internal/delegation/delegation_test.go b/workflow/internal/delegation/delegation_test.go index 75733d85..4517516b 100644 --- a/workflow/internal/delegation/delegation_test.go +++ b/workflow/internal/delegation/delegation_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/dualcheck/dualcheck_test.go b/workflow/internal/dualcheck/dualcheck_test.go index d12250cc..fe6b960e 100644 --- a/workflow/internal/dualcheck/dualcheck_test.go +++ b/workflow/internal/dualcheck/dualcheck_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/escalation/escalation_test.go b/workflow/internal/escalation/escalation_test.go index d69bac04..240463c0 100644 --- a/workflow/internal/escalation/escalation_test.go +++ b/workflow/internal/escalation/escalation_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/task" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/escalationnotify/escalationnotify_test.go b/workflow/internal/escalationnotify/escalationnotify_test.go index 36c36a08..1ef94594 100644 --- a/workflow/internal/escalationnotify/escalationnotify_test.go +++ b/workflow/internal/escalationnotify/escalationnotify_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/escalation" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/notifyclient" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/task" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/eventtrigger/eventtrigger_test.go b/workflow/internal/eventtrigger/eventtrigger_test.go index ece09e15..312bfadc 100644 --- a/workflow/internal/eventtrigger/eventtrigger_test.go +++ b/workflow/internal/eventtrigger/eventtrigger_test.go @@ -8,11 +8,11 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/approval" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/moduleadapter" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/task" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) const ownTenant = "mandant-a" diff --git a/workflow/internal/fixtureset/fixtureset_test.go b/workflow/internal/fixtureset/fixtureset_test.go index aacaa804..48e970b1 100644 --- a/workflow/internal/fixtureset/fixtureset_test.go +++ b/workflow/internal/fixtureset/fixtureset_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/delegation" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/dualcheck" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/loadtest/loadtest_test.go b/workflow/internal/loadtest/loadtest_test.go index 4d053eed..bf4224cf 100644 --- a/workflow/internal/loadtest/loadtest_test.go +++ b/workflow/internal/loadtest/loadtest_test.go @@ -21,6 +21,7 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/approval" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/eventtrigger" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" @@ -28,7 +29,6 @@ import ( "gitea.perlbach24.de/scripte/nexarch/workflow/internal/routingengine" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/routingrule" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/task" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) const ownTenant = "mandant-last" diff --git a/workflow/internal/migrationworkflow/migrate_test.go b/workflow/internal/migrationworkflow/migrate_test.go index 4ebba1f5..d000cc2e 100644 --- a/workflow/internal/migrationworkflow/migrate_test.go +++ b/workflow/internal/migrationworkflow/migrate_test.go @@ -9,7 +9,7 @@ import ( "github.com/jackc/pgx/v5/pgxpool" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" ) // memorySource ist eine In-Memory-Testquelle: simuliert den SQL-Export von diff --git a/workflow/internal/moduleadapter/moduleadapter_test.go b/workflow/internal/moduleadapter/moduleadapter_test.go index 9dff7649..2a5e36f7 100644 --- a/workflow/internal/moduleadapter/moduleadapter_test.go +++ b/workflow/internal/moduleadapter/moduleadapter_test.go @@ -9,8 +9,8 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/processdef/processdef_test.go b/workflow/internal/processdef/processdef_test.go index 218ff589..5ef4f6d6 100644 --- a/workflow/internal/processdef/processdef_test.go +++ b/workflow/internal/processdef/processdef_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func moduleRoot(t *testing.T) string { diff --git a/workflow/internal/qa02/qa02_test.go b/workflow/internal/qa02/qa02_test.go index e0ceec40..46328e2f 100644 --- a/workflow/internal/qa02/qa02_test.go +++ b/workflow/internal/qa02/qa02_test.go @@ -16,12 +16,12 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/moduleadapter" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/processdef" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/statemachine" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/stepretry" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func moduleRoot(t *testing.T) string { diff --git a/workflow/internal/qa03/qa03_test.go b/workflow/internal/qa03/qa03_test.go index 426b4f33..4f922d8a 100644 --- a/workflow/internal/qa03/qa03_test.go +++ b/workflow/internal/qa03/qa03_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/approval" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/delegation" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/dualcheck" @@ -27,7 +28,6 @@ import ( "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/notifyclient" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/task" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/reminder/reminder_test.go b/workflow/internal/reminder/reminder_test.go index a1289c70..1a53017a 100644 --- a/workflow/internal/reminder/reminder_test.go +++ b/workflow/internal/reminder/reminder_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/caseobj" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/task" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/routingengine/routingengine_test.go b/workflow/internal/routingengine/routingengine_test.go index 5bcf7fdb..fd7d49df 100644 --- a/workflow/internal/routingengine/routingengine_test.go +++ b/workflow/internal/routingengine/routingengine_test.go @@ -8,9 +8,9 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/routingrule" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/routingqagate/routingqagate_test.go b/workflow/internal/routingqagate/routingqagate_test.go index e8f55c4a..1a6190cd 100644 --- a/workflow/internal/routingqagate/routingqagate_test.go +++ b/workflow/internal/routingqagate/routingqagate_test.go @@ -9,11 +9,11 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/routingengine" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/routingrule" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/routingsim" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/routingrule/routingrule_test.go b/workflow/internal/routingrule/routingrule_test.go index 6b6132b3..40a62454 100644 --- a/workflow/internal/routingrule/routingrule_test.go +++ b/workflow/internal/routingrule/routingrule_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/routingruleapi/handler_test.go b/workflow/internal/routingruleapi/handler_test.go index 197fd537..ab017c65 100644 --- a/workflow/internal/routingruleapi/handler_test.go +++ b/workflow/internal/routingruleapi/handler_test.go @@ -10,10 +10,10 @@ import ( "path/filepath" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/routingrule" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/routingsuggestclient" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/routingsim/routingsim_test.go b/workflow/internal/routingsim/routingsim_test.go index 87b19d69..3a93fc6e 100644 --- a/workflow/internal/routingsim/routingsim_test.go +++ b/workflow/internal/routingsim/routingsim_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/routingrule" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" "github.com/jackc/pgx/v5/pgxpool" ) diff --git a/workflow/internal/statemachine/history_role_enforcement_test.go b/workflow/internal/statemachine/history_role_enforcement_test.go index e8aef64e..8a4cfeb7 100644 --- a/workflow/internal/statemachine/history_role_enforcement_test.go +++ b/workflow/internal/statemachine/history_role_enforcement_test.go @@ -14,8 +14,8 @@ import ( "github.com/jackc/pgx/v5/pgconn" "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) // newTestEngineWithPoolAndNoticeCapture wie newTestEngineWithPool, diff --git a/workflow/internal/statemachine/history_test.go b/workflow/internal/statemachine/history_test.go index 38f5992c..88314d63 100644 --- a/workflow/internal/statemachine/history_test.go +++ b/workflow/internal/statemachine/history_test.go @@ -9,8 +9,8 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) // newTestEngineWithPool wie newTestEngine, gibt zusaetzlich den Pool diff --git a/workflow/internal/statemachine/statemachine_test.go b/workflow/internal/statemachine/statemachine_test.go index 439fda42..e933c472 100644 --- a/workflow/internal/statemachine/statemachine_test.go +++ b/workflow/internal/statemachine/statemachine_test.go @@ -8,8 +8,8 @@ import ( "sync" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func approvalDef() ProcessDefinition { diff --git a/workflow/internal/stepretry/stepretry_test.go b/workflow/internal/stepretry/stepretry_test.go index 2edf1191..828043c5 100644 --- a/workflow/internal/stepretry/stepretry_test.go +++ b/workflow/internal/stepretry/stepretry_test.go @@ -11,9 +11,9 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/statemachine" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/task/task_test.go b/workflow/internal/task/task_test.go index 28350ab3..d85237ea 100644 --- a/workflow/internal/task/task_test.go +++ b/workflow/internal/task/task_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/taskapi/taskapi_test.go b/workflow/internal/taskapi/taskapi_test.go index ca2967cd..052296b1 100644 --- a/workflow/internal/taskapi/taskapi_test.go +++ b/workflow/internal/taskapi/taskapi_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/workflow/internal/task" - "gitea.perlbach24.de/scripte/nexarch/workflow/internal/testdb" ) func findModuleRoot(t *testing.T) string { diff --git a/workflow/internal/testdb/testdb.go b/workflow/internal/testdb/testdb.go deleted file mode 100644 index 0cb973b4..00000000 --- a/workflow/internal/testdb/testdb.go +++ /dev/null @@ -1,63 +0,0 @@ -// Package testdb liefert Integrationstests einen Pool auf ein eigenes, -// frisch angelegtes Schema (search_path = Schema, public), damit sich -// parallele Testlaeufe keine Tabellen teilen. Eigenstaendige Kopie des -// DMS-Musters (dms/internal/testdb) — Go-Module teilen keine internal/- -// Pakete. -package testdb - -import ( - "context" - "fmt" - "sync/atomic" - "testing" - "time" - - "github.com/jackc/pgx/v5/pgxpool" -) - -var seq atomic.Int64 - -// Pool legt ein Schema an und liefert einen darauf ausgerichteten Pool; -// beides wird per t.Cleanup wieder entfernt. -func Pool(t testing.TB, dsn string) *pgxpool.Pool { - t.Helper() - pool, _ := PoolWithSchema(t, dsn, nil) - return pool -} - -// PoolWithSchema wie Pool, zusaetzlich mit dem Schemanamen und der -// Moeglichkeit, die Verbindungskonfiguration anzupassen. -func PoolWithSchema(t testing.TB, dsn string, adjust func(*pgxpool.Config)) (*pgxpool.Pool, string) { - t.Helper() - ctx := context.Background() - admin, err := pgxpool.New(ctx, dsn) - if err != nil { - t.Fatalf("testdb: verbindung: %v", err) - } - schema := fmt.Sprintf("workflowtest_%d_%d", time.Now().UnixNano(), seq.Add(1)) - if _, err := admin.Exec(ctx, "CREATE SCHEMA "+schema); err != nil { - admin.Close() - t.Fatalf("testdb: schema anlegen: %v", err) - } - - cfg, err := pgxpool.ParseConfig(dsn) - if err != nil { - admin.Close() - t.Fatalf("testdb: dsn: %v", err) - } - cfg.ConnConfig.RuntimeParams["search_path"] = schema + ",public" - if adjust != nil { - adjust(cfg) - } - pool, err := pgxpool.NewWithConfig(ctx, cfg) - if err != nil { - admin.Close() - t.Fatalf("testdb: pool: %v", err) - } - t.Cleanup(func() { - pool.Close() - _, _ = admin.Exec(context.Background(), "DROP SCHEMA "+schema+" CASCADE") - admin.Close() - }) - return pool, schema -}