Add unit test

rolandshoemaker · rolandshoemaker · commit aacafb7ff58c · 2015-12-29T20:50:26.000Z
diff --git a/cmd/expiration-mailer/main_test.go b/cmd/expiration-mailer/main_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/letsencrypt/boulder/Godeps/_workspace/src/github.com/jmhodges/clock"
 	"github.com/letsencrypt/boulder/Godeps/_workspace/src/github.com/letsencrypt/go-jose"
 	"github.com/letsencrypt/boulder/Godeps/_workspace/src/gopkg.in/gorp.v1"
+
 	"github.com/letsencrypt/boulder/core"
 	blog "github.com/letsencrypt/boulder/log"
 	"github.com/letsencrypt/boulder/mocks"
@@ -42,21 +43,6 @@ func intFromB64(b64 string) int {
 	return int(bigIntFromB64(b64).Int64())
 }
 
-type mockMail struct {
-	Messages []string
-}
-
-func (m *mockMail) Clear() {
-	m.Messages = []string{}
-}
-
-func (m *mockMail) SendMail(to []string, subject, msg string) (err error) {
-	for range to {
-		m.Messages = append(m.Messages, msg)
-	}
-	return
-}
-
 type fakeRegStore struct {
 	RegByID map[int64]core.Registration
 }
@@ -104,7 +90,7 @@ var (
 
 func TestSendNags(t *testing.T) {
 	stats, _ := statsd.NewNoopClient(nil)
-	mc := mockMail{}
+	mc := mocks.Mailer{}
 	rs := newFakeRegStore()
 	fc := newFakeClock(t)
 
@@ -461,7 +447,7 @@ func TestDontFindRevokedCert(t *testing.T) {
 type testCtx struct {
 	dbMap   *gorp.DbMap
 	ssa     core.StorageAdder
-	mc      *mockMail
+	mc      *mocks.Mailer
 	fc      clock.FakeClock
 	m       *mailer
 	cleanUp func()
@@ -482,7 +468,7 @@ func setup(t *testing.T, nagTimes []time.Duration) *testCtx {
 	cleanUp := test.ResetSATestDatabase(t)
 
 	stats, _ := statsd.NewNoopClient(nil)
-	mc := &mockMail{}
+	mc := &mocks.Mailer{}
 
 	offsetNags := make([]time.Duration, len(nagTimes))
 	for i, t := range nagTimes {
diff --git a/mail/mailer.go b/mail/mailer.go
@@ -11,7 +11,8 @@ import (
 	"net"
 	"net/smtp"
 	"strings"
-	"time"
+
+	"github.com/letsencrypt/boulder/Godeps/_workspace/src/github.com/jmhodges/clock"
 )
 
 // Mailer provides the interface for a mailer
@@ -25,6 +26,7 @@ type MailerImpl struct {
 	Port   string
 	Auth   smtp.Auth
 	From   string
+	clk    clock.Clock
 }
 
 // New constructs a Mailer to represent an account on a particular mail
@@ -36,11 +38,13 @@ func New(server, port, username, password string) MailerImpl {
 		Port:   port,
 		Auth:   auth,
 		From:   username,
+		clk:    clock.Default(),
 	}
 }
 
 func (m *MailerImpl) generateMessage(to []string, subject, body string) []byte {
-	now := time.Now().UTC()
+	now := m.clk.Now().UTC()
+	rand.Seed(int64(now.Nanosecond()))
 	headers := []string{
 		fmt.Sprintf("To: %s", strings.Join(to, ", ")),
 		fmt.Sprintf("From: %s", m.From),
diff --git a/mail/mailer_test.go b/mail/mailer_test.go
@@ -4,3 +4,28 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 package mail
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/letsencrypt/boulder/Godeps/_workspace/src/github.com/jmhodges/clock"
+
+	"github.com/letsencrypt/boulder/test"
+)
+
+func TestGenerateMessage(t *testing.T) {
+	fc := clock.NewFake()
+	m := MailerImpl{From: "send@email.com", clk: fc}
+	message := string(m.generateMessage([]string{"recv@email.com"}, "test subject", "this is the body"))
+	fields := strings.Split(message, "\r\n")
+	test.AssertEquals(t, len(fields), 8)
+	test.AssertEquals(t, fields[0], "To: recv@email.com")
+	test.AssertEquals(t, fields[1], "From: send@email.com")
+	test.AssertEquals(t, fields[2], "Subject: test subject")
+	test.AssertEquals(t, fields[3], "Date: Thu Jan 1 1970 00:00:00 +0000")
+	test.AssertEquals(t, fields[4], "Message-Id: <19700101T000000.8717895732742165505.send@email.com>")
+	test.AssertEquals(t, fields[5], "")
+	test.AssertEquals(t, fields[6], "this is the body")
+	test.AssertEquals(t, fields[7], "")
+}
diff --git a/mocks/mocks.go b/mocks/mocks.go
@@ -422,3 +422,21 @@ func (s *Statter) Inc(metric string, value int64, rate float32) error {
 func NewStatter() Statter {
 	return Statter{statsd.NoopClient{}, map[string]int64{}}
 }
+
+// Mailer is a mock
+type Mailer struct {
+	Messages []string
+}
+
+// Clear removes any previously recorded messages
+func (m *Mailer) Clear() {
+	m.Messages = []string{}
+}
+
+// SendMail is a mock
+func (m *Mailer) SendMail(to []string, subject, msg string) (err error) {
+	for range to {
+		m.Messages = append(m.Messages, msg)
+	}
+	return
+}
