-Fixed deserializing Regex when using StringEnumConverter

-Fixed serializing and deserializing typed DataSets
This commit is contained in:
James Newton-King
2013-05-04 15:28:01 +12:00
parent b6816866ba
commit 6f2b931a90
22 changed files with 393 additions and 39 deletions
@@ -258,5 +258,88 @@ namespace Newtonsoft.Json.Tests.Serialization
}", includeCompilerGeneratedJson);
}
#endif
//public class NullAsStringValueProvider : IValueProvider
//{
// private readonly ReflectionValueProvider _internalProvider;
// public NullAsStringValueProvider(MemberInfo memberInfo)
// {
// _internalProvider = new ReflectionValueProvider(memberInfo);
// }
// public void SetValue(object target, object value)
// {
// _internalProvider.SetValue(target, value);
// }
// public object GetValue(object target)
// {
// object value = _internalProvider.GetValue(target);
// if (value == null)
// return string.Empty;
// return value;
// }
//}
//public class NullAsStringContractResolver : DefaultContractResolver
//{
// protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
// {
// JsonProperty property = base.CreateProperty(member, memberSerialization);
// //property.ValueProvider = new NullAsStringValueProvider(member);
// //property..Converter = new NullAsStringJsonConverter();
// return property;
// }
// protected override JsonPrimitiveContract CreatePrimitiveContract(Type objectType)
// {
// return base.CreatePrimitiveContract(objectType);
// }
//}
//public class NullAsStringTestClass
//{
// public int? Integer { get; set; }
// public DateTime? DateTime { get; set; }
//}
//public class NullAsStringJsonConverter : JsonConverter
//{
// public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
// {
// if (value == null)
// writer.WriteValue(string.Empty);
// }
// public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
// {
// throw new NotImplementedException();
// }
// public override bool CanRead
// {
// get { return false; }
// }
// public override bool CanConvert(Type objectType)
// {
// return ReflectionUtils.IsNullableType(objectType);
// }
//}
//[Test]
//public void sdfsdf()
//{
// string json = JsonConvert.SerializeObject(
// new NullAsStringTestClass(),
// new JsonSerializerSettings { ContractResolver = new NullAsStringContractResolver()});
// Console.WriteLine(json);
//}
}
}
@@ -40,6 +40,7 @@ using System.Threading;
using System.Web.Script.Serialization;
#endif
using System.Text;
using System.Text.RegularExpressions;
#if !NETFX_CORE
using NUnit.Framework;
#else
@@ -158,6 +159,19 @@ namespace Newtonsoft.Json.Tests.Serialization
}
}
[Test]
public void SerializeDeserializeRegex()
{
Regex regex = new Regex("(hi)", RegexOptions.CultureInvariant);
string json = JsonConvert.SerializeObject(regex, Formatting.Indented);
Regex r2 = JsonConvert.DeserializeObject<Regex>(json);
Assert.AreEqual("(hi)", r2.ToString());
Assert.AreEqual(RegexOptions.CultureInvariant, r2.Options);
}
[Test]
public void ExtensionDataTest()
{