diff --git a/internal/router/priority_test.go b/internal/router/priority_test.go index fd9ef41..ceab018 100644 --- a/internal/router/priority_test.go +++ b/internal/router/priority_test.go @@ -1,35 +1,21 @@ package router import ( - "database/sql" "testing" "codeberg.org/squidd/parsimony/internal/store" ) -// newsletterEnv is newEnv on a database file whose list has the publishers post policy, set -// directly in the database. -func newsletterEnv(t *testing.T) *env { +// priorityEnv is newEnv with the publishers post policy, for the delivery priority tests. +func priorityEnv(t *testing.T) *env { t.Helper() - path := t.TempDir() + "/p.db" - s, err := store.Open(path) - if err != nil { + e := newEnv(t) + if err := e.s.SetPolicies(e.list.ID, store.PostPublishers, store.JoinOpen, store.ArchivePrivate); err != nil { t.Fatal(err) } - t.Cleanup(func() { s.Close() }) - l, _ := s.CreateList("dev", "example.org", "Dev") - s.AddMember(l.ID, "alice@example.com", "Alice") - s.AddMember(l.ID, "bob@example.com", "Bob") - db, err := sql.Open("sqlite", path) - if err != nil { - t.Fatal(err) - } - defer db.Close() - if _, err := db.Exec(`UPDATE lists SET post_policy=? WHERE id=?`, store.PostPublishers, l.ID); err != nil { - t.Fatal(err) - } - l, _ = s.GetList(l.ID) - return &env{r: New(s), s: s, list: l} + l, _ := e.s.GetList(e.list.ID) + e.list = l + return e } func duePriorities(t *testing.T, s *store.Store) []int { @@ -60,7 +46,7 @@ func allEqual(ps []int, want int, n int) bool { const samplePost = "From: alice@example.com\r\nSubject: hi\r\nMessage-ID:
\r\n\r\nbody\r\n" func TestANewsletterIsDeliveredWithPriorityOne(t *testing.T) { - e := newsletterEnv(t) + e := priorityEnv(t) res, err := e.r.prepare(e.list, []byte(samplePost)) if err != nil { t.Fatal(err) @@ -84,7 +70,7 @@ func TestADiscussionPostIsDeliveredWithPriorityZero(t *testing.T) { } func TestAReleasedNewsletterHasPriorityOne(t *testing.T) { - e := newsletterEnv(t) + e := priorityEnv(t) id, _ := e.s.HoldMessage(e.list.ID, "alice@example.com", []byte(samplePost), "r") if err := e.r.Release(id); err != nil { t.Fatal(err) @@ -106,7 +92,7 @@ func TestAReleasedDiscussionPostHasPriorityZero(t *testing.T) { } func TestConfirmationMailOfANewsletterHasPriorityZero(t *testing.T) { - e := newsletterEnv(t) + e := priorityEnv(t) if handled, err := e.r.Command("carol@x.com", "dev+join@example.org", nil); !handled || err != nil { t.Fatalf("join: %v %v", handled, err) }