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

Merge branch 'rel/1.0.0-alpha1' into dev

This commit is contained in:
Pawel Kadluczka 2017-09-13 13:55:06 -07:00
parent 11cc57ee0e d226b20756
commit b093f2b279
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNetCore.SignalR.Client/HubConnectionBuilderHttpExtensions.cs
View File

@ -33,14 +33,14 @@ namespace Microsoft.AspNetCore.SignalR.Client
hubConnectionBuilder.ConfigureConnectionFactory(() => hubConnectionBuilder.ConfigureConnectionFactory(() =>
{ {
return new HttpConnection(url, return new HttpConnection(url,
hubConnectionBuilder.GetTransportType(), hubConnectionBuilder.GetTransport(),
hubConnectionBuilder.GetLoggerFactory(), hubConnectionBuilder.GetLoggerFactory(),
hubConnectionBuilder.GetMessageHandler()); hubConnectionBuilder.GetMessageHandler());
}); });
return hubConnectionBuilder; return hubConnectionBuilder;
} }
public static IHubConnectionBuilder WithTransportType(this IHubConnectionBuilder hubConnectionBuilder, TransportType transportType) public static IHubConnectionBuilder WithTransport(this IHubConnectionBuilder hubConnectionBuilder, TransportType transportType)
{ {
hubConnectionBuilder.AddSetting(TransportTypeKey, transportType); hubConnectionBuilder.AddSetting(TransportTypeKey, transportType);
return hubConnectionBuilder; return hubConnectionBuilder;
@ -52,7 +52,7 @@ namespace Microsoft.AspNetCore.SignalR.Client
return hubConnectionBuilder; return hubConnectionBuilder;
} }
public static TransportType GetTransportType(this IHubConnectionBuilder hubConnectionBuilder) public static TransportType GetTransport(this IHubConnectionBuilder hubConnectionBuilder)
{ {
if (hubConnectionBuilder.TryGetSetting<TransportType>(TransportTypeKey, out var transportType)) if (hubConnectionBuilder.TryGetSetting<TransportType>(TransportTypeKey, out var transportType))
{ {

2
test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs
View File

@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
{ {
var connection = new HubConnectionBuilder() var connection = new HubConnectionBuilder()
.WithUrl(_serverFixture.BaseUrl + path) .WithUrl(_serverFixture.BaseUrl + path)
.WithTransportType(transportType) .WithTransport(transportType)
.WithLoggerFactory(loggerFactory) .WithLoggerFactory(loggerFactory)
.WithHubProtocol(protocol) .WithHubProtocol(protocol)
.Build(); .Build();

6
test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionBuilderExtensionsTests.cs
View File

@ -71,11 +71,11 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
[InlineData(TransportType.WebSockets)] [InlineData(TransportType.WebSockets)]
[InlineData(TransportType.ServerSentEvents)] [InlineData(TransportType.ServerSentEvents)]
[InlineData(TransportType.LongPolling)] [InlineData(TransportType.LongPolling)]
public void WithTransportTypeRegistersGivenTransportType(TransportType transportType) public void WithTransportRegistersGivenTransportType(TransportType transportType)
{ {
var connectionBuilder = new HubConnectionBuilder(); var connectionBuilder = new HubConnectionBuilder();
connectionBuilder.WithTransportType(transportType); connectionBuilder.WithTransport(transportType);
Assert.Equal(transportType, connectionBuilder.GetTransportType()); Assert.Equal(transportType, connectionBuilder.GetTransport());
} }
} }
} }

2
test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs
View File

@ -286,7 +286,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
var connection = new HubConnectionBuilder() var connection = new HubConnectionBuilder()
.WithUrl(new Uri(url)) .WithUrl(new Uri(url))
.WithTransportType(transportType) .WithTransport(transportType)
.WithLoggerFactory(loggerFactory) .WithLoggerFactory(loggerFactory)
.Build(); .Build();
try try