some pre-factoring and small fixes (#58)

* organize into multiple files
* make listing methods show fully-qualified names
* address small feedback from recent change (trim then check if empty)
This commit is contained in:
Joshua Humphries
2018-10-18 23:51:38 -04:00
committed by GitHub
parent 69ea782936
commit 9a4bbacdd6
5 changed files with 644 additions and 613 deletions

View File

@@ -201,12 +201,12 @@ func doTestListMethods(t *testing.T, source DescriptorSource, includeReflection
t.Fatalf("failed to list methods for TestService: %v", err)
}
expected := []string{
"EmptyCall",
"FullDuplexCall",
"HalfDuplexCall",
"StreamingInputCall",
"StreamingOutputCall",
"UnaryCall",
"grpc.testing.TestService.EmptyCall",
"grpc.testing.TestService.FullDuplexCall",
"grpc.testing.TestService.HalfDuplexCall",
"grpc.testing.TestService.StreamingInputCall",
"grpc.testing.TestService.StreamingOutputCall",
"grpc.testing.TestService.UnaryCall",
}
if !reflect.DeepEqual(expected, names) {
t.Errorf("ListMethods returned wrong results: wanted %v, got %v", expected, names)
@@ -218,7 +218,7 @@ func doTestListMethods(t *testing.T, source DescriptorSource, includeReflection
if err != nil {
t.Fatalf("failed to list methods for ServerReflection: %v", err)
}
expected = []string{"ServerReflectionInfo"}
expected = []string{"grpc.reflection.v1alpha.ServerReflection.ServerReflectionInfo"}
} else {
// without reflection, we see all services defined in the same test.proto file, which is the
// TestService as well as UnimplementedService
@@ -226,7 +226,7 @@ func doTestListMethods(t *testing.T, source DescriptorSource, includeReflection
if err != nil {
t.Fatalf("failed to list methods for ServerReflection: %v", err)
}
expected = []string{"UnimplementedCall"}
expected = []string{"grpc.testing.UnimplementedService.UnimplementedCall"}
}
if !reflect.DeepEqual(expected, names) {
t.Errorf("ListMethods returned wrong results: wanted %v, got %v", expected, names)