JSON conformance test fixes

- Spot an Any without a type URL
- In the conformance test runner, catch exceptions due to generally-invalid JSON

1 files changed, 7 insertions, 0 deletions

diff --git a/csharp/src/Google.Protobuf.Test/JsonParserTest.cs b/csharp/src/Google.Protobuf.Test/JsonParserTest.cs
index 303baacc..60c4d815 100644
--- a/csharp/src/Google.Protobuf.Test/JsonParserTest.cs
+++ b/csharp/src/Google.Protobuf.Test/JsonParserTest.cs
@@ -763,6 +763,13 @@ namespace Google.Protobuf
         }
 
         [Test]
+        public void Any_NoTypeUrl()
+        {
+            string json = "{ \"foo\": \"bar\" }";
+            Assert.Throws<InvalidProtocolBufferException>(() => Any.Parser.ParseJson(json));
+        }
+
+        [Test]
         public void Any_WellKnownType()
         {
             var registry = TypeRegistry.FromMessages(Timestamp.Descriptor);