-Fixed serializing ConcurrentDictionary in .NET Core 2.0

-Fixed serializing ConcurrentStack/Queue/Bag
This commit is contained in:
James Newton-King
2017-04-26 15:23:28 +12:00
parent b3d514b617
commit 8eecadd0ef
3 changed files with 74 additions and 15 deletions
@@ -25,11 +25,9 @@
using System;
using System.Collections;
using System.Collections.Concurrent;
using System.Collections.Specialized;
using System.Runtime.Serialization;
#if !(NET35 || NET20 || PORTABLE || PORTABLE40)
using System.Collections.Concurrent;
#endif
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Globalization;
@@ -63,6 +61,53 @@ namespace Newtonsoft.Json.Tests.Serialization
[TestFixture]
public class JsonSerializerCollectionsTests : TestFixtureBase
{
#if !(NET20 || NET35)
[Test]
public void SerializeConcurrentQueue()
{
ConcurrentQueue<int> queue1 = new ConcurrentQueue<int>();
queue1.Enqueue(1);
string output = JsonConvert.SerializeObject(queue1);
Assert.AreEqual(@"[1]", output);
ConcurrentQueue<int> queue2 = JsonConvert.DeserializeObject<ConcurrentQueue<int>>(output);
int i;
Assert.IsTrue(queue2.TryDequeue(out i));
Assert.AreEqual(1, i);
}
[Test]
public void SerializeConcurrentBag()
{
ConcurrentBag<int> bag1 = new ConcurrentBag<int>();
bag1.Add(1);
string output = JsonConvert.SerializeObject(bag1);
Assert.AreEqual(@"[1]", output);
ConcurrentBag<int> bag2 = JsonConvert.DeserializeObject<ConcurrentBag<int>>(output);
int i;
Assert.IsTrue(bag2.TryTake(out i));
Assert.AreEqual(1, i);
}
[Test]
public void SerializeConcurrentStack()
{
ConcurrentStack<int> stack1 = new ConcurrentStack<int>();
stack1.Push(1);
string output = JsonConvert.SerializeObject(stack1);
Assert.AreEqual(@"[1]", output);
ConcurrentStack<int> stack2 = JsonConvert.DeserializeObject<ConcurrentStack<int>>(output);
int i;
Assert.IsTrue(stack2.TryPop(out i));
Assert.AreEqual(1, i);
}
#endif
[Test]
public void DoubleKey_WholeValue()
{