fix #273 by grouping websocket tests (#278)

test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.ConnectionLifecycle.cs

@@ -13,8 +13,6 @@ using Xunit;
 namespace Microsoft.Extensions.WebSockets.Internal.Tests
 {
     public partial class WebSocketConnectionTests
-    {
-        public class ConnectionLifecycle
     {
         [Fact]
         public async Task SendReceiveFrames()
@@ -167,5 +165,4 @@ namespace Microsoft.Extensions.WebSockets.Internal.Tests
             }
         }
     }
-    }
 }

test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.PingPong.cs

@@ -1,24 +1,20 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.SignalR.Tests.Common;
 using System;
 using System.Globalization;
 using System.IO.Pipelines;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR.Tests.Common;
 using Xunit;
-using Microsoft.AspNetCore.Testing.xunit;
 
 namespace Microsoft.Extensions.WebSockets.Internal.Tests
 {
     public partial class WebSocketConnectionTests
     {
-        public class PingPongBehavior
+        [Fact]
-        {
-            [ConditionalFact]
-            [SkipIfEnvVarPresent("TRAVIS", "This test times out a lot on Travis because of slow performance/threading issues")]
         public async Task AutomaticPingTransmission()
         {
             var startTime = DateTime.UtcNow;
@@ -103,5 +99,4 @@ namespace Microsoft.Extensions.WebSockets.Internal.Tests
             }
         }
     }
-    }
 }

test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.ProtocolErrors.cs

@@ -11,8 +11,6 @@ using Xunit;
 namespace Microsoft.Extensions.WebSockets.Internal.Tests
 {
     public partial class WebSocketConnectionTests
-    {
-        public class ProtocolErrors
     {
         [Theory]
         [InlineData(new byte[] { 0x11, 0x00 })]
@@ -245,5 +243,4 @@ namespace Microsoft.Extensions.WebSockets.Internal.Tests
             }
         }
     }
-    }
 }

test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.ReceiveAsync.cs

@@ -12,8 +12,6 @@ using Xunit;
 namespace Microsoft.Extensions.WebSockets.Internal.Tests
 {
     public partial class WebSocketConnectionTests
-    {
-        public class TheReceiveAsyncMethod
     {
         [Theory]
         [InlineData(new byte[] { 0x81, 0x00 }, "", true)]
@@ -191,7 +189,6 @@ namespace Microsoft.Extensions.WebSockets.Internal.Tests
             Assert.Equal(expectedOpcode, frame.Opcode);
             payloadAssert(frame.Payload.ToArray());
         }
-        }
 
         private static async Task<WebSocketConnectionSummary> RunReceiveTest(Func<IPipeWriter, CancellationToken, Task> producer)
         {

test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.SendAsync.cs

@@ -12,8 +12,6 @@ using Xunit;
 namespace Microsoft.Extensions.WebSockets.Internal.Tests
 {
     public partial class WebSocketConnectionTests
-    {
-        public class TheSendAsyncMethod
     {
         // No auto-pinging for us!
         private readonly static WebSocketOptions DefaultTestOptions = new WebSocketOptions().WithAllFramesPassedThrough();
@@ -205,5 +203,4 @@ namespace Microsoft.Extensions.WebSockets.Internal.Tests
             }
         }
     }
-    }
 }

test/Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketConnectionTests.Utf8Validation.cs

@@ -11,8 +11,6 @@ using Xunit;
 namespace Microsoft.Extensions.WebSockets.Internal.Tests
 {
     public partial class WebSocketConnectionTests
-    {
-        public class Utf8Validation
     {
         [Theory]
         [InlineData(new byte[] { 0x48, 0x65, 0x6C, 0x6C, 0x6F }, "Hello")]
@@ -223,5 +221,4 @@ namespace Microsoft.Extensions.WebSockets.Internal.Tests
             }
         }
     }
-    }
 }