diff options
Diffstat (limited to 'Src/Newtonsoft.Json.Tests')
5 files changed, 49 insertions, 21 deletions
diff --git a/Src/Newtonsoft.Json.Tests/PerformanceTests.cs b/Src/Newtonsoft.Json.Tests/PerformanceTests.cs index 7d3b8bd..268fe13 100644 --- a/Src/Newtonsoft.Json.Tests/PerformanceTests.cs +++ b/Src/Newtonsoft.Json.Tests/PerformanceTests.cs @@ -704,21 +704,6 @@ namespace Newtonsoft.Json.Tests }
[Test]
- public void RecursiveLoop()
- {
- JArray a1 = new JArray();
- JArray a2 = new JArray();
- JArray a3 = new JArray();
- JArray a4 = new JArray();
-
- a1.Add(a2);
- a2.Add(a3);
- a3.Add(a4);
-
-
- }
-
- [Test]
public void NestedJToken()
{
Stopwatch sw;
diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index 7920d37..1646871 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -72,5 +72,5 @@ using System.Security; // by using the '*' as shown below:
[assembly: AssemblyVersion("4.0.8.0")]
#if !PocketPC
-[assembly: AssemblyFileVersion("4.0.8.14707")]
+[assembly: AssemblyFileVersion("4.0.8.14710")]
#endif
diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs index 1f8ade6..1d48a81 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs @@ -7,12 +7,13 @@ namespace Newtonsoft.Json.Tests.Serialization public class ConstructorHandlingTests : TestFixtureBase
{
[Test]
- [ExpectedException(typeof(JsonSerializationException), ExpectedMessage = "Unable to find a constructor to use for type Newtonsoft.Json.Tests.TestObjects.PrivateConstructorTestClass. A class should either have a default constructor, one constructor with arguments or a constructor marked with the JsonConstructor attribute. Line 1, position 6.")]
- public void FailWithPrivateConstructorAndDefault()
+ public void UsePrivateConstructorIfThereAreMultipleConstructorsWithParametersAndNothingToFallbackTo()
{
string json = @"{Name:""Name!""}";
- JsonConvert.DeserializeObject<PrivateConstructorTestClass>(json);
+ var c = JsonConvert.DeserializeObject<PrivateConstructorTestClass>(json);
+
+ Assert.AreEqual("Name!", c.Name);
}
[Test]
diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs index d568eec..0f7f7ff 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs @@ -1905,7 +1905,9 @@ keyword such as type of business."" }
[Test]
- [ExpectedException(typeof (JsonSerializationException), ExpectedMessage = @"Cannot deserialize JSON array into type 'Newtonsoft.Json.Tests.TestObjects.Person'. Line 1, position 1.")]
+ [ExpectedException(typeof(JsonSerializationException), ExpectedMessage = @"Cannot deserialize JSON array (i.e. [1,2,3]) into type 'Newtonsoft.Json.Tests.TestObjects.Person'.
+The deserialized type must be an array or implement a collection interface like IEnumerable, ICollection or IList.
+To force JSON arrays to deserialize add the JsonArrayAttribute to the type. Line 1, position 1.")]
public void CannotDeserializeArrayIntoObject()
{
string json = @"[]";
@@ -1914,7 +1916,9 @@ keyword such as type of business."" }
[Test]
- [ExpectedException(typeof (JsonSerializationException), ExpectedMessage = @"Cannot deserialize JSON object into type 'System.Collections.Generic.List`1[Newtonsoft.Json.Tests.TestObjects.Person]'. Line 1, position 2.")]
+ [ExpectedException(typeof (JsonSerializationException), ExpectedMessage = @"Cannot deserialize JSON object (i.e. {""name"":""value""}) into type 'System.Collections.Generic.List`1[Newtonsoft.Json.Tests.TestObjects.Person]'.
+The deserialized type should be a normal .NET type (i.e. not a primitive type like integer, not a collection type like an array or List<T>) or a dictionary type (i.e. Dictionary<TKey, TValue>).
+To force JSON objects to deserialize add the JsonObjectAttribute to the type. Line 1, position 2.")]
public void CannotDeserializeObjectIntoArray()
{
string json = @"{}";
@@ -5550,9 +5554,37 @@ Parameter name: value")] Assert.AreEqual("Pre", c2.PreField);
Assert.AreEqual("Post", c2.PostField);
}
+
+ [Test]
+ public void PrivateConstructor()
+ {
+ var person = PersonWithPrivateConstructor.CreatePerson();
+ person.Name = "John Doe";
+ person.Age = 25;
+
+ var serializedPerson = JsonConvert.SerializeObject(person);
+ var roundtrippedPerson = JsonConvert.DeserializeObject<PersonWithPrivateConstructor>(serializedPerson);
+
+ Assert.AreEqual(person.Name, roundtrippedPerson.Name);
+ }
#endif
}
+ public class PersonWithPrivateConstructor
+ {
+ private PersonWithPrivateConstructor()
+ { }
+
+ public static PersonWithPrivateConstructor CreatePerson()
+ {
+ return new PersonWithPrivateConstructor();
+ }
+
+ public string Name { get; set; }
+
+ public int Age { get; set; }
+ }
+
public class DateTimeWrapper
{
public DateTime Value { get; set; }
diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/PrivateConstructorTestClass.cs b/Src/Newtonsoft.Json.Tests/TestObjects/PrivateConstructorTestClass.cs index ad52d17..698406d 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/PrivateConstructorTestClass.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/PrivateConstructorTestClass.cs @@ -33,5 +33,15 @@ namespace Newtonsoft.Json.Tests.TestObjects private PrivateConstructorTestClass()
{
}
+
+ // multiple constructors with arguments so the serializer doesn't know what to fall back to
+ private PrivateConstructorTestClass(object a)
+ {
+ }
+
+ // multiple constructors with arguments so the serializer doesn't know what to fall back to
+ private PrivateConstructorTestClass(object a, object b)
+ {
+ }
}
}
\ No newline at end of file |