Report serialization errors in conformance tests

9 years ago · c74676f070
parent 888e71bdfc
commit c74676f070
1 changed files with 15 additions and 8 deletions
--- a/csharp/src/Google.Protobuf.Conformance/Program.cs
+++ b/csharp/src/Google.Protobuf.Conformance/Program.cs
@ -105,6 +105,8 @@ namespace Google.Protobuf.Conformance
            {
                return new ConformanceResponse { ParseError = e.Message };
            }
+            try
+            {
                switch (request.RequestedOutputFormat)
                {
                    case global::Conformance.WireFormat.JSON:
@ -116,6 +118,11 @@ namespace Google.Protobuf.Conformance
                        throw new Exception("Unsupported request output format: " + request.PayloadCase);
                }
            }
+            catch (InvalidOperationException e)
+            {
+                return new ConformanceResponse { SerializeError = e.Message };
+            }
+        }

        private static int? ReadInt32(BinaryReader input)
        {