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

storage: More refactoring for #69

Browse Source 
- impl Store.AddMessage
- file: Use AddMessage() in tests
- smtp: Switch to AddMessage
- storage: Remove NewMessage, Append, Close methods
This commit is contained in:
James Hillyerd
2018-03-13 22:00:44 -07:00
parent 9be4eec31c
commit 2cc0da3093
10 changed files with 208 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/server/smtp/handler_test.go
View File

@@ -8,7 +8,6 @@ import (
"log"
"net"
"net/mail"
"net/textproto"
"os"
"testing"
@@ -141,18 +140,7 @@ func TestReadyState(t *testing.T) {
// Test commands in MAIL state
func TestMailState(t *testing.T) {
// Setup mock objects
mds := &storage.MockDataStore{}
msg1 := &storage.MockMessage{}
mds.On("NewMessage", "u1").Return(msg1, nil)
msg1.On("ID").Return("")
msg1.On("From").Return(&mail.Address{})
msg1.On("To").Return(make([]*mail.Address, 0))
msg1.On("Date").Return(time.Time{})
msg1.On("Subject").Return("")
msg1.On("Size").Return(0)
msg1.On("Close").Return(nil)
mds := test.NewStore()
server, logbuf, teardown := setupSMTPServer(mds)
defer teardown()
@@ -214,7 +202,7 @@ func TestMailState(t *testing.T) {
{"MAIL FROM:<john@gmail.com>", 250},
{"RCPT TO:<u1@gmail.com>", 250},
{"DATA", 354},
{".", 250},
{".", 451},
}
if err := playSession(t, server, script); err != nil {
t.Error(err)
@@ -253,18 +241,7 @@ func TestMailState(t *testing.T) {
// Test commands in DATA state
func TestDataState(t *testing.T) {
// Setup mock objects
mds := &storage.MockDataStore{}
msg1 := &storage.MockMessage{}
mds.On("NewMessage", "u1").Return(msg1, nil)
msg1.On("ID").Return("")
msg1.On("From").Return(&mail.Address{})
msg1.On("To").Return(make([]*mail.Address, 0))
msg1.On("Date").Return(time.Time{})
msg1.On("Subject").Return("")
msg1.On("Size").Return(0)
msg1.On("Close").Return(nil)
mds := test.NewStore()
server, logbuf, teardown := setupSMTPServer(mds)
defer teardown()