diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj index 5dc30cae..242d860f 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj @@ -170,15 +170,15 @@ - + - - - - + + + + diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj index 1427dc21..c848d910 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj @@ -201,12 +201,12 @@ - - + + - + @@ -231,8 +231,8 @@ - - + + diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj index 7c6e598b..71333592 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj @@ -317,7 +317,7 @@ - + @@ -345,10 +345,10 @@ - - - - + + + + diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj index 0e7c701f..83b2bd64 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj @@ -192,7 +192,7 @@ - + @@ -220,10 +220,10 @@ - - - - + + + + diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj index 4e3230e8..92d71a86 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj @@ -196,7 +196,7 @@ - + @@ -224,10 +224,10 @@ - - - - + + + + diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj index 4d0de2a9..4ec9338d 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj @@ -382,7 +382,7 @@ - + @@ -391,10 +391,10 @@ - - - - + + + + diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs index c00cca5e..ca4538b8 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs @@ -77,22 +77,22 @@ namespace Newtonsoft.Json.Tests.Serialization } [Test] - public void FailWithPrivateConstructorPlusParametizedAndDefault() + public void FailWithPrivateConstructorPlusParameterizedAndDefault() { ExceptionAssert.Throws(() => { string json = @"{Name:""Name!""}"; - PrivateConstructorWithPublicParametizedConstructorTestClass c = JsonConvert.DeserializeObject(json); + PrivateConstructorWithPublicParameterizedConstructorTestClass c = JsonConvert.DeserializeObject(json); }); } [Test] - public void SuccessWithPrivateConstructorPlusParametizedAndAllowNonPublic() + public void SuccessWithPrivateConstructorPlusParameterizedAndAllowNonPublic() { string json = @"{Name:""Name!""}"; - PrivateConstructorWithPublicParametizedConstructorTestClass c = JsonConvert.DeserializeObject(json, + PrivateConstructorWithPublicParameterizedConstructorTestClass c = JsonConvert.DeserializeObject(json, new JsonSerializerSettings { ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor @@ -103,71 +103,71 @@ namespace Newtonsoft.Json.Tests.Serialization } [Test] - public void SuccessWithPublicParametizedConstructor() + public void SuccessWithPublicParameterizedConstructor() { string json = @"{Name:""Name!""}"; - var c = JsonConvert.DeserializeObject(json); + var c = JsonConvert.DeserializeObject(json); Assert.IsNotNull(c); Assert.AreEqual("Name!", c.Name); } [Test] - public void SuccessWithPublicParametizedConstructorWhenParamaterIsNotAProperty() + public void SuccessWithPublicParameterizedConstructorWhenParameterIsNotAProperty() { string json = @"{nameParameter:""Name!""}"; - PublicParametizedConstructorWithNonPropertyParameterTestClass c = JsonConvert.DeserializeObject(json); + PublicParameterizedConstructorWithNonPropertyParameterTestClass c = JsonConvert.DeserializeObject(json); Assert.IsNotNull(c); Assert.AreEqual("Name!", c.Name); } [Test] - public void SuccessWithPublicParametizedConstructorWhenParamaterRequiresAConverter() + public void SuccessWithPublicParameterizedConstructorWhenParameterRequiresAConverter() { string json = @"{nameParameter:""Name!""}"; - PublicParametizedConstructorRequiringConverterTestClass c = JsonConvert.DeserializeObject(json, new NameContainerConverter()); + PublicParameterizedConstructorRequiringConverterTestClass c = JsonConvert.DeserializeObject(json, new NameContainerConverter()); Assert.IsNotNull(c); Assert.AreEqual("Name!", c.Name.Value); } [Test] - public void SuccessWithPublicParametizedConstructorWhenParamaterRequiresAConverterWithParameterAttribute() + public void SuccessWithPublicParameterizedConstructorWhenParameterRequiresAConverterWithParameterAttribute() { string json = @"{nameParameter:""Name!""}"; - PublicParametizedConstructorRequiringConverterWithParameterAttributeTestClass c = JsonConvert.DeserializeObject(json); + PublicParameterizedConstructorRequiringConverterWithParameterAttributeTestClass c = JsonConvert.DeserializeObject(json); Assert.IsNotNull(c); Assert.AreEqual("Name!", c.Name.Value); } [Test] - public void SuccessWithPublicParametizedConstructorWhenParamaterRequiresAConverterWithPropertyAttribute() + public void SuccessWithPublicParameterizedConstructorWhenParameterRequiresAConverterWithPropertyAttribute() { string json = @"{name:""Name!""}"; - PublicParametizedConstructorRequiringConverterWithPropertyAttributeTestClass c = JsonConvert.DeserializeObject(json); + PublicParameterizedConstructorRequiringConverterWithPropertyAttributeTestClass c = JsonConvert.DeserializeObject(json); Assert.IsNotNull(c); Assert.AreEqual("Name!", c.Name.Value); } [Test] - public void SuccessWithPublicParametizedConstructorWhenParamaterNameConflictsWithPropertyName() + public void SuccessWithPublicParameterizedConstructorWhenParameterNameConflictsWithPropertyName() { string json = @"{name:""1""}"; - PublicParametizedConstructorWithPropertyNameConflict c = JsonConvert.DeserializeObject(json); + PublicParameterizedConstructorWithPropertyNameConflict c = JsonConvert.DeserializeObject(json); Assert.IsNotNull(c); Assert.AreEqual(1, c.Name); } [Test] - public void PublicParametizedConstructorWithPropertyNameConflictWithAttribute() + public void PublicParameterizedConstructorWithPropertyNameConflictWithAttribute() { string json = @"{name:""1""}"; - PublicParametizedConstructorWithPropertyNameConflictWithAttribute c = JsonConvert.DeserializeObject(json); + PublicParameterizedConstructorWithPropertyNameConflictWithAttribute c = JsonConvert.DeserializeObject(json); Assert.IsNotNull(c); Assert.AreEqual(1, c.Name); } diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs index 85b3f3ea..f0b9ed75 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs @@ -441,12 +441,12 @@ namespace Newtonsoft.Json.Tests.Serialization public void ParameterizedCreator() { var resolver = new DefaultContractResolver(); - var contract = (JsonObjectContract)resolver.ResolveContract(typeof(PublicParametizedConstructorWithPropertyNameConflictWithAttribute)); + var contract = (JsonObjectContract)resolver.ResolveContract(typeof(PublicParameterizedConstructorWithPropertyNameConflictWithAttribute)); Assert.IsNull(contract.DefaultCreator); Assert.IsNotNull(contract.ParameterizedCreator); #pragma warning disable 618 - Assert.AreEqual(contract.ParametrizedConstructor, typeof(PublicParametizedConstructorWithPropertyNameConflictWithAttribute).GetConstructor(new[] { typeof(string) })); + Assert.AreEqual(contract.ParametrizedConstructor, typeof(PublicParameterizedConstructorWithPropertyNameConflictWithAttribute).GetConstructor(new[] { typeof(string) })); #pragma warning restore 618 Assert.AreEqual(1, contract.CreatorParameters.Count); Assert.AreEqual("name", contract.CreatorParameters[0].PropertyName); @@ -461,12 +461,12 @@ namespace Newtonsoft.Json.Tests.Serialization public void OverrideCreator() { var resolver = new DefaultContractResolver(); - var contract = (JsonObjectContract)resolver.ResolveContract(typeof(MultipleParamatrizedConstructorsJsonConstructor)); + var contract = (JsonObjectContract)resolver.ResolveContract(typeof(MultipleParametrizedConstructorsJsonConstructor)); Assert.IsNull(contract.DefaultCreator); Assert.IsNotNull(contract.OverrideCreator); #pragma warning disable 618 - Assert.AreEqual(contract.OverrideConstructor, typeof(MultipleParamatrizedConstructorsJsonConstructor).GetConstructor(new[] { typeof(string), typeof(int) })); + Assert.AreEqual(contract.OverrideConstructor, typeof(MultipleParametrizedConstructorsJsonConstructor).GetConstructor(new[] { typeof(string), typeof(int) })); #pragma warning restore 618 Assert.AreEqual(2, contract.CreatorParameters.Count); Assert.AreEqual("Value", contract.CreatorParameters[0].PropertyName); @@ -482,20 +482,20 @@ namespace Newtonsoft.Json.Tests.Serialization public void CustomOverrideCreator() { var resolver = new DefaultContractResolver(); - var contract = (JsonObjectContract)resolver.ResolveContract(typeof(MultipleParamatrizedConstructorsJsonConstructor)); + var contract = (JsonObjectContract)resolver.ResolveContract(typeof(MultipleParametrizedConstructorsJsonConstructor)); bool ensureCustomCreatorCalled = false; contract.OverrideCreator = args => { ensureCustomCreatorCalled = true; - return new MultipleParamatrizedConstructorsJsonConstructor((string)args[0], (int)args[1]); + return new MultipleParametrizedConstructorsJsonConstructor((string)args[0], (int)args[1]); }; #pragma warning disable 618 Assert.IsNull(contract.OverrideConstructor); #pragma warning restore 618 - var o = JsonConvert.DeserializeObject("{Value:'value!', Age:1}", new JsonSerializerSettings + var o = JsonConvert.DeserializeObject("{Value:'value!', Age:1}", new JsonSerializerSettings { ContractResolver = resolver }); diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs index b1342c77..53fc1fa1 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs @@ -6104,15 +6104,15 @@ Path '', line 1, position 1."); public void PublicConstructorOverridenByJsonConstructorTest() { PublicConstructorOverridenByJsonConstructor c = JsonConvert.DeserializeObject("{Value:'value!'}"); - Assert.AreEqual("Public Paramatized", c.Constructor); + Assert.AreEqual("Public Parameterized", c.Constructor); Assert.AreEqual("value!", c.Value); } [Test] - public void MultipleParamatrizedConstructorsJsonConstructorTest() + public void MultipleParametrizedConstructorsJsonConstructorTest() { - MultipleParamatrizedConstructorsJsonConstructor c = JsonConvert.DeserializeObject("{Value:'value!', Age:1}"); - Assert.AreEqual("Public Paramatized 2", c.Constructor); + MultipleParametrizedConstructorsJsonConstructor c = JsonConvert.DeserializeObject("{Value:'value!', Age:1}"); + Assert.AreEqual("Public Parameterized 2", c.Constructor); Assert.AreEqual("value!", c.Value); Assert.AreEqual(1, c.Age); } @@ -9760,7 +9760,7 @@ Path '', line 1, position 1."); public NonPublicConstructorWithJsonConstructor(string value) { Value = value; - Constructor = "Public Paramatized"; + Constructor = "Public Parameterized"; } } @@ -9803,28 +9803,28 @@ Path '', line 1, position 1."); public PublicConstructorOverridenByJsonConstructor(string value) { Value = value; - Constructor = "Public Paramatized"; + Constructor = "Public Parameterized"; } } - public class MultipleParamatrizedConstructorsJsonConstructor + public class MultipleParametrizedConstructorsJsonConstructor { public string Value { get; private set; } public int Age { get; private set; } public string Constructor { get; private set; } - public MultipleParamatrizedConstructorsJsonConstructor(string value) + public MultipleParametrizedConstructorsJsonConstructor(string value) { Value = value; - Constructor = "Public Paramatized 1"; + Constructor = "Public Parameterized 1"; } [JsonConstructor] - public MultipleParamatrizedConstructorsJsonConstructor(string value, int age) + public MultipleParametrizedConstructorsJsonConstructor(string value, int age) { Value = value; Age = age; - Constructor = "Public Paramatized 2"; + Constructor = "Public Parameterized 2"; } } diff --git a/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs index 86d2a62f..e931c634 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs @@ -733,7 +733,7 @@ Newtonsoft.Json Error: 0 : Error! } [Test] - public void PublicParametizedConstructorWithPropertyNameConflictWithAttribute() + public void PublicParameterizedConstructorWithPropertyNameConflictWithAttribute() { InMemoryTraceWriter traceWriter = new InMemoryTraceWriter { @@ -742,7 +742,7 @@ Newtonsoft.Json Error: 0 : Error! string json = @"{name:""1""}"; - PublicParametizedConstructorWithPropertyNameConflictWithAttribute c = JsonConvert.DeserializeObject(json, new JsonSerializerSettings + PublicParameterizedConstructorWithPropertyNameConflictWithAttribute c = JsonConvert.DeserializeObject(json, new JsonSerializerSettings { TraceWriter = traceWriter }); @@ -750,7 +750,7 @@ Newtonsoft.Json Error: 0 : Error! Assert.IsNotNull(c); Assert.AreEqual(1, c.Name); - Assert.AreEqual("Deserializing Newtonsoft.Json.Tests.TestObjects.PublicParametizedConstructorWithPropertyNameConflictWithAttribute using creator with parameters: name. Path 'name', line 1, position 6.", traceWriter.TraceRecords[0].Message); + Assert.AreEqual("Deserializing Newtonsoft.Json.Tests.TestObjects.PublicParameterizedConstructorWithPropertyNameConflictWithAttribute using creator with parameters: name. Path 'name', line 1, position 6.", traceWriter.TraceRecords[0].Message); } [Test] diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/PrivateConstructorWithPublicParametizedConstructorTestClass.cs b/Src/Newtonsoft.Json.Tests/TestObjects/PrivateConstructorWithPublicParameterizedConstructorTestClass.cs similarity index 85% rename from Src/Newtonsoft.Json.Tests/TestObjects/PrivateConstructorWithPublicParametizedConstructorTestClass.cs rename to Src/Newtonsoft.Json.Tests/TestObjects/PrivateConstructorWithPublicParameterizedConstructorTestClass.cs index d63748fc..56dabb52 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/PrivateConstructorWithPublicParametizedConstructorTestClass.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/PrivateConstructorWithPublicParameterizedConstructorTestClass.cs @@ -27,17 +27,17 @@ using System; namespace Newtonsoft.Json.Tests.TestObjects { - public class PrivateConstructorWithPublicParametizedConstructorTestClass + public class PrivateConstructorWithPublicParameterizedConstructorTestClass { public string Name { get; set; } public int Age { get; set; } - private PrivateConstructorWithPublicParametizedConstructorTestClass() + private PrivateConstructorWithPublicParameterizedConstructorTestClass() { Age = 1; } - public PrivateConstructorWithPublicParametizedConstructorTestClass(string dummy) + public PrivateConstructorWithPublicParameterizedConstructorTestClass(string dummy) { throw new Exception("Should never get here."); } diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/PublicParametizedConstructorRequiringConverterTestClass.cs b/Src/Newtonsoft.Json.Tests/TestObjects/PublicParameterizedConstructorRequiringConverterTestClass.cs similarity index 81% rename from Src/Newtonsoft.Json.Tests/TestObjects/PublicParametizedConstructorRequiringConverterTestClass.cs rename to Src/Newtonsoft.Json.Tests/TestObjects/PublicParameterizedConstructorRequiringConverterTestClass.cs index 31467032..e1e3d3eb 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/PublicParametizedConstructorRequiringConverterTestClass.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/PublicParameterizedConstructorRequiringConverterTestClass.cs @@ -62,11 +62,11 @@ namespace Newtonsoft.Json.Tests.TestObjects } } - public class PublicParametizedConstructorRequiringConverterTestClass + public class PublicParameterizedConstructorRequiringConverterTestClass { private readonly NameContainer _nameContainer; - public PublicParametizedConstructorRequiringConverterTestClass(NameContainer nameParameter) + public PublicParameterizedConstructorRequiringConverterTestClass(NameContainer nameParameter) { _nameContainer = nameParameter; } @@ -77,11 +77,11 @@ namespace Newtonsoft.Json.Tests.TestObjects } } - public class PublicParametizedConstructorRequiringConverterWithParameterAttributeTestClass + public class PublicParameterizedConstructorRequiringConverterWithParameterAttributeTestClass { private readonly NameContainer _nameContainer; - public PublicParametizedConstructorRequiringConverterWithParameterAttributeTestClass([JsonConverter(typeof(NameContainerConverter))] NameContainer nameParameter) + public PublicParameterizedConstructorRequiringConverterWithParameterAttributeTestClass([JsonConverter(typeof(NameContainerConverter))] NameContainer nameParameter) { _nameContainer = nameParameter; } @@ -92,11 +92,11 @@ namespace Newtonsoft.Json.Tests.TestObjects } } - public class PublicParametizedConstructorRequiringConverterWithPropertyAttributeTestClass + public class PublicParameterizedConstructorRequiringConverterWithPropertyAttributeTestClass { private readonly NameContainer _nameContainer; - public PublicParametizedConstructorRequiringConverterWithPropertyAttributeTestClass(NameContainer name) + public PublicParameterizedConstructorRequiringConverterWithPropertyAttributeTestClass(NameContainer name) { _nameContainer = name; } diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/PublicParametizedConstructorTestClass.cs b/Src/Newtonsoft.Json.Tests/TestObjects/PublicParameterizedConstructorTestClass.cs similarity index 91% rename from Src/Newtonsoft.Json.Tests/TestObjects/PublicParametizedConstructorTestClass.cs rename to Src/Newtonsoft.Json.Tests/TestObjects/PublicParameterizedConstructorTestClass.cs index 24dd7871..c0dafbfa 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/PublicParametizedConstructorTestClass.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/PublicParameterizedConstructorTestClass.cs @@ -25,11 +25,11 @@ namespace Newtonsoft.Json.Tests.TestObjects { - public class PublicParametizedConstructorTestClass + public class PublicParameterizedConstructorTestClass { private readonly string _name; - public PublicParametizedConstructorTestClass(string name) + public PublicParameterizedConstructorTestClass(string name) { _name = name; } diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/PublicParametizedConstructorWithNonPropertyParameterTestClass.cs b/Src/Newtonsoft.Json.Tests/TestObjects/PublicParameterizedConstructorWithNonPropertyParameterTestClass.cs similarity index 88% rename from Src/Newtonsoft.Json.Tests/TestObjects/PublicParametizedConstructorWithNonPropertyParameterTestClass.cs rename to Src/Newtonsoft.Json.Tests/TestObjects/PublicParameterizedConstructorWithNonPropertyParameterTestClass.cs index 6fb286f6..66e8caff 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/PublicParametizedConstructorWithNonPropertyParameterTestClass.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/PublicParameterizedConstructorWithNonPropertyParameterTestClass.cs @@ -25,11 +25,11 @@ namespace Newtonsoft.Json.Tests.TestObjects { - public class PublicParametizedConstructorWithNonPropertyParameterTestClass + public class PublicParameterizedConstructorWithNonPropertyParameterTestClass { private readonly string _name; - public PublicParametizedConstructorWithNonPropertyParameterTestClass(string nameParameter) + public PublicParameterizedConstructorWithNonPropertyParameterTestClass(string nameParameter) { _name = nameParameter; } diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/PublicParametizedConstructorWithPropertyNameConflict.cs b/Src/Newtonsoft.Json.Tests/TestObjects/PublicParameterizedConstructorWithPropertyNameConflict.cs similarity index 81% rename from Src/Newtonsoft.Json.Tests/TestObjects/PublicParametizedConstructorWithPropertyNameConflict.cs rename to Src/Newtonsoft.Json.Tests/TestObjects/PublicParameterizedConstructorWithPropertyNameConflict.cs index 14b8c5cd..5bee1a6c 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/PublicParametizedConstructorWithPropertyNameConflict.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/PublicParameterizedConstructorWithPropertyNameConflict.cs @@ -27,11 +27,11 @@ using System; namespace Newtonsoft.Json.Tests.TestObjects { - public class PublicParametizedConstructorWithPropertyNameConflict + public class PublicParameterizedConstructorWithPropertyNameConflict { private readonly int _value; - public PublicParametizedConstructorWithPropertyNameConflict(string name) + public PublicParameterizedConstructorWithPropertyNameConflict(string name) { _value = Convert.ToInt32(name); } @@ -42,11 +42,11 @@ namespace Newtonsoft.Json.Tests.TestObjects } } - public class PublicParametizedConstructorWithPropertyNameConflictWithAttribute + public class PublicParameterizedConstructorWithPropertyNameConflictWithAttribute { private readonly int _value; - public PublicParametizedConstructorWithPropertyNameConflictWithAttribute([JsonProperty("name")] string nameParameter) + public PublicParameterizedConstructorWithPropertyNameConflictWithAttribute([JsonProperty("name")] string nameParameter) { _value = Convert.ToInt32(nameParameter); } diff --git a/Src/Newtonsoft.Json/ConstructorHandling.cs b/Src/Newtonsoft.Json/ConstructorHandling.cs index e403f1e4..2455d61d 100644 --- a/Src/Newtonsoft.Json/ConstructorHandling.cs +++ b/Src/Newtonsoft.Json/ConstructorHandling.cs @@ -31,12 +31,12 @@ namespace Newtonsoft.Json public enum ConstructorHandling { /// - /// First attempt to use the public default constructor, then fall back to single paramatized constructor, then the non-public default constructor. + /// First attempt to use the public default constructor, then fall back to single parameterized constructor, then the non-public default constructor. /// Default = 0, /// - /// Json.NET will use a non-public default constructor before falling back to a paramatized constructor. + /// Json.NET will use a non-public default constructor before falling back to a parameterized constructor. /// AllowNonPublicDefaultConstructor = 1 }