LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Fixed tests

Browse Source
This commit is contained in:
James Newton-King
2013-05-08 20:26:32 +12:00
parent f4d5ace26d
commit 32f326e46a
2 changed files with 18 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json.Tests/JsonConvertTest.cs
+18 -11
View File
@@ -80,13 +80,15 @@ namespace Newtonsoft.Json.Tests
[Test]
public void DefaultSettings_Example()
{
JsonConvert.DefaultSettings = () => new JsonSerializerSettings
try
{
JsonConvert.DefaultSettings = () => new JsonSerializerSettings
{
Formatting = Formatting.Indented,
ContractResolver = new CamelCasePropertyNamesContractResolver()
};
Employee e = new Employee
Employee e = new Employee
{
FirstName = "Eric",
LastName = "Example",
@@ -95,22 +97,27 @@ namespace Newtonsoft.Json.Tests
JobTitle = "Web Dude"
};
string json = JsonConvert.SerializeObject(e);
// {
// "firstName": "Eric",
// "lastName": "Example",
// "birthDate": "1980-04-20T00:00:00Z",
// "department": "IT",
// "jobTitle": "Web Dude"
// }
string json = JsonConvert.SerializeObject(e);
// {
// "firstName": "Eric",
// "lastName": "Example",
// "birthDate": "1980-04-20T00:00:00Z",
// "department": "IT",
// "jobTitle": "Web Dude"
// }
Assert.AreEqual(@"{
Assert.AreEqual(@"{
""firstName"": ""Eric"",
""lastName"": ""Example"",
""birthDate"": ""1980-04-20T00:00:00Z"",
""department"": ""IT"",
""jobTitle"": ""Web Dude""
}", json);
}
finally
{
JsonConvert.DefaultSettings = null;
}
}
[Test]
Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs
-83
View File
@@ -258,88 +258,5 @@ 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);
//}
}
}