Removed unrelated test and codes

This commit is contained in:
Zoltán Tamási
2018-01-15 15:27:13 +01:00
parent 5f2f5fd7b0
commit 92833289a0
+15 -48
View File
@@ -58,21 +58,6 @@ namespace Newtonsoft.Json.Tests.Issues
Assert.AreEqual(result.Items[0], 11); Assert.AreEqual(result.Items[0], 11);
} }
[Test]
public void Test2()
{
var settings = new JsonSerializerSettings()
{
Converters = new[] { new OneItemListJsonConverter() }
};
var result = JsonConvert.DeserializeObject<List<int>>("'11'", settings);
Assert.IsNotNull(result);
Assert.AreEqual(result.Count, 1);
Assert.AreEqual(result[0], 11);
}
public class TestClass public class TestClass
{ {
public List<int> Items { get; } = new List<int>(); public List<int> Items { get; } = new List<int>();
@@ -104,50 +89,32 @@ namespace Newtonsoft.Json.Tests.Issues
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{ {
var recursionBlocked = false; var token = JToken.Load(reader);
var converter = serializer.Converters.OfType<OneItemListJsonConverter>().FirstOrDefault(); if (token.Type == JTokenType.Array)
if (converter != null)
{ {
serializer.Converters.Remove(converter); return token.ToObject(objectType, serializer);
recursionBlocked = true;
} }
try var array = new JArray();
array.Add(token);
var list = array.ToObject(objectType, serializer) as IEnumerable;
var existing = existingValue as IList;
if (list != null && existing != null)
{ {
var token = JToken.Load(reader); foreach (var item in list)
if (token.Type == JTokenType.Array)
{ {
return token.ToObject(objectType, serializer); existing.Add(item);
}
var array = new JArray();
array.Add(token);
var list = array.ToObject(objectType, serializer) as IEnumerable;
var existing = existingValue as IList;
if (list != null && existing != null)
{
foreach (var item in list)
{
existing.Add(item);
}
}
return list;
}
finally
{
if (recursionBlocked)
{
serializer.Converters.Add(converter);
} }
} }
return list;
} }
public override bool CanConvert(Type objectType) public override bool CanConvert(Type objectType)
{ {
return typeof(IEnumerable).IsAssignableFrom(objectType) && objectType != typeof(string); return typeof(ICollection).IsAssignableFrom(objectType);
} }
} }