From 5dba7d7b4cac6f2f4250ceaca27fb6024f4aeb54 Mon Sep 17 00:00:00 2001
From: Jon Skeet <jonskeet@google.com>
Date: Wed, 6 Jan 2016 11:12:56 +0000
Subject: Introduce ICustomDiagnosticMessage to allow for custom string
 formatting

This fixes issue #933, effectively.
---
 csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs')

diff --git a/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs b/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs
index cda7f885..14cc6d19 100644
--- a/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs
+++ b/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs
@@ -695,5 +695,21 @@ namespace Google.Protobuf
             var parsed = TestAllTypes.Parser.ParseFrom(stream);
             Assert.AreEqual(new TestAllTypes { SingleFixed32 = 123 }, parsed);
         }
+
+        [Test]
+        public void CustomDiagnosticMessage_DirectToStringCall()
+        {
+            var message = new ForeignMessage { C = 31 };
+            Assert.AreEqual("{ \"c\": 31, \"@cInHex\": \"1f\" }", message.ToString());
+            Assert.AreEqual("{ \"c\": 31 }", JsonFormatter.Default.Format(message));
+        }
+
+        [Test]
+        public void CustomDiagnosticMessage_Nested()
+        {
+            var message = new TestAllTypes { SingleForeignMessage = new ForeignMessage { C = 16 } };
+            Assert.AreEqual("{ \"singleForeignMessage\": { \"c\": 16, \"@cInHex\": \"10\" } }", message.ToString());
+            Assert.AreEqual("{ \"singleForeignMessage\": { \"c\": 16 } }", JsonFormatter.Default.Format(message));
+        }
     }
 }
-- 
cgit v1.2.3