From 1c1dae0642951e11dae4e85bd900ab2ca5035b6e Mon Sep 17 00:00:00 2001
From: Asim Aslam <asim@aslam.me>
Date: Wed, 19 Jun 2019 12:34:45 +0100
Subject: [PATCH] Fix the grpc test

---
 client/grpc/grpc_test.go    |  4 ++--
 client/grpc/request.go      |  4 ++++
 client/grpc/request_test.go | 29 +++++++++++------------------
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/client/grpc/grpc_test.go b/client/grpc/grpc_test.go
index 574058cb..074d8931 100644
--- a/client/grpc/grpc_test.go
+++ b/client/grpc/grpc_test.go
@@ -45,7 +45,7 @@ func TestGRPCClient(t *testing.T) {
 
 	// register service
 	r.Register(&registry.Service{
-		Name:    "test",
+		Name:    "helloworld",
 		Version: "test",
 		Nodes: []*registry.Node{
 			&registry.Node{
@@ -73,7 +73,7 @@ func TestGRPCClient(t *testing.T) {
 	}
 
 	for _, method := range testMethods {
-		req := c.NewRequest("test", method, &pb.HelloRequest{
+		req := c.NewRequest("helloworld", method, &pb.HelloRequest{
 			Name: "John",
 		})
 
diff --git a/client/grpc/request.go b/client/grpc/request.go
index 94b44da0..066577ce 100644
--- a/client/grpc/request.go
+++ b/client/grpc/request.go
@@ -30,6 +30,10 @@ func methodToGRPC(service, method string) string {
 		return method
 	}
 
+	if len(service) == 0 {
+		return fmt.Sprintf("/%s/%s", mParts[0], mParts[1])
+	}
+
 	// return /pkg.Foo/Bar
 	return fmt.Sprintf("/%s.%s/%s", service, mParts[0], mParts[1])
 }
diff --git a/client/grpc/request_test.go b/client/grpc/request_test.go
index eab3a3a1..c73d675b 100644
--- a/client/grpc/request_test.go
+++ b/client/grpc/request_test.go
@@ -2,45 +2,38 @@ package grpc
 
 import (
 	"testing"
-
-	pb "google.golang.org/grpc/examples/helloworld/helloworld"
 )
 
 func TestMethodToGRPC(t *testing.T) {
 	testData := []struct {
+		service string
 		method  string
 		expect  string
-		request interface{}
 	}{
 		{
+			"helloworld",
 			"Greeter.SayHello",
 			"/helloworld.Greeter/SayHello",
-			new(pb.HelloRequest),
 		},
 		{
+			"helloworld",
 			"/helloworld.Greeter/SayHello",
 			"/helloworld.Greeter/SayHello",
-			new(pb.HelloRequest),
 		},
 		{
+			"",
+			"/helloworld.Greeter/SayHello",
+			"/helloworld.Greeter/SayHello",
+		},
+		{
+			"",
 			"Greeter.SayHello",
-			"/helloworld.Greeter/SayHello",
-			pb.HelloRequest{},
-		},
-		{
-			"/helloworld.Greeter/SayHello",
-			"/helloworld.Greeter/SayHello",
-			pb.HelloRequest{},
-		},
-		{
-			"Greeter.SayHello",
-			"Greeter.SayHello",
-			nil,
+			"/Greeter/SayHello",
 		},
 	}
 
 	for _, d := range testData {
-		method := methodToGRPC(d.method, d.request)
+		method := methodToGRPC(d.service, d.method)
 		if method != d.expect {
 			t.Fatalf("expected %s got %s", d.expect, method)
 		}