Setters/adders now throw ArgumentNullException appropriately.

1 files changed, 26 insertions, 8 deletions

diff --git a/src/ProtocolBuffers.Test/DynamicMessageTest.cs b/src/ProtocolBuffers.Test/DynamicMessageTest.cs
index 7179da5d..045f5c4f 100644
--- a/src/ProtocolBuffers.Test/DynamicMessageTest.cs
+++ b/src/ProtocolBuffers.Test/DynamicMessageTest.cs
@@ -54,15 +54,27 @@ namespace Google.ProtocolBuffers {
     }
 
     [Test]
+    public void DynamicMessageSettersRejectNull() {
+      IBuilder builder = DynamicMessage.CreateBuilder(TestAllTypes.Descriptor);
+      reflectionTester.AssertReflectionSettersRejectNull(builder);
+	  }
+
+    [Test]
     public void DynamicMessageExtensionAccessors() {
-    // We don't need to extensively test DynamicMessage's handling of
-    // extensions because, frankly, it doesn't do anything special with them.
-    // It treats them just like any other fields.
-    IBuilder builder = DynamicMessage.CreateBuilder(TestAllExtensions.Descriptor);
-    extensionsReflectionTester.SetAllFieldsViaReflection(builder);
-    IMessage message = builder.WeakBuild();
-    extensionsReflectionTester.AssertAllFieldsSetViaReflection(message);
-  }
+      // We don't need to extensively test DynamicMessage's handling of
+      // extensions because, frankly, it doesn't do anything special with them.
+      // It treats them just like any other fields.
+      IBuilder builder = DynamicMessage.CreateBuilder(TestAllExtensions.Descriptor);
+      extensionsReflectionTester.SetAllFieldsViaReflection(builder);
+      IMessage message = builder.WeakBuild();
+      extensionsReflectionTester.AssertAllFieldsSetViaReflection(message);
+    }
+
+    [Test]
+    public void DynamicMessageExtensionSettersRejectNull() {
+      IBuilder builder = DynamicMessage.CreateBuilder(TestAllExtensions.Descriptor);
+      extensionsReflectionTester.AssertReflectionSettersRejectNull(builder);
+	  }
 
     [Test]
     public void DynamicMessageRepeatedSetters() {
@@ -74,6 +86,12 @@ namespace Google.ProtocolBuffers {
     }
 
     [Test]
+    public void DynamicMessageRepeatedSettersRejectNull() {
+      IBuilder builder = DynamicMessage.CreateBuilder(TestAllTypes.Descriptor);
+      reflectionTester.AssertReflectionRepeatedSettersRejectNull(builder);
+    }
+
+    [Test]
     public void DynamicMessageDefaults() {
       reflectionTester.AssertClearViaReflection(DynamicMessage.GetDefaultInstance(TestAllTypes.Descriptor));
       reflectionTester.AssertClearViaReflection(DynamicMessage.CreateBuilder(TestAllTypes.Descriptor).Build());