aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs
diff options
context:
space:
mode:
authorJan Tattermusch <jtattermusch@users.noreply.github.com>2016-01-19 19:38:16 -0800
committerJan Tattermusch <jtattermusch@users.noreply.github.com>2016-01-19 19:38:16 -0800
commit8c5260b21bb0e217e91375893d507a0ef6578d67 (patch)
tree1c72120a82fab876f5713a97f2fde16910fef05a /csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs
parent6794d17c948f1b36d8e77a91568a40456ec8ada3 (diff)
parent5dba7d7b4cac6f2f4250ceaca27fb6024f4aeb54 (diff)
downloadprotobuf-8c5260b21bb0e217e91375893d507a0ef6578d67.tar.gz
protobuf-8c5260b21bb0e217e91375893d507a0ef6578d67.tar.bz2
protobuf-8c5260b21bb0e217e91375893d507a0ef6578d67.zip
Merge pull request #1096 from jskeet/custom-to-string
Introduce ICustomDiagnosticMessage to allow for custom string formatting
Diffstat (limited to 'csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs')
-rw-r--r--csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs16
1 files changed, 16 insertions, 0 deletions
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));
+ }
}
}