Mirrors/go-inbucket
1
0
Fork 0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-17 09:37:02 +00:00
Code Issues Releases Wiki Activity

Replace message.Metadata usage with event.MessageMetadata (#333)

Browse Source 
Signed-off-by: James Hillyerd <james@hillyerd.com>
This commit is contained in:
James Hillyerd
2023-02-13 13:52:28 -08:00
committed by GitHub
parent d11ae3710c
commit 5adef42df7
8 changed files with 39 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/test/manager.go
View File

@@ -4,6 +4,7 @@ import (
"errors"
"github.com/inbucket/inbucket/pkg/config"
"github.com/inbucket/inbucket/pkg/extension/event"
"github.com/inbucket/inbucket/pkg/message"
"github.com/inbucket/inbucket/pkg/policy"
"github.com/inbucket/inbucket/pkg/storage"
@@ -42,14 +43,14 @@ func (m *ManagerStub) GetMessage(mailbox, id string) (*message.Message, error) {
}
// GetMetadata gets all the metadata for the specified mailbox.
func (m *ManagerStub) GetMetadata(mailbox string) ([]*message.Metadata, error) {
func (m *ManagerStub) GetMetadata(mailbox string) ([]*event.MessageMetadata, error) {
if mailbox == "messageserr" {
return nil, errors.New("internal error")
}
messages := m.mailboxes[mailbox]
metas := make([]*message.Metadata, len(messages))
metas := make([]*event.MessageMetadata, len(messages))
for i, msg := range messages {
metas[i] = &msg.Metadata
metas[i] = &msg.MessageMetadata
}
return metas, nil
}
@@ -69,7 +70,7 @@ func (m *ManagerStub) MarkSeen(mailbox, id string) error {
}
for _, msg := range m.mailboxes[mailbox] {
if msg.ID == id {
msg.Metadata.Seen = true
msg.MessageMetadata.Seen = true
return nil
}
}

7
pkg/test/storage_suite.go
View File

@@ -10,6 +10,7 @@ import (
"time"
"github.com/inbucket/inbucket/pkg/config"
"github.com/inbucket/inbucket/pkg/extension/event"
"github.com/inbucket/inbucket/pkg/message"
"github.com/inbucket/inbucket/pkg/storage"
)
@@ -61,7 +62,7 @@ func testMetadata(t *testing.T, store storage.Store) {
subject := "fantastic test subject line"
content := "doesn't matter"
delivery := &message.Delivery{
Meta: message.Metadata{
Meta: event.MessageMetadata{
// ID and Size will be determined by the Store.
Mailbox: mailbox,
From: from,
@@ -130,7 +131,7 @@ func testContent(t *testing.T, store storage.Store) {
date := time.Now()
subject := "fantastic test subject line"
delivery := &message.Delivery{
Meta: message.Metadata{
Meta: event.MessageMetadata{
// ID and Size will be determined by the Store.
Mailbox: mailbox,
From: from,
@@ -408,7 +409,7 @@ func DeliverToStore(
date time.Time,
) (string, int64) {
t.Helper()
meta := message.Metadata{
meta := event.MessageMetadata{
Mailbox: mailbox,
To: []*mail.Address{{Name: "Some Body", Address: "somebody@host"}},
From: &mail.Address{Name: "Some B. Else", Address: "somebodyelse@host"},