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

storage: Message refactoring for #69

Browse Source 
- Message interface renamed to StoreMessage
- Message.Delete becomes Store.RemoveMessage
- Added deleted message tracking to Store stub for #80
This commit is contained in:
James Hillyerd
2018-03-11 15:01:40 -07:00
parent 12ad0cb3f0
commit 487e491d6f
11 changed files with 190 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/storage/file/fstore_test.go
View File

@@ -63,9 +63,7 @@ func TestFSDirStructure(t *testing.T) {
assert.True(t, isFile(expect), "Expected %q to be a file", expect)
// Delete message
msg, err := ds.GetMessage(mbName, id1)
assert.Nil(t, err)
err = msg.Delete()
err := ds.RemoveMessage(mbName, id1)
assert.Nil(t, err)
// Message should be removed
@@ -75,9 +73,7 @@ func TestFSDirStructure(t *testing.T) {
assert.True(t, isFile(expect), "Expected %q to be a file", expect)
// Delete message
msg, err = ds.GetMessage(mbName, id2)
assert.Nil(t, err)
err = msg.Delete()
err = ds.RemoveMessage(mbName, id2)
assert.Nil(t, err)
// Message should be removed
@@ -114,7 +110,7 @@ func TestFSVisitMailboxes(t *testing.T) {
}
seen := 0
err := ds.VisitMailboxes(func(messages []storage.Message) bool {
err := ds.VisitMailboxes(func(messages []storage.StoreMessage) bool {
seen++
count := len(messages)
if count != 2 {
@@ -196,8 +192,14 @@ func TestFSDelete(t *testing.T) {
len(subjects), len(msgs))
// Delete a couple messages
_ = msgs[1].Delete()
_ = msgs[3].Delete()
err = ds.RemoveMessage(mbName, msgs[1].ID())
if err != nil {
t.Fatal(err)
}
err = ds.RemoveMessage(mbName, msgs[3].ID())
if err != nil {
t.Fatal(err)
}
// Confirm deletion
msgs, err = ds.GetMessages(mbName)