Fix custom options behaviour

1 files changed, 31 insertions, 0 deletions

diff --git a/src/ProtocolBuffers.Test/Descriptors/MessageDescriptorTest.cs b/src/ProtocolBuffers.Test/Descriptors/MessageDescriptorTest.cs
new file mode 100644
index 00000000..5b8abebd
--- /dev/null
+++ b/src/ProtocolBuffers.Test/Descriptors/MessageDescriptorTest.cs
@@ -0,0 +1,31 @@
+using NUnit.Framework;
+using Google.ProtocolBuffers.TestProtos;
+
+namespace Google.ProtocolBuffers.Descriptors {
+
+  [TestFixture]
+  public class MessageDescriptorTest {
+    [Test]
+    public void FindPropertyWithDefaultName() {
+      Assert.AreSame(OptionsMessage.Descriptor.FindFieldByNumber(OptionsMessage.NormalFieldNumber),
+          OptionsMessage.Descriptor.FindFieldByPropertyName("Normal"));
+    }
+
+    [Test]
+    public void FindPropertyWithAutoModifiedName() {
+      Assert.AreSame(OptionsMessage.Descriptor.FindFieldByNumber(OptionsMessage.OptionsMessage_FieldNumber),
+          OptionsMessage.Descriptor.FindFieldByPropertyName("OptionsMessage_"));
+    }
+
+    [Test]
+    public void FindPropertyWithCustomizedName() {
+      Assert.AreSame(OptionsMessage.Descriptor.FindFieldByNumber(OptionsMessage.CustomNameFieldNumber),
+          OptionsMessage.Descriptor.FindFieldByPropertyName("CustomName"));
+    }
+
+    [Test]
+    public void FindPropertyWithInvalidName() {
+      Assert.IsNull(OptionsMessage.Descriptor.FindFieldByPropertyName("Bogus"));
+    }
+  }
+}