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

-Tests

Browse Source
This commit is contained in:
James Newton-King
2016-08-09 18:58:22 +12:00
parent ba52ef1b85
commit d6277bf5d8
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
-19
View File
@@ -9563,25 +9563,6 @@ Path '', line 1, position 1.");
}
#endif
#if !(NET20 || PORTABLE || PORTABLE40)
[Test]
public void DeserializeDictionaryOfHashSetsWithTypeNameHandlingAll()
{
var dictionary = new Dictionary<int, HashSet<string>>
{
{ 1, new HashSet<string>(new[] { "test" }) },
};
var jsonSerializerSettings = new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All };
var obtainedJson = JsonConvert.SerializeObject(dictionary, jsonSerializerSettings);
var obtainedDictionary = (Dictionary<int, HashSet<string>>)JsonConvert.DeserializeObject(obtainedJson, jsonSerializerSettings);
Assert.IsNotNull(obtainedDictionary);
}
#endif
#if !(NETFX_CORE || DNXCORE50)
[Test]
public void MailMessageConverterTest()
Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs
+26 -3
View File
@@ -1892,12 +1892,14 @@ namespace Newtonsoft.Json.Tests.Serialization
}
#endif
#if !(NET20 || PORTABLE || PORTABLE40)
[Test]
public void DeserializeDictionary()
public void DeserializeComplexGenericDictionary_Simple()
{
JsonSerializerSettings serializerSettings = new JsonSerializerSettings
{
TypeNameHandling = TypeNameHandling.All
TypeNameHandling = TypeNameHandling.All,
TypeNameAssemblyFormat = FormatterAssemblyStyle.Simple
};
Dictionary<int, HashSet<string>> dictionary = new Dictionary<int, HashSet<string>>
@@ -1911,6 +1913,28 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.IsNotNull(obtainedDictionary);
}
[Test]
public void DeserializeComplexGenericDictionary_Full()
{
JsonSerializerSettings serializerSettings = new JsonSerializerSettings
{
TypeNameHandling = TypeNameHandling.All,
TypeNameAssemblyFormat = FormatterAssemblyStyle.Full
};
Dictionary<int, HashSet<string>> dictionary = new Dictionary<int, HashSet<string>>
{
{ 1, new HashSet<string>(new[] { "test" }) },
};
string obtainedJson = JsonConvert.SerializeObject(dictionary, serializerSettings);
Dictionary<int, HashSet<string>> obtainedDictionary = (Dictionary<int, HashSet<string>>)JsonConvert.DeserializeObject(obtainedJson, serializerSettings);
Assert.IsNotNull(obtainedDictionary);
}
#endif
}
public class DataType
@@ -2183,5 +2207,4 @@ namespace Newtonsoft.Json.Tests.Serialization
}
#endif
}
#endif