Merge pull request #44 from kevpar/method-full-name

crosbymichael · web-flow · commit f969a7f076a2 · 2019-08-26T11:42:48.000-04:00
Fix method full name generation
diff --git a/services.go b/services.go
@@ -152,5 +152,5 @@ func convertCode(err error) codes.Code {
 }
 
 func fullPath(service, method string) string {
-	return "/" + path.Join("/", service, method)
+	return "/" + path.Join(service, method)
 }
diff --git a/services_test.go b/services_test.go
@@ -0,0 +1,29 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package ttrpc
+
+import (
+	"testing"
+)
+
+func Test_MethodFullNameGeneration(t *testing.T) {
+	name := fullPath("test.v1.service", "Foo")
+	expectedName := "/test.v1.service/Foo"
+	if name != expectedName {
+		t.Fatalf("Service name does not match. Expected: %q, Actual: %q", expectedName, name)
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -152,5 +152,5 @@ func convertCode(err error) codes.Code {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`func fullPath(service, method string) string {`
`155`		`- return "/" + path.Join("/", service, method)`
	`155`	`+ return "/" + path.Join(service, method)`
`156`	`156`	`}`