-Added generic JsonConvert.SerializeObject methods
-Fixed JToken.ToObject not using StringEnumConverter on enums
This commit is contained in:
@@ -45,6 +45,9 @@ using NUnit.Framework;
|
||||
#endif
|
||||
using Newtonsoft.Json;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Net.Sockets;
|
||||
using System.Threading;
|
||||
#if NET20
|
||||
using Newtonsoft.Json.Utilities.LinqBridge;
|
||||
#else
|
||||
@@ -3452,6 +3455,73 @@ null//comment
|
||||
Assert.IsFalse(r.Read());
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !DNXCORE50
|
||||
[Test]
|
||||
[Ignore]
|
||||
public void ReadFromNetworkStream()
|
||||
{
|
||||
const int port = 11999;
|
||||
const int jsonArrayElementsCount = 193;
|
||||
|
||||
var serverStartedEvent = new ManualResetEvent(false);
|
||||
var clientReceivedEvent = new ManualResetEvent(false);
|
||||
|
||||
#region server
|
||||
ThreadPool.QueueUserWorkItem(work =>
|
||||
{
|
||||
var server = new TcpListener(IPAddress.Parse("0.0.0.0"), port);
|
||||
server.Start();
|
||||
|
||||
serverStartedEvent.Set();
|
||||
|
||||
var serverSocket = server.AcceptSocket();
|
||||
|
||||
var jsonString = "[\r\n" + String.Join(",", Enumerable.Repeat(" \"testdata\"\r\n", jsonArrayElementsCount).ToArray()) + "]";
|
||||
var bytes = new UTF8Encoding().GetBytes(jsonString);
|
||||
serverSocket.Send(bytes);
|
||||
Console.WriteLine("server send: " + bytes.Length);
|
||||
|
||||
|
||||
clientReceivedEvent.WaitOne();
|
||||
|
||||
});
|
||||
#endregion
|
||||
|
||||
serverStartedEvent.WaitOne();
|
||||
|
||||
|
||||
var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
|
||||
socket.Blocking = false;
|
||||
socket.Connect("127.0.0.1", port);
|
||||
|
||||
var stream = new NetworkStream(socket);
|
||||
var serializer = new JsonSerializer();
|
||||
|
||||
int i = 0;
|
||||
using (var sr = new StreamReader(stream, new UTF8Encoding(), false))
|
||||
using (var jsonTextReader = new JsonTextReader(sr))
|
||||
{
|
||||
while (jsonTextReader.Read())
|
||||
{
|
||||
i++;
|
||||
|
||||
if (i == 193)
|
||||
{
|
||||
string s = string.Empty;
|
||||
}
|
||||
|
||||
Console.WriteLine($"{i} - {jsonTextReader.TokenType} - {jsonTextReader.Value}");
|
||||
}
|
||||
//var result = serializer.Deserialize(jsonTextReader).ToString();
|
||||
//Console.WriteLine("client receive: " + new UTF8Encoding().GetBytes(result).Length);
|
||||
}
|
||||
|
||||
clientReceivedEvent.Set();
|
||||
|
||||
Console.WriteLine("Done");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
public class ToggleReaderError : TextReader
|
||||
|
||||
Reference in New Issue
Block a user