From 8c399c95868ee158222a5a5815ebdb6b17bf081d Mon Sep 17 00:00:00 2001
From: Michael Whittaker <mwhittaker@google.com>
Date: Mon, 21 Aug 2023 09:34:43 -0700
Subject: [PATCH] Addressed Srdjan's feedback.

- Removed redundant component tests.
- Added nolint directive to make linter happy.
- Added TestLogger to avoid logging after a test ends.
---
 internal/testdeployer/components.go          |  2 +-
 internal/testdeployer/remoteweavelet_test.go | 33 ++------------------
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/internal/testdeployer/components.go b/internal/testdeployer/components.go
index 096174faa3..c9036ada5c 100644
--- a/internal/testdeployer/components.go
+++ b/internal/testdeployer/components.go
@@ -41,7 +41,7 @@ type c interface {
 
 type aimpl struct {
 	weaver.Implements[a]
-	lis weaver.Listener
+	lis weaver.Listener //nolint:unused
 	b   weaver.Ref[b]
 }
 
diff --git a/internal/testdeployer/remoteweavelet_test.go b/internal/testdeployer/remoteweavelet_test.go
index 051a9e7ab8..985f55da85 100644
--- a/internal/testdeployer/remoteweavelet_test.go
+++ b/internal/testdeployer/remoteweavelet_test.go
@@ -27,7 +27,6 @@ import (
 	"github.com/ServiceWeaver/weaver/internal/weaver"
 	"github.com/ServiceWeaver/weaver/runtime"
 	"github.com/ServiceWeaver/weaver/runtime/codegen"
-	"github.com/ServiceWeaver/weaver/runtime/colors"
 	"github.com/ServiceWeaver/weaver/runtime/logging"
 	"github.com/ServiceWeaver/weaver/runtime/protos"
 	"github.com/google/uuid"
@@ -55,6 +54,7 @@ type deployer struct {
 	toEnvelopeWriter *os.File               // writer end of pipe to envelope
 	env              *conn.EnvelopeConn     // envelope
 	wlet             *weaver.RemoteWeavelet // weavelet
+	logger           *logging.TestLogger    // logger
 
 	// A unit test can override the following envelope methods to do things
 	// like inject errors or return invalid values.
@@ -117,7 +117,7 @@ func (d *deployer) ExportListener(ctx context.Context, req *protos.ExportListene
 
 // HandleLogEntry implements the EnvelopeHandler interface.
 func (d *deployer) HandleLogEntry(_ context.Context, entry *protos.LogEntry) error {
-	d.t.Log(logging.NewPrettyPrinter(colors.Enabled()).Format(entry))
+	d.logger.Log(entry)
 	return nil
 }
 
@@ -208,6 +208,7 @@ func deployWithInfo(t *testing.T, ctx context.Context, info *protos.EnvelopeInfo
 		toEnvelopeWriter: toEnvelopeWriter,
 		env:              env,
 		wlet:             wlet,
+		logger:           logging.NewTestLogger(t, testing.Verbose()),
 	}
 	t.Cleanup(d.shutdown)
 	return d
@@ -223,8 +224,6 @@ func (d *deployer) shutdown() {
 func testComponents(d *deployer) {
 	d.t.Helper()
 	const want = 42
-
-	// Test component a.
 	x, err := d.wlet.GetIntf(reflection.Type[a]())
 	if err != nil {
 		d.t.Fatal(err)
@@ -236,32 +235,6 @@ func testComponents(d *deployer) {
 	if got != want {
 		d.t.Fatalf("A(%d): got %d, want %d", want, got, want)
 	}
-
-	// Test component b.
-	x, err = d.wlet.GetIntf(reflection.Type[b]())
-	if err != nil {
-		d.t.Fatal(err)
-	}
-	got, err = x.(b).B(d.ctx, want)
-	if err != nil {
-		d.t.Fatal(err)
-	}
-	if got != want {
-		d.t.Fatalf("B(%d): got %d, want %d", want, got, want)
-	}
-
-	// Test component c.
-	x, err = d.wlet.GetIntf(reflection.Type[c]())
-	if err != nil {
-		d.t.Fatal(err)
-	}
-	got, err = x.(c).C(d.ctx, want)
-	if err != nil {
-		d.t.Fatal(err)
-	}
-	if got != want {
-		d.t.Fatalf("C(%d): got %d, want %d", want, got, want)
-	}
 }
 
 func TestInvalidPipes(t *testing.T) {