Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public void SimpleObjectDeserializationFailure()
{
// wrong arguments
Assert.ThrowsException<ArgumentException>(() => SecureNewtonsoftDeserialization.DeserializeObject<SimpleDummy>(null));
Assert.ThrowsException<ArgumentException>(() => SecureNewtonsoftDeserialization.DeserializeObject<SimpleDummy>(" "));

// wrong json string
Assert.ThrowsException<JsonSerializationException>(() => SecureNewtonsoftDeserialization.DeserializeObject<SimpleDummy>("{"));
Expand Down Expand Up @@ -78,7 +77,6 @@ public void SimpleObjectDeserializationWithSettingsFailure()
// wrong arguments
JsonSerializerSettings settings = new JsonSerializerSettings();
Assert.ThrowsException<ArgumentException>(() => SecureNewtonsoftDeserialization.DeserializeObject<SimpleDummy>(null, settings));
Assert.ThrowsException<ArgumentException>(() => SecureNewtonsoftDeserialization.DeserializeObject<SimpleDummy>(" ", settings));

settings = new JsonSerializerSettings();
settings.TypeNameHandling = TypeNameHandling.All;
Expand Down Expand Up @@ -116,7 +114,7 @@ public void ComplexObjectDeserializationFailure()
var serializedComplexDummy = JsonConvert.SerializeObject(complexDummy, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All });

Assert.ThrowsException<JsonSerializationException>(() => SecureNewtonsoftDeserialization.DeserializeObject<ComplexDummy>(serializedComplexDummy, knownTypes));
Assert.ThrowsException<ArgumentException>(() => SecureNewtonsoftDeserialization.DeserializeObject<ComplexDummy>(string.Empty, knownTypes));
Assert.ThrowsException<ArgumentException>(() => SecureNewtonsoftDeserialization.DeserializeObject<ComplexDummy>(null, knownTypes));
}

[TestMethod]
Expand Down