add more tests

example/rpc/proxy/proxy.go

@@ -42,7 +42,7 @@ func main() {
 		ListenOn: *listen,
 	}, func(grpcServer *grpc.Server) {
 		unary.RegisterGreeterServer(grpcServer, &GreetServer{
-			RpcProxy: rpcx.NewRpcProxy(*server),
+			RpcProxy: rpcx.NewProxy(*server),
 		})
 	})
 	proxy.Start()

go.mod

@@ -3,6 +3,7 @@ module github.com/tal-tech/go-zero
 go 1.14
 
 require (
+	9fans.net/go v0.0.2 // indirect
 	github.com/DATA-DOG/go-sqlmock v1.4.1
 	github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6 // indirect
 	github.com/alicebob/miniredis v2.5.0+incompatible

go.sum

@@ -1,3 +1,5 @@
+9fans.net/go v0.0.2 h1:RYM6lWITV8oADrwLfdzxmt8ucfW6UtP9v1jg4qAbqts=
+9fans.net/go v0.0.2/go.mod h1:lfPdxjq9v8pVQXUMBCx5EO5oLXWQFlKRQgs1kEkjoIM=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

rpcx/client_test.go

@@ -0,0 +1,101 @@
+package rpcx
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"net"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/rpcx/mock"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"google.golang.org/grpc/test/bufconn"
+)
+
+func init() {
+	logx.Disable()
+}
+
+func dialer() func(context.Context, string) (net.Conn, error) {
+	listener := bufconn.Listen(1024 * 1024)
+	server := grpc.NewServer()
+	mock.RegisterDepositServiceServer(server, &mock.DepositServer{})
+
+	go func() {
+		if err := server.Serve(listener); err != nil {
+			log.Fatal(err)
+		}
+	}()
+
+	return func(context.Context, string) (net.Conn, error) {
+		return listener.Dial()
+	}
+}
+
+func TestDepositServer_Deposit(t *testing.T) {
+	tests := []struct {
+		name    string
+		amount  float32
+		res     *mock.DepositResponse
+		errCode codes.Code
+		errMsg  string
+	}{
+		{
+			"invalid request with negative amount",
+			-1.11,
+			nil,
+			codes.InvalidArgument,
+			fmt.Sprintf("cannot deposit %v", -1.11),
+		},
+		{
+			"valid request with non negative amount",
+			0.00,
+			&mock.DepositResponse{Ok: true},
+			codes.OK,
+			"",
+		},
+	}
+
+	directClient := MustNewClient(RpcClientConf{
+		Endpoints: []string{"foo"},
+		App:       "foo",
+		Token:     "bar",
+		Timeout:   1000,
+	}, WithDialOption(grpc.WithInsecure()), WithDialOption(grpc.WithContextDialer(dialer())))
+	targetClient, err := NewClientWithTarget("foo", WithDialOption(grpc.WithInsecure()),
+		WithDialOption(grpc.WithContextDialer(dialer())))
+	assert.Nil(t, err)
+	clients := []Client{
+		directClient,
+		targetClient,
+	}
+	for _, tt := range tests {
+		for _, client := range clients {
+			t.Run(tt.name, func(t *testing.T) {
+				cli := mock.NewDepositServiceClient(client.Conn())
+				request := &mock.DepositRequest{Amount: tt.amount}
+				response, err := cli.Deposit(context.Background(), request)
+				if response != nil {
+					assert.True(t, len(response.String()) > 0)
+					if response.GetOk() != tt.res.GetOk() {
+						t.Error("response: expected", tt.res.GetOk(), "received", response.GetOk())
+					}
+				}
+				if err != nil {
+					if e, ok := status.FromError(err); ok {
+						if e.Code() != tt.errCode {
+							t.Error("error code: expected", codes.InvalidArgument, "received", e.Code())
+						}
+						if e.Message() != tt.errMsg {
+							t.Error("error message: expected", tt.errMsg, "received", e.Message())
+						}
+					}
+				}
+			})
+		}
+	}
+}

rpcx/mock/deposit.proto

@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+package mock;
+
+message DepositRequest {
+  float amount = 1;
+}
+
+message DepositResponse {
+  bool ok = 1;
+}
+
+service DepositService {
+  rpc Deposit(DepositRequest) returns (DepositResponse);
+}

rpcx/mock/depositserver.go

@@ -0,0 +1,19 @@
+package mock
+
+import (
+	"context"
+
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+type DepositServer struct {
+}
+
+func (*DepositServer) Deposit(ctx context.Context, req *DepositRequest) (*DepositResponse, error) {
+	if req.GetAmount() < 0 {
+		return nil, status.Errorf(codes.InvalidArgument, "cannot deposit %v", req.GetAmount())
+	}
+
+	return &DepositResponse{Ok: true}, nil
+}

rpcx/proxy.go

@@ -18,7 +18,7 @@ type RpcProxy struct {
 	lock        sync.Mutex
 }
 
-func NewRpcProxy(backend string, opts ...internal.ClientOption) *RpcProxy {
+func NewProxy(backend string, opts ...internal.ClientOption) *RpcProxy {
 	return &RpcProxy{
 		backend:     backend,
 		clients:     make(map[string]Client),
@@ -56,5 +56,5 @@ func (p *RpcProxy) TakeConn(ctx context.Context) (*grpc.ClientConn, error) {
 		return nil, err
 	}
 
-	return val.(*RpcClient).Conn(), nil
+	return val.(Client).Conn(), nil
 }