storage: More refactoring for #69

- retention: Start from pkg main instead of server/smtp
- file: Remove DefaultStore() constructor
- storage: AllMailboxes replaced with VisitMailboxes for #69
- test: Stub VisitMailboxes for #80

pkg/storage/retention_test.go

@@ -1,19 +1,17 @@
-package storage
+package storage_test
 
 import (
 	"fmt"
 	"testing"
 	"time"
+
+	"github.com/jhillyerd/inbucket/pkg/config"
+	"github.com/jhillyerd/inbucket/pkg/storage"
+	"github.com/jhillyerd/inbucket/pkg/test"
 )
 
 func TestDoRetentionScan(t *testing.T) {
-	// Create mock objects
-	mds := &MockDataStore{}
-
-	mb1 := &MockMailbox{}
-	mb2 := &MockMailbox{}
-	mb3 := &MockMailbox{}
-
+	ds := test.NewStore()
 	// Mockup some different aged messages (num is in hours)
 	new1 := mockMessage(0)
 	new2 := mockMessage(1)
@@ -21,36 +19,26 @@ func TestDoRetentionScan(t *testing.T) {
 	old1 := mockMessage(4)
 	old2 := mockMessage(12)
 	old3 := mockMessage(24)
-
-	// First it should ask for all mailboxes
-	mds.On("AllMailboxes").Return([]Mailbox{mb1, mb2, mb3}, nil)
-
-	// Then for all messages on each box
-	mb1.On("GetMessages").Return([]Message{new1, old1, old2}, nil)
-	mb2.On("GetMessages").Return([]Message{old3, new2}, nil)
-	mb3.On("GetMessages").Return([]Message{new3}, nil)
-
+	ds.AddMessage("mb1", new1)
+	ds.AddMessage("mb1", old1)
+	ds.AddMessage("mb1", old2)
+	ds.AddMessage("mb2", old3)
+	ds.AddMessage("mb2", new2)
+	ds.AddMessage("mb3", new3)
 	// Test 4 hour retention
-	rs := &RetentionScanner{
-		ds:              mds,
-		retentionPeriod: 4*time.Hour - time.Minute,
-		retentionSleep:  0,
+	cfg := config.DataStoreConfig{
+		RetentionMinutes: 239,
+		RetentionSleep:   0,
 	}
-	if err := rs.doScan(); err != nil {
+	shutdownChan := make(chan bool)
+	rs := storage.NewRetentionScanner(cfg, ds, shutdownChan)
+	if err := rs.DoScan(); err != nil {
 		t.Error(err)
 	}
-
-	// Check our assertions
-	mds.AssertExpectations(t)
-	mb1.AssertExpectations(t)
-	mb2.AssertExpectations(t)
-	mb3.AssertExpectations(t)
-
 	// Delete should not have been called on new messages
 	new1.AssertNotCalled(t, "Delete")
 	new2.AssertNotCalled(t, "Delete")
 	new3.AssertNotCalled(t, "Delete")
-
 	// Delete should have been called once on old messages
 	old1.AssertNumberOfCalls(t, "Delete", 1)
 	old2.AssertNumberOfCalls(t, "Delete", 1)
@@ -58,8 +46,8 @@ func TestDoRetentionScan(t *testing.T) {
 }
 
 // Make a MockMessage of a specific age
-func mockMessage(ageHours int) *MockMessage {
-	msg := &MockMessage{}
+func mockMessage(ageHours int) *storage.MockMessage {
+	msg := &storage.MockMessage{}
 	msg.On("ID").Return(fmt.Sprintf("MSG[age=%vh]", ageHours))
 	msg.On("Date").Return(time.Now().Add(time.Duration(ageHours*-1) * time.Hour))
 	msg.On("Delete").Return(nil)