Include target type name in exception message for unexpected field.

point-platform · Jun 26, 2016 · 2aea3ca · 2aea3ca
1 parent 0cdf31e
commit 2aea3ca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Dasher.Tests/DeserialiserTests.cs b/Dasher.Tests/DeserialiserTests.cs
@@ -106,7 +106,7 @@ public void ThrowsOnUnexpectedField()
                 () => deserialiser.Deserialise(bytes));
 
             Assert.Equal(typeof(UserScore), ex.TargetType);
-            Assert.Equal("Encountered unexpected field \"SUPRISE\".", ex.Message);
+            Assert.Equal("Encountered unexpected field \"SUPRISE\" for type \"UserScore\".", ex.Message);
         }
 
         [Fact]
@@ -181,7 +181,7 @@ public void ThrowsOnDuplicateField()
                 () => deserialiser.Deserialise(bytes));
 
             Assert.Equal(typeof(UserScore), ex.TargetType);
-            Assert.Equal("Encountered duplicate field \"Score\".", ex.Message);
+            Assert.Equal("Encountered duplicate field \"Score\" for type \"UserScore\".", ex.Message);
         }
 
         [Fact]

diff --git a/Dasher/DeserialiserEmitter.cs b/Dasher/DeserialiserEmitter.cs
@@ -240,9 +240,10 @@ public static Func<Unpacker, DasherContext, object> Build(Type type, UnexpectedF
                         var notSeenLabel = ilg.DefineLabel();
                         ilg.Emit(OpCodes.Brfalse, notSeenLabel);
                         {
-                            ilg.Emit(OpCodes.Ldstr, "Encountered duplicate field \"{0}\".");
+                            ilg.Emit(OpCodes.Ldstr, "Encountered duplicate field \"{0}\" for type \"{1}\".");
                             ilg.Emit(OpCodes.Ldloc, key);
-                            ilg.Emit(OpCodes.Call, typeof(string).GetMethod(nameof(string.Format), new[] {typeof(string), typeof(object)}));
+                            ilg.Emit(OpCodes.Ldstr, type.Name);
+                            ilg.Emit(OpCodes.Call, typeof(string).GetMethod(nameof(string.Format), new[] {typeof(string), typeof(object), typeof(object)}));
                             throwException();
                         }
 
@@ -267,9 +268,10 @@ public static Func<Unpacker, DasherContext, object> Build(Type type, UnexpectedF
                 // If we got here then the property was not recognised. Either throw or ignore, depending upon configuration.
                 if (unexpectedFieldBehaviour == UnexpectedFieldBehaviour.Throw)
                 {
-                    ilg.Emit(OpCodes.Ldstr, "Encountered unexpected field \"{0}\".");
+                    ilg.Emit(OpCodes.Ldstr, "Encountered unexpected field \"{0}\" for type \"{1}\".");
                     ilg.Emit(OpCodes.Ldloc, key);
-                    ilg.Emit(OpCodes.Call, typeof(string).GetMethod(nameof(string.Format), new[] {typeof(string), typeof(object)}));
+                    ilg.Emit(OpCodes.Ldstr, type.Name);
+                    ilg.Emit(OpCodes.Call, typeof(string).GetMethod(nameof(string.Format), new[] {typeof(string), typeof(object), typeof(object)}));
                     throwException();
                 }
                 else