From fca043f043e59f7715a9470ddca1d24bfee3e3ee Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 3 May 2015 21:14:44 +1200 Subject: [PATCH] -Tests --- .../Serialization/ContractResolverTests.cs | 2 +- Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs | 4 ++-- .../TestObjects/MetroPropertyNameResolver.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs index 4a5e2a57..e5893728 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs @@ -81,7 +81,7 @@ namespace Newtonsoft.Json.Tests.Serialization public string PropertyPrefix { get; set; } public string PropertySuffix { get; set; } - protected internal override string ResolvePropertyName(string propertyName) + protected override string ResolvePropertyName(string propertyName) { return base.ResolvePropertyName(PropertyPrefix + propertyName + PropertySuffix); } diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs index 86c57588..509071cb 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs @@ -97,12 +97,12 @@ namespace Newtonsoft.Json.Tests.Serialization { public class DictionaryKeyContractResolver : DefaultContractResolver { - protected internal override string ResolveDictionaryKey(string dictionaryKey) + protected override string ResolveDictionaryKey(string dictionaryKey) { return dictionaryKey; } - protected internal override string ResolvePropertyName(string propertyName) + protected override string ResolvePropertyName(string propertyName) { return propertyName.ToUpper(CultureInfo.InvariantCulture); } diff --git a/Src/Newtonsoft.Json.Tests/TestObjects/MetroPropertyNameResolver.cs b/Src/Newtonsoft.Json.Tests/TestObjects/MetroPropertyNameResolver.cs index d44ed1bd..7db0e3f9 100644 --- a/Src/Newtonsoft.Json.Tests/TestObjects/MetroPropertyNameResolver.cs +++ b/Src/Newtonsoft.Json.Tests/TestObjects/MetroPropertyNameResolver.cs @@ -30,7 +30,7 @@ namespace Newtonsoft.Json.Tests.TestObjects { public class MetroPropertyNameResolver : DefaultContractResolver { - protected internal override string ResolvePropertyName(string propertyName) + protected override string ResolvePropertyName(string propertyName) { #if !(NETFX_CORE || DNXCORE50) return ":::" + propertyName.ToUpper(CultureInfo.InvariantCulture) + ":::";