commit 10f7c0727723eb92b6869c675936f82e80c9f8b1
author Jonathan Amsterdam <jba@google.com> Thu Jun 03 09:46:41 2021 -0400
committer Jonathan Amsterdam <jba@google.com> Fri Jun 04 17:53:38 2021 +0000
tree 902ca6f542bd996db59f30b367c98b260f67136c
parent ab0bbb655bdc69e3d16dd1a182445077704f9672

event/logging: use eventtest options

Use eventtest in the logging tests.

Change-Id: Ia65d91a19ade6acfd88b16541a9482083c85f869
Reviewed-on: https://go-review.googlesource.com/c/exp/+/324635
Trust: Jonathan Amsterdam <jba@google.com>
Run-TryBot: Jonathan Amsterdam <jba@google.com>
Reviewed-by: Ian Cottrell <iancottrell@google.com>

event/adapter/eventtest/eventtest.go

diff --git a/event/adapter/eventtest/eventtest.go b/event/adapter/eventtest/eventtest.go
index 616ffdc..c3f9137 100644
--- a/event/adapter/eventtest/eventtest.go
+++ b/event/adapter/eventtest/eventtest.go
@@ -57,8 +57,13 @@
 	h.printer.Event(os.Stdout, ev)
 }
 
+var InitialTime = func() time.Time {
+	t, _ := time.Parse(time.RFC3339Nano, "2020-03-05T14:27:48Z")
+	return t
+}()
+
 func ExporterOptions() *event.ExporterOptions {
-	nextTime, _ := time.Parse(time.RFC3339Nano, "2020-03-05T14:27:48Z")
+	nextTime := InitialTime
 	return &event.ExporterOptions{
 		Now: func() time.Time {
 			thisTime := nextTime

event/logging/egokit/gokit_test.go

diff --git a/event/logging/egokit/gokit_test.go b/event/logging/egokit/gokit_test.go
index cb82926..228240c 100644
--- a/event/logging/egokit/gokit_test.go
+++ b/event/logging/egokit/gokit_test.go
@@ -12,6 +12,7 @@
 
 	"github.com/google/go-cmp/cmp"
 	"golang.org/x/exp/event"
+	"golang.org/x/exp/event/adapter/eventtest"
 	"golang.org/x/exp/event/keys"
 	"golang.org/x/exp/event/logging/egokit"
 	"golang.org/x/exp/event/logging/internal"
@@ -23,7 +24,7 @@
 	ctx := event.WithExporter(context.Background(), e)
 	log.Log(ctx, "msg", "mess", "level", 1, "name", "n/m", "traceID", 17, "resource", "R")
 	want := &event.Event{
-		At: internal.TestAt,
+		At: eventtest.InitialTime,
 		Labels: []event.Label{
 			keys.Value("level").Of(1),
 			keys.Value("name").Of("n/m"),

event/logging/elogr/logr_test.go

diff --git a/event/logging/elogr/logr_test.go b/event/logging/elogr/logr_test.go
index 36e3693..61936a9 100644
--- a/event/logging/elogr/logr_test.go
+++ b/event/logging/elogr/logr_test.go
@@ -12,6 +12,7 @@
 
 	"github.com/google/go-cmp/cmp"
 	"golang.org/x/exp/event"
+	"golang.org/x/exp/event/adapter/eventtest"
 	"golang.org/x/exp/event/keys"
 	"golang.org/x/exp/event/logging/elogr"
 	"golang.org/x/exp/event/logging/internal"
@@ -23,7 +24,7 @@
 	log = log.WithName("m")
 	log.Info("mess", "traceID", 17, "resource", "R")
 	want := &event.Event{
-		At: internal.TestAt,
+		At: eventtest.InitialTime,
 		Labels: []event.Label{
 			internal.LevelKey.Of(3),
 			internal.NameKey.Of("n/m"),

event/logging/internal/internal.go

diff --git a/event/logging/internal/internal.go b/event/logging/internal/internal.go
index 3570d4a..749b9df 100644
--- a/event/logging/internal/internal.go
+++ b/event/logging/internal/internal.go
@@ -2,9 +2,9 @@
 
 import (
 	"context"
-	"time"
 
 	"golang.org/x/exp/event"
+	"golang.org/x/exp/event/adapter/eventtest"
 	"golang.org/x/exp/event/keys"
 )
 
@@ -26,9 +26,7 @@
 	copy(h.Got.Labels, ev.Labels)
 }
 
-var TestAt = time.Now()
-
 func NewTestExporter() (*event.Exporter, *TestHandler) {
 	te := &TestHandler{}
-	return event.NewExporter(te, &event.ExporterOptions{Now: func() time.Time { return TestAt }}), te
+	return event.NewExporter(te, eventtest.ExporterOptions()), te
 }