update tests for combined payloads

Author: mjheilmann

lib/grpc_reflection/service/state.ex

@@ -141,11 +141,11 @@ defmodule GrpcReflection.Service.State do
             %{
               acc
               | syntax: descriptor.syntax,
-                message_type: acc.message_type ++ descriptor.message_type,
-                service: acc.service ++ descriptor.service,
-                enum_type: acc.enum_type ++ descriptor.enum_type,
-                dependency: acc.dependency ++ descriptor.dependency,
-                extension: acc.extension ++ descriptor.extension
+                message_type: Enum.uniq(acc.message_type ++ descriptor.message_type),
+                service: Enum.uniq(acc.service ++ descriptor.service),
+                enum_type: Enum.uniq(acc.enum_type ++ descriptor.enum_type),
+                dependency: Enum.uniq(acc.dependency ++ descriptor.dependency),
+                extension: Enum.uniq(acc.extension ++ descriptor.extension)
             }
           end
         )

test/integration/v1_reflection_test.exs

@@ -74,7 +74,7 @@ defmodule GrpcReflection.V1ReflectionTest do
     test "describing a nested type returns the root type", ctx do
       message = {:file_containing_symbol, "testserviceV3.TestRequest.Payload"}
       assert {:ok, response} = run_request(message, ctx)
-      assert response.name == "testserviceV3.TestRequest.proto"
+      assert response.name == "testserviceV3.proto"
     end
 
     test "type with leading period still resolves", ctx do
@@ -167,29 +167,30 @@ defmodule GrpcReflection.V1ReflectionTest do
     end
 
     test "ensures file descriptor dependencies are unique", ctx do
-      filename = "testserviceV3.TestReply.proto"
+      filename = "testserviceV3.proto"
       message = {:file_by_filename, filename}
       assert {:ok, response} = run_request(message, ctx)
       assert response.name == filename
       assert response.package == "testserviceV3"
 
       assert response.dependency == [
                "google.protobuf.Timestamp.proto",
-               "google.protobuf.StringValue.proto"
+               "google.protobuf.StringValue.proto",
+               "google.protobuf.Any.proto"
              ]
     end
 
     test "ensure exclusion of nested types in file descriptor dependencies", ctx do
-      filename = "testserviceV3.TestRequest.proto"
+      filename = "testserviceV3.proto"
       message = {:file_by_filename, filename}
       assert {:ok, response} = run_request(message, ctx)
       assert response.name == filename
       assert response.package == "testserviceV3"
 
       assert response.dependency == [
-               "testserviceV3.Enum.proto",
-               "google.protobuf.Any.proto",
-               "google.protobuf.StringValue.proto"
+               "google.protobuf.Timestamp.proto",
+               "google.protobuf.StringValue.proto",
+               "google.protobuf.Any.proto"
              ]
     end
   end

test/integration/v1alpha_reflection_test.exs

@@ -74,7 +74,7 @@ defmodule GrpcReflection.V1alphaReflectionTest do
     test "describing a nested type returns the root type", ctx do
       message = {:file_containing_symbol, "testserviceV3.TestRequest.Payload"}
       assert {:ok, response} = run_request(message, ctx)
-      assert response.name == "testserviceV3.TestRequest.proto"
+      assert response.name == "testserviceV3.proto"
     end
 
     test "type with leading period still resolves", ctx do
@@ -167,29 +167,30 @@ defmodule GrpcReflection.V1alphaReflectionTest do
     end
 
     test "ensures file descriptor dependencies are unique", ctx do
-      filename = "testserviceV3.TestReply.proto"
+      filename = "testserviceV3.proto"
       message = {:file_by_filename, filename}
       assert {:ok, response} = run_request(message, ctx)
       assert response.name == filename
       assert response.package == "testserviceV3"
 
       assert response.dependency == [
                "google.protobuf.Timestamp.proto",
-               "google.protobuf.StringValue.proto"
+               "google.protobuf.StringValue.proto",
+               "google.protobuf.Any.proto"
              ]
     end
 
     test "ensure exclusion of nested types in file descriptor dependencies", ctx do
-      filename = "testserviceV3.TestRequest.proto"
+      filename = "testserviceV3.proto"
       message = {:file_by_filename, filename}
       assert {:ok, response} = run_request(message, ctx)
       assert response.name == filename
       assert response.package == "testserviceV3"
 
       assert response.dependency == [
-               "testserviceV3.Enum.proto",
-               "google.protobuf.Any.proto",
-               "google.protobuf.StringValue.proto"
+               "google.protobuf.Timestamp.proto",
+               "google.protobuf.StringValue.proto",
+               "google.protobuf.Any.proto"
              ]
     end
   end

test/service/builder_test.exs

@@ -14,12 +14,7 @@ defmodule GrpcReflection.Service.BuilderTest do
              "google.protobuf.Any.proto",
              "google.protobuf.StringValue.proto",
              "google.protobuf.Timestamp.proto",
-             "testserviceV3.Enum.proto",
-             "testserviceV3.TestReply.proto",
-             "testserviceV3.TestRequest.Payload.proto",
-             "testserviceV3.TestRequest.Token.proto",
-             "testserviceV3.TestRequest.proto",
-             "testserviceV3.TestService.proto"
+             "testserviceV3.proto"
            ]
 
     assert Map.keys(tree.symbols) == [
@@ -49,11 +44,8 @@ defmodule GrpcReflection.Service.BuilderTest do
     assert Map.keys(tree.files) == [
              "google.protobuf.Any.proto",
              "google.protobuf.Timestamp.proto",
-             "testserviceV2.Enum.proto",
-             "testserviceV2.TestReply.proto",
-             "testserviceV2.TestRequest.proto",
              "testserviceV2.TestRequestExtension.proto",
-             "testserviceV2.TestService.proto"
+             "testserviceV2.proto"
            ]
 
     assert Map.keys(tree.symbols) == [
@@ -111,11 +103,8 @@ defmodule GrpcReflection.Service.BuilderTest do
     assert names == [
              "google.protobuf.Any.proto",
              "google.protobuf.Timestamp.proto",
-             "testserviceV2.Enum.proto",
-             "testserviceV2.TestReply.proto",
-             "testserviceV2.TestRequest.proto",
              "testserviceV2.TestRequestExtension.proto",
-             "testserviceV2.TestService.proto"
+             "testserviceV2.proto"
            ]
   end