Use go.awhk.org/core in testsv1.0.2

1 files changed, 20 insertions, 21 deletions

diff --git a/internal/grpc_test/grpc_test.go b/internal/grpc_test/grpc_test.go
index 6c4ffb9..4297080 100644
--- a/internal/grpc_test/grpc_test.go
+++ b/internal/grpc_test/grpc_test.go
@@ -6,14 +6,14 @@ package grpc_test
 
 import (
 	"context"
+	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
+	"go.awhk.org/core"
 	"go.awhk.org/pipeln"
 )
 
@@ -25,9 +25,10 @@ func (impl) Echo(_ context.Context, req *EchoRequest) (*EchoResponse, error) {
 	return &EchoResponse{Message: req.Message}, nil
 }
 
-func Test(t *testing.T) {
-	ln := pipeln.New("test-backend-name")
+func Test(s *testing.T) {
+	t := core.T{T: s}
 
+	ln := pipeln.New("test-backend-name")
 	ret := make(chan error)
 	srv := grpc.NewServer()
 	RegisterEchoServer(srv, &impl{})
@@ -36,45 +37,43 @@ func Test(t *testing.T) {
 	opts := []grpc.DialOption{grpc.WithContextDialer(ln.DialContextAddr), grpc.WithInsecure()}
 	req := &EchoRequest{Message: "Hello World!"}
 
-	t.Run("OK", func(t *testing.T) {
+	t.Run("OK", func(t *core.T) {
 		conn, err := grpc.Dial("test-backend-name", opts...)
-		require.NoError(t, err)
+		t.Must(t.AssertErrorIs(nil, err))
 		defer conn.Close()
 
 		client := NewEchoClient(conn)
 		resp, err := client.Echo(context.Background(), req)
-		require.NoError(t, err)
-		assert.Equal(t, req.Message, resp.Message)
+		t.AssertErrorIs(nil, err)
+		t.AssertEqual(req.Message, resp.Message)
 	})
 
-	t.Run("Address Mismatch", func(t *testing.T) {
+	t.Run("Address Mismatch", func(t *core.T) {
 		conn, err := grpc.Dial("bad-backend-name", opts...)
-		require.NoError(t, err)
+		t.Must(t.AssertErrorIs(nil, err))
 		defer conn.Close()
 
 		client := NewEchoClient(conn)
 		_, err = client.Echo(context.Background(), req)
-		require.Error(t, err)
 		st := status.Convert(err)
-		require.NotNil(t, st)
-		assert.Equal(t, codes.Unavailable, st.Code())
-		assert.Contains(t, st.Message(), "invalid argument")
+		t.Must(t.AssertNotEqual(nil, st))
+		t.AssertEqual(codes.Unavailable, st.Code())
+		t.Assert(strings.Contains(st.Message(), "invalid argument"))
 	})
 
 	srv.GracefulStop()
-	assert.NoError(t, <-ret)
+	t.Must(t.AssertErrorIs(nil, <-ret))
 
-	t.Run("Remote Connection Closed", func(t *testing.T) {
+	t.Run("Remote Connection Closed", func(t *core.T) {
 		conn, err := grpc.Dial("test-backend-name", opts...)
-		require.NoError(t, err)
+		t.Must(t.AssertErrorIs(nil, err))
 		defer conn.Close()
 
 		client := NewEchoClient(conn)
 		_, err = client.Echo(context.Background(), req)
-		require.Error(t, err)
 		st := status.Convert(err)
-		require.NotNil(t, st)
-		assert.Equal(t, codes.Unavailable, st.Code())
-		assert.Contains(t, st.Message(), "connection refused")
+		t.Must(t.AssertNotEqual(nil, st))
+		t.AssertEqual(codes.Unavailable, st.Code())
+		t.Assert(strings.Contains(st.Message(), "connection refused"))
 	})
 }