Test sending preserialized json from a PersistentConnection

Removed unnecessary/invalid newlines from the request body in MemoryHost #1546
SignalR · Jun 11, 2013 · f8f8eae · f8f8eae
1 parent 4bcda59
commit f8f8eae
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 1 deletion.
diff --git a/src/Microsoft.AspNet.SignalR.Hosting.Memory/MemoryHost.cs b/src/Microsoft.AspNet.SignalR.Hosting.Memory/MemoryHost.cs
@@ -230,7 +230,6 @@ private static Stream GetRequestBody(IDictionary<string, string> postData)
                     writer.Write(item.Key);
                     writer.Write("=");
                     writer.Write(UrlEncoder.UrlEncode(item.Value));
-                    writer.WriteLine();
                     first = false;
                 }
 

diff --git a/.../Microsoft.AspNet.SignalR.FunctionalTests/Server/Connections/PersistentConnectionFacts.cs b/.../Microsoft.AspNet.SignalR.FunctionalTests/Server/Connections/PersistentConnectionFacts.cs
@@ -11,6 +11,7 @@
 using Microsoft.AspNet.SignalR.Tests.Common;
 using Microsoft.AspNet.SignalR.Tests.Common.Infrastructure;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Owin;
 using Xunit;
 using Xunit.Extensions;
@@ -553,6 +554,46 @@ public void SendWithSyncErrorThrows(HostType hostType, TransportType transportTy
             }
         }
 
+        public class ReceiveFacts : HostedTest
+        {
+            [Theory]
+            [InlineData(HostType.Memory, TransportType.ServerSentEvents, MessageBusType.Default)]
+            [InlineData(HostType.Memory, TransportType.ServerSentEvents, MessageBusType.Fake)]
+            [InlineData(HostType.Memory, TransportType.ServerSentEvents, MessageBusType.FakeMultiStream)]
+            [InlineData(HostType.Memory, TransportType.LongPolling, MessageBusType.Default)]
+            [InlineData(HostType.Memory, TransportType.LongPolling, MessageBusType.Fake)]
+            [InlineData(HostType.Memory, TransportType.LongPolling, MessageBusType.FakeMultiStream)]
+            [InlineData(HostType.IISExpress, TransportType.ServerSentEvents, MessageBusType.Default)]
+            [InlineData(HostType.IISExpress, TransportType.LongPolling, MessageBusType.Default)]
+            [InlineData(HostType.IISExpress, TransportType.Websockets, MessageBusType.Default)]
+            public void ReceivePreserializedJson(HostType hostType, TransportType transportType, MessageBusType messageBusType)
+            {
+                using (var host = CreateHost(hostType, transportType))
+                {
+                    host.Initialize(messageBusType: messageBusType);
+
+                    var connection = CreateConnection(host, "/preserialize");
+                    var tcs = new TaskCompletionSource<string>();
+
+                    connection.Received += json =>
+                    {
+                        tcs.TrySetResult(json);
+                    };
+
+                    using (connection)
+                    {
+                        connection.Start(host.Transport).Wait();
+
+                        connection.SendWithTimeout(new { preserialized = true });
+
+                        Assert.True(tcs.Task.Wait(TimeSpan.FromSeconds(5)));
+                        var json = JObject.Parse(tcs.Task.Result);
+                        Assert.True((bool)json["preserialized"]);
+                    }
+                }
+            }
+        }
+
         public class Owin : HostedTest
         {
             [Theory]

diff --git a/tests/Microsoft.AspNet.SignalR.Tests.Common/App_Start/Initializer.cs b/tests/Microsoft.AspNet.SignalR.Tests.Common/App_Start/Initializer.cs
@@ -116,6 +116,7 @@ public static void ConfigureRoutes(IAppBuilder app, IDependencyResolver resolver
             app.MapConnection<AddGroupOnConnectedConnection>("add-group", config);
             app.MapConnection<UnusableProtectedConnection>("protected", config);
             app.MapConnection<FallbackToLongPollingConnection>("/fall-back", config);
+            app.MapConnection<PreserializedJsonConnection>("preserialize", config);
 
             // This subpipeline is protected by basic auth
             app.MapPath("/basicauth", subApp =>

diff --git a/tests/Microsoft.AspNet.SignalR.Tests.Common/Connections/PreserializedJsonConnection.cs b/tests/Microsoft.AspNet.SignalR.Tests.Common/Connections/PreserializedJsonConnection.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNet.SignalR.Tests.Common.Connections
+{
+    public class PreserializedJsonConnection : PersistentConnection
+    {
+        protected override Task OnReceived(IRequest request, string connectionId, string data)
+        {
+            var jsonBytes = new ArraySegment<byte>(Encoding.UTF8.GetBytes(data));
+            return Connection.Send(connectionId, jsonBytes);
+        }
+    }
+}
diff --git a/tests/Microsoft.AspNet.SignalR.Tests.Common/Microsoft.AspNet.SignalR.Tests.Common.csproj b/tests/Microsoft.AspNet.SignalR.Tests.Common/Microsoft.AspNet.SignalR.Tests.Common.csproj
@@ -124,6 +124,7 @@
     <Compile Include="Connections\AuthenticatedEchoConnection.cs" />
     <Compile Include="Connections\ExamineHeadersConnection.cs" />
     <Compile Include="Connections\ExamineReconnectPath.cs" />
+    <Compile Include="Connections\PreserializedJsonConnection.cs" />
     <Compile Include="Handlers\GCHandler.cs" />
     <Compile Include="Handlers\PingHandler.cs" />
     <Compile Include="Build\StartIISTask.cs" />