huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'rel/2.0.0-preview1' into dev

This commit is contained in:
Pawel Kadluczka 2017-05-05 17:11:55 -07:00
parent ee2e9b0ca4 c053b8cd9d
commit 9d07eeef91
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/Microsoft.AspNetCore.SignalR.Tests/DefaultTransportFactoryTests.cs
View File

@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
Assert.Equal(exception.ParamName, "httpClient"); Assert.Equal(exception.ParamName, "httpClient");
} }
[Theory] [ConditionalTheory]
[InlineData(TransportType.WebSockets, typeof(WebSocketsTransport))] [InlineData(TransportType.WebSockets, typeof(WebSocketsTransport))]
[InlineData(TransportType.ServerSentEvents, typeof(ServerSentEventsTransport))] [InlineData(TransportType.ServerSentEvents, typeof(ServerSentEventsTransport))]
[InlineData(TransportType.LongPolling, typeof(LongPollingTransport))] [InlineData(TransportType.LongPolling, typeof(LongPollingTransport))]
@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
Assert.Equal("No requested transports available on the server.", ex.Message); Assert.Equal("No requested transports available on the server.", ex.Message);
} }
[Fact] [ConditionalFact]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2, SkipReason = "No WebSockets Client for this platform")] [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2, SkipReason = "No WebSockets Client for this platform")]
public void DefaultTransportFactoryCreatesWebSocketsTransportIfAvailable() public void DefaultTransportFactoryCreatesWebSocketsTransportIfAvailable()
{ {
@ -68,7 +68,8 @@ namespace Microsoft.AspNetCore.SignalR.Tests
} }
[Theory] [Theory]
[InlineData(TransportType.WebSockets, typeof(ServerSentEventsTransport))] [InlineData(TransportType.All, typeof(ServerSentEventsTransport))]
[InlineData(TransportType.ServerSentEvents, typeof(ServerSentEventsTransport))]
[InlineData(TransportType.LongPolling, typeof(LongPollingTransport))] [InlineData(TransportType.LongPolling, typeof(LongPollingTransport))]
public void DefaultTransportFactoryCreatesRequestedTransportIfAvailable_Win7(TransportType requestedTransport, Type expectedTransportType) public void DefaultTransportFactoryCreatesRequestedTransportIfAvailable_Win7(TransportType requestedTransport, Type expectedTransportType)
{ {
@ -80,6 +81,21 @@ namespace Microsoft.AspNetCore.SignalR.Tests
} }
} }
[Theory]
[InlineData(TransportType.WebSockets)]
public void DefaultTransportFactoryThrowsIfItCannotCreateRequestedTransport_Win7(TransportType requestedTransport)
{
if (!WebsocketsSupported())
{
var transportFactory =
new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient());
var ex = Assert.Throws<InvalidOperationException>(
() => transportFactory.CreateTransport(TransportType.All));
Assert.Equal("No requested transports available on the server.", ex.Message);
}
}
private bool WebsocketsSupported() private bool WebsocketsSupported()
{ {
try try