From 6fc1255ff693becc6a3e35e20c31e1c6612767b2 Mon Sep 17 00:00:00 2001
From: Blake Rouse <blake.rouse@elastic.co>
Date: Tue, 14 Jan 2020 07:14:35 -0500
Subject: [PATCH 1/3] Add test for publisher queue encode and decode.

---
 libbeat/publisher/queue/spool/codec_test.go | 73 +++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 libbeat/publisher/queue/spool/codec_test.go

diff --git a/libbeat/publisher/queue/spool/codec_test.go b/libbeat/publisher/queue/spool/codec_test.go
new file mode 100644
index 000000000000..594758d3c423
--- /dev/null
+++ b/libbeat/publisher/queue/spool/codec_test.go
@@ -0,0 +1,73 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package spool
+
+import (
+	"testing"
+	"time"
+
+	"github.com/elastic/beats/libbeat/beat"
+	"github.com/elastic/beats/libbeat/common"
+	"github.com/elastic/beats/libbeat/publisher"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestEncodeDecode(t *testing.T) {
+	tests := map[string]codecID{
+		"jsob":   codecJSON,
+		"ubjson": codecUBJSON,
+		"cborl":  codecCBORL,
+	}
+
+	event := publisher.Event{
+		Content: beat.Event{
+			Timestamp: time.Now().Round(0),
+			Fields: common.MapStr{
+				"time":       time.Now().UTC().Round(time.Millisecond),
+				"commontime": common.Time(time.Now().UTC().Round(time.Millisecond)),
+			},
+		},
+	}
+	expected := publisher.Event{
+		Content: beat.Event{
+			Timestamp: event.Content.Timestamp,
+			Fields: common.MapStr{
+				"time":       event.Content.Fields["time"].(time.Time).Format(time.RFC3339Nano),
+				"commontime": event.Content.Fields["commontime"].(common.Time).String(),
+			},
+		},
+	}
+
+	for name, codec := range tests {
+		t.Run(name, func(t *testing.T) {
+			encoder, err := newEncoder(codec)
+			assert.NoError(t, err)
+
+			encoded, err := encoder.encode(&event)
+			assert.NoError(t, err)
+
+			decoder := newDecoder()
+			decoder.buf = encoded
+
+			observed, err := decoder.Decode()
+			assert.NoError(t, err)
+
+			assert.Equal(t, expected, observed)
+		})
+	}
+}

From 43db86b1b30d740f28f08baaef046917cfe66499 Mon Sep 17 00:00:00 2001
From: Blake Rouse <blake.rouse@elastic.co>
Date: Tue, 14 Jan 2020 07:47:11 -0500
Subject: [PATCH 2/3] Run mage fmt.

---
 libbeat/publisher/queue/spool/codec_test.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libbeat/publisher/queue/spool/codec_test.go b/libbeat/publisher/queue/spool/codec_test.go
index 594758d3c423..20f2bda09c39 100644
--- a/libbeat/publisher/queue/spool/codec_test.go
+++ b/libbeat/publisher/queue/spool/codec_test.go
@@ -21,10 +21,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/elastic/beats/libbeat/beat"
 	"github.com/elastic/beats/libbeat/common"
 	"github.com/elastic/beats/libbeat/publisher"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestEncodeDecode(t *testing.T) {

From ea1f2fe1d131f7ee399d495d06a296620f42f9cd Mon Sep 17 00:00:00 2001
From: Blake Rouse <blake.rouse@elastic.co>
Date: Tue, 14 Jan 2020 15:43:40 -0500
Subject: [PATCH 3/3] Fixes from code review.

---
 libbeat/publisher/queue/spool/codec_test.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libbeat/publisher/queue/spool/codec_test.go b/libbeat/publisher/queue/spool/codec_test.go
index 20f2bda09c39..3588d3e2f21c 100644
--- a/libbeat/publisher/queue/spool/codec_test.go
+++ b/libbeat/publisher/queue/spool/codec_test.go
@@ -30,17 +30,19 @@ import (
 
 func TestEncodeDecode(t *testing.T) {
 	tests := map[string]codecID{
-		"jsob":   codecJSON,
+		"json":   codecJSON,
 		"ubjson": codecUBJSON,
 		"cborl":  codecCBORL,
 	}
 
+	fieldTimeStr := "2020-01-14T20:33:23.779Z"
+	fieldTime, _ := time.Parse(time.RFC3339Nano, fieldTimeStr)
 	event := publisher.Event{
 		Content: beat.Event{
 			Timestamp: time.Now().Round(0),
 			Fields: common.MapStr{
-				"time":       time.Now().UTC().Round(time.Millisecond),
-				"commontime": common.Time(time.Now().UTC().Round(time.Millisecond)),
+				"time":       fieldTime,
+				"commontime": common.Time(fieldTime),
 			},
 		},
 	}
@@ -48,8 +50,8 @@ func TestEncodeDecode(t *testing.T) {
 		Content: beat.Event{
 			Timestamp: event.Content.Timestamp,
 			Fields: common.MapStr{
-				"time":       event.Content.Fields["time"].(time.Time).Format(time.RFC3339Nano),
-				"commontime": event.Content.Fields["commontime"].(common.Time).String(),
+				"time":       fieldTime.Format(time.RFC3339Nano),
+				"commontime": common.Time(fieldTime).String(),
 			},
 		},
 	}