-Fixed Win8 build

-Fixed serializing ObservableCollection<T> on Win8
This commit is contained in:
James Newton-King
2014-08-30 14:34:16 +12:00
parent 57ccaf00bf
commit 695742563b
5 changed files with 36 additions and 10 deletions
@@ -791,10 +791,10 @@ namespace Newtonsoft.Json.Tests.Linq
StringComparison e5 = v.ToObject<StringComparison>();
Assert.AreEqual(StringComparison.Ordinal, e5);
v = new JValue((int)StringComparison.InvariantCultureIgnoreCase);
v = new JValue((int)StringComparison.OrdinalIgnoreCase);
Assert.AreEqual(JTokenType.Integer, v.Type);
StringComparison e6 = v.ToObject<StringComparison>();
Assert.AreEqual(StringComparison.InvariantCultureIgnoreCase, e6);
Assert.AreEqual(StringComparison.OrdinalIgnoreCase, e6);
}
#endif
}
@@ -127,6 +127,17 @@ namespace Newtonsoft.Json.Tests.Serialization
}
#endif
#if !NET20
[Test]
public void DeserializeObservableCollection()
{
ObservableCollection<string> s = JsonConvert.DeserializeObject<ObservableCollection<string>>("['1','2']");
Assert.AreEqual(2, s.Count);
Assert.AreEqual("1", s[0]);
Assert.AreEqual("2", s[1]);
}
#endif
#if !NET20
[Test]
public void PopulateResetSettings()