From f5f0bd86732c3e65401bceaa9b27741acc10db88 Mon Sep 17 00:00:00 2001 From: patrick Date: Tue, 27 Oct 2026 23:38:01 +0100 Subject: [PATCH] connect: testdb aus common statt interner Kopie Co-Authored-By: Claude Sonnet 5.5 --- .../backupconnector/backupconnector_test.go | 2 +- .../connectorsetupapi_test.go | 2 +- .../contracttest/contracttest_test.go | 2 +- connect/internal/credential/corekek_test.go | 2 +- .../internal/credential/credential_test.go | 2 +- .../internal/credential/kekrotation_test.go | 2 +- connect/internal/datevapi/datevapi_test.go | 2 +- connect/internal/datevexport/store_test.go | 2 +- connect/internal/datevtransfer/store_test.go | 2 +- connect/internal/dms2import/run_test.go | 2 +- .../dms2importapi/dms2importapi_test.go | 2 +- connect/internal/erpexport/store_test.go | 2 +- .../fieldmapping/fieldmapping_test.go | 2 +- .../internal/m365calsync/m365calsync_test.go | 2 +- .../m365connector/m365connector_test.go | 2 +- .../internal/m365docsync/m365docsync_test.go | 2 +- .../masterdatasync/masterdatasync_test.go | 2 +- connect/internal/statusapi/statusapi_test.go | 2 +- connect/internal/syncjob/syncjob_test.go | 2 +- connect/internal/testdb/testdb.go | 62 ------------------- connect/internal/webhooksub/common_test.go | 2 +- 21 files changed, 20 insertions(+), 82 deletions(-) delete mode 100644 connect/internal/testdb/testdb.go diff --git a/connect/internal/backupconnector/backupconnector_test.go b/connect/internal/backupconnector/backupconnector_test.go index 363c05de..a93cf5a4 100644 --- a/connect/internal/backupconnector/backupconnector_test.go +++ b/connect/internal/backupconnector/backupconnector_test.go @@ -15,11 +15,11 @@ import ( "testing" "time" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/crypto" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/connect/internal/registry" "gitea.perlbach24.de/scripte/nexarch/connect/internal/syncjob" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) type fakeKEK struct{ key []byte } diff --git a/connect/internal/connectorsetupapi/connectorsetupapi_test.go b/connect/internal/connectorsetupapi/connectorsetupapi_test.go index b546a163..bc9e3bac 100644 --- a/connect/internal/connectorsetupapi/connectorsetupapi_test.go +++ b/connect/internal/connectorsetupapi/connectorsetupapi_test.go @@ -14,10 +14,10 @@ import ( connectcrypto "gitea.perlbach24.de/scripte/nexarch/connect/internal/crypto" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/credential" "gitea.perlbach24.de/scripte/nexarch/connect/internal/fieldmapping" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) type fakeKEK struct{ kek []byte } diff --git a/connect/internal/contracttest/contracttest_test.go b/connect/internal/contracttest/contracttest_test.go index 0d83c331..b516fa9f 100644 --- a/connect/internal/contracttest/contracttest_test.go +++ b/connect/internal/contracttest/contracttest_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" connectcrypto "gitea.perlbach24.de/scripte/nexarch/connect/internal/crypto" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/webhookclient" "gitea.perlbach24.de/scripte/nexarch/connect/internal/webhooksub" ) diff --git a/connect/internal/credential/corekek_test.go b/connect/internal/credential/corekek_test.go index 6de67608..f0222c6b 100644 --- a/connect/internal/credential/corekek_test.go +++ b/connect/internal/credential/corekek_test.go @@ -13,10 +13,10 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/credential" connectcrypto "gitea.perlbach24.de/scripte/nexarch/connect/internal/crypto" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) // coreKEKStub stands in for Core API-10's TenantKEKHandler, always serving diff --git a/connect/internal/credential/credential_test.go b/connect/internal/credential/credential_test.go index adb3e0af..f68bb992 100644 --- a/connect/internal/credential/credential_test.go +++ b/connect/internal/credential/credential_test.go @@ -14,11 +14,11 @@ import ( "github.com/jackc/pgx/v5/pgxpool" "gitea.perlbach24.de/scripte/nexarch/common/auditclient" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/audittrail" "gitea.perlbach24.de/scripte/nexarch/connect/internal/credential" connectcrypto "gitea.perlbach24.de/scripte/nexarch/connect/internal/crypto" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) type fakeKEK struct{ kek []byte } diff --git a/connect/internal/credential/kekrotation_test.go b/connect/internal/credential/kekrotation_test.go index 64233559..429f371c 100644 --- a/connect/internal/credential/kekrotation_test.go +++ b/connect/internal/credential/kekrotation_test.go @@ -11,10 +11,10 @@ import ( "sync/atomic" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/credential" connectcrypto "gitea.perlbach24.de/scripte/nexarch/connect/internal/crypto" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) // QA-04 Pruefung 3: ein Credential, das VOR einer Core-Tenant-KEK-Rotation diff --git a/connect/internal/datevapi/datevapi_test.go b/connect/internal/datevapi/datevapi_test.go index 79ce8c37..597625a9 100644 --- a/connect/internal/datevapi/datevapi_test.go +++ b/connect/internal/datevapi/datevapi_test.go @@ -12,11 +12,11 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/archiveclient" "gitea.perlbach24.de/scripte/nexarch/connect/internal/datevexport" "gitea.perlbach24.de/scripte/nexarch/connect/internal/datevtransfer" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) func fakeArchiveRegister(t *testing.T) *httptest.Server { diff --git a/connect/internal/datevexport/store_test.go b/connect/internal/datevexport/store_test.go index 6bfc0e44..da6751ab 100644 --- a/connect/internal/datevexport/store_test.go +++ b/connect/internal/datevexport/store_test.go @@ -10,9 +10,9 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/archiveclient" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) // fakeArchiveRegister replicates archive/internal/moduleadapter's real diff --git a/connect/internal/datevtransfer/store_test.go b/connect/internal/datevtransfer/store_test.go index b0f57acc..745242fc 100644 --- a/connect/internal/datevtransfer/store_test.go +++ b/connect/internal/datevtransfer/store_test.go @@ -8,8 +8,8 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) func openTestPool(t *testing.T) *pgxpool.Pool { diff --git a/connect/internal/dms2import/run_test.go b/connect/internal/dms2import/run_test.go index a8990e17..ae334ad1 100644 --- a/connect/internal/dms2import/run_test.go +++ b/connect/internal/dms2import/run_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/fieldmapping" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) func newRunStore(t *testing.T) *Store { diff --git a/connect/internal/dms2importapi/dms2importapi_test.go b/connect/internal/dms2importapi/dms2importapi_test.go index ee748eae..c2895537 100644 --- a/connect/internal/dms2importapi/dms2importapi_test.go +++ b/connect/internal/dms2importapi/dms2importapi_test.go @@ -13,10 +13,10 @@ import ( "path/filepath" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/dms2import" "gitea.perlbach24.de/scripte/nexarch/connect/internal/fieldmapping" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) const fixtureManifest = `[ diff --git a/connect/internal/erpexport/store_test.go b/connect/internal/erpexport/store_test.go index 84a49892..cd9b59a2 100644 --- a/connect/internal/erpexport/store_test.go +++ b/connect/internal/erpexport/store_test.go @@ -12,10 +12,10 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/credential" "gitea.perlbach24.de/scripte/nexarch/connect/internal/erpconnector" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) func openTestPool(t *testing.T) *pgxpool.Pool { diff --git a/connect/internal/fieldmapping/fieldmapping_test.go b/connect/internal/fieldmapping/fieldmapping_test.go index 371bef31..2ca57430 100644 --- a/connect/internal/fieldmapping/fieldmapping_test.go +++ b/connect/internal/fieldmapping/fieldmapping_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) func newStore(t *testing.T) *Store { diff --git a/connect/internal/m365calsync/m365calsync_test.go b/connect/internal/m365calsync/m365calsync_test.go index d0e71edc..d211418e 100644 --- a/connect/internal/m365calsync/m365calsync_test.go +++ b/connect/internal/m365calsync/m365calsync_test.go @@ -11,8 +11,8 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) func newStore(t *testing.T) (*Store, *pgxpool.Pool) { diff --git a/connect/internal/m365connector/m365connector_test.go b/connect/internal/m365connector/m365connector_test.go index c3a85439..a8f56b5c 100644 --- a/connect/internal/m365connector/m365connector_test.go +++ b/connect/internal/m365connector/m365connector_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/credential" connectcrypto "gitea.perlbach24.de/scripte/nexarch/connect/internal/crypto" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/connect/internal/testcorpus" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) type fakeKEK struct{ kek []byte } diff --git a/connect/internal/m365docsync/m365docsync_test.go b/connect/internal/m365docsync/m365docsync_test.go index d0627639..b0c35dc9 100644 --- a/connect/internal/m365docsync/m365docsync_test.go +++ b/connect/internal/m365docsync/m365docsync_test.go @@ -12,10 +12,10 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/credential" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/connect/internal/syncjob" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) func newStore(t *testing.T) (*Store, *pgxpool.Pool) { diff --git a/connect/internal/masterdatasync/masterdatasync_test.go b/connect/internal/masterdatasync/masterdatasync_test.go index 11da04e7..04eea7a9 100644 --- a/connect/internal/masterdatasync/masterdatasync_test.go +++ b/connect/internal/masterdatasync/masterdatasync_test.go @@ -13,9 +13,9 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/connect/internal/syncjob" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) func newStore(t *testing.T) (*Store, *pgxpool.Pool) { diff --git a/connect/internal/statusapi/statusapi_test.go b/connect/internal/statusapi/statusapi_test.go index fb04d6a1..316f639d 100644 --- a/connect/internal/statusapi/statusapi_test.go +++ b/connect/internal/statusapi/statusapi_test.go @@ -10,9 +10,9 @@ import ( "path/filepath" "testing" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" "gitea.perlbach24.de/scripte/nexarch/connect/internal/syncjob" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) func newTestServer(t *testing.T) *Server { diff --git a/connect/internal/syncjob/syncjob_test.go b/connect/internal/syncjob/syncjob_test.go index 78d80186..5f373c57 100644 --- a/connect/internal/syncjob/syncjob_test.go +++ b/connect/internal/syncjob/syncjob_test.go @@ -14,9 +14,9 @@ import ( "github.com/jackc/pgx/v5/pgxpool" "gitea.perlbach24.de/scripte/nexarch/common/auditclient" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/audittrail" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" ) func newStore(t *testing.T) *Store { diff --git a/connect/internal/testdb/testdb.go b/connect/internal/testdb/testdb.go deleted file mode 100644 index c5db1b1a..00000000 --- a/connect/internal/testdb/testdb.go +++ /dev/null @@ -1,62 +0,0 @@ -// Package testdb liefert Integrationstests einen Pool auf ein eigenes, -// frisch angelegtes Schema (search_path = Schema, public). Tabellen, die ein -// Test per CREATE TABLE anlegt, entstehen damit nur in diesem Schema; Pakete, -// Laeufe und parallele Checkouts teilen sich keine Tabellen mehr. -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("connecttest_%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 -} diff --git a/connect/internal/webhooksub/common_test.go b/connect/internal/webhooksub/common_test.go index ebac0bcd..7a1d42d6 100644 --- a/connect/internal/webhooksub/common_test.go +++ b/connect/internal/webhooksub/common_test.go @@ -14,9 +14,9 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "gitea.perlbach24.de/scripte/nexarch/common/testdb" connectcrypto "gitea.perlbach24.de/scripte/nexarch/connect/internal/crypto" "gitea.perlbach24.de/scripte/nexarch/connect/internal/migrate" - "gitea.perlbach24.de/scripte/nexarch/connect/internal/testdb" "gitea.perlbach24.de/scripte/nexarch/connect/internal/webhookclient" "gitea.perlbach24.de/scripte/nexarch/connect/internal/webhooksub" ) -- 2.47.3