Introduce WithErrorReportChannel

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.0.36 Ease for ErrorReporting
+- Add WithErrorReportChannel for testing Services.
+
 ## v0.0.34 Ease testing of PubSub
 - Add function `gcp.pubsubcmp.DiffMessages`.
 

pkg/gcp/test/errorreporting.go

@@ -2,7 +2,6 @@ package test
 
 import (
 	"context"
-	"testing"
 
 	"cloud.google.com/go/errorreporting/apiv1beta1/errorreportingpb"
 )
@@ -12,13 +11,13 @@ var (
 )
 
 type fakeErrorreportingServer struct {
-	tForFailOnEvent *testing.T
-	ReportedEvents  []*errorreportingpb.ReportedErrorEvent
+	c              chan<- *errorreportingpb.ReportedErrorEvent
+	ReportedEvents []*errorreportingpb.ReportedErrorEvent
 }
 
 func (s *fakeErrorreportingServer) ReportErrorEvent(ctx context.Context, req *errorreportingpb.ReportErrorEventRequest) (*errorreportingpb.ReportErrorEventResponse, error) {
-	if s.tForFailOnEvent != nil {
-		s.tForFailOnEvent.Fatal("Unexpected ErrorEvent reported:", req.Event)
+	if s.c != nil {
+		s.c <- req.Event
 	}
 	s.ReportedEvents = append(s.ReportedEvents, req.Event)
 	return &errorreportingpb.ReportErrorEventResponse{}, nil

pkg/gcp/test/test.go

@@ -3,7 +3,6 @@ package test
 import (
 	"context"
 	"net"
-	"testing"
 
 	"cloud.google.com/go/errorreporting"
 	"cloud.google.com/go/errorreporting/apiv1beta1/errorreportingpb"
@@ -30,22 +29,22 @@ type server struct {
 }
 
 type testServicesOption struct {
-	failOnErrorReports bool
+	c chan<- *errorreportingpb.ReportedErrorEvent
 }
 
-func WithFailOnErrorReports() testServicesOption {
+func WithErrorReportChannel(evs chan<- *errorreportingpb.ReportedErrorEvent) testServicesOption {
 	return testServicesOption{
-		failOnErrorReports: true,
+		c: evs,
 	}
 }
 
-func MustMakeTestServices(t *testing.T, ctx context.Context, project, serviceName string, opts ...testServicesOption) *server {
+func MustMakeTestServices(ctx context.Context, project, serviceName string, opts ...testServicesOption) *server {
 
 	var fes *fakeErrorreportingServer
 	for _, opt := range opts {
-		if opt.failOnErrorReports {
+		if opt.c != nil {
 			fes = &fakeErrorreportingServer{
-				tForFailOnEvent: t,
+				c: opt.c,
 			}
 		}
 	}