2 files changed, 48 insertions, 1 deletions
diff --git a/pkg/util/fixWriter.go b/pkg/util/fixWriter.go
index 51637eb..d78b618 100644
--- a/pkg/util/fixWriter.go
+++ b/pkg/util/fixWriter.go
@@ -59,5 +59,5 @@ func (f fixWriter) Write(p []byte) (n int, err error) {
 // Cyrus IMAP really cares about single \r and \n.
 // Implement this fixer to change them into \r\n.
 func FixWriter(w io.Writer) io.Writer {
-	return &fixWriter{w}
+	return fixWriter{w}
 }
diff --git a/pkg/util/fixWriter_test.go b/pkg/util/fixWriter_test.go
new file mode 100644
index 0000000..91961be
--- /dev/null
+++ b/pkg/util/fixWriter_test.go
@@ -0,0 +1,47 @@
+package util
+
+import (
+	"bytes"
+	"io"
+	"testing"
+)
+
+func TestFixWriter_Write(t *testing.T) {
+	tests := []struct {
+		before string
+		after  string
+	}{
+		{"", ""},
+		{"foo", "foo"},
+		{"foo\r", "foo\r\n"},
+		{"foo\n", "foo\r\n"},
+		{"foo\r\n", "foo\r\n"},
+		{"\r", "\r\n"},
+		{"\n", "\r\n"},
+		{"\r\n", "\r\n"},
+		{"foo\rbar", "foo\r\nbar"},
+		{"foo\nbar", "foo\r\nbar"},
+		{"foo\r\nbar", "foo\r\nbar"},
+		{"\r\r", "\r\n\r\n"},
+		{"\n\n", "\r\n\r\n"},
+		{"\r\r\n", "\r\n\r\n"},
+		{"\n\r", "\r\n\r\n"},
+		{"\rbar", "\r\nbar"},
+		{"\nbar", "\r\nbar"},
+		{"\r\nbar", "\r\nbar"},
+	}
+	for _, tt := range tests {
+		t.Run(tt.before, func(t *testing.T) {
+			b := bytes.Buffer{}
+			w := FixWriter(&b)
+			if _, err := io.WriteString(w, tt.before); err != nil {
+				t.Errorf("Error: %v", err)
+				return
+			}
+			res := b.String()
+			if tt.after != res {
+				t.Errorf("Expected: %q, got: %q", tt.after, res)
+			}
+		})
+	}
+}