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

Rename TransportTypes to HttpTransportTypes (#1839)

This commit is contained in:
Mikael Mengistu 2018-04-03 16:00:20 -07:00 committed by GitHub
parent 5e38303377
commit ba0131a731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 223 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/ts/FunctionalTests/Startup.cs
View File

@ -91,7 +91,7 @@ namespace FunctionalTests
app.UseSignalR(routes => app.UseSignalR(routes =>
{ {
routes.MapHub<TestHub>("/testhub"); routes.MapHub<TestHub>("/testhub");
routes.MapHub<TestHub>("/testhub-nowebsockets", options => options.Transports = TransportType.ServerSentEvents | TransportType.LongPolling); routes.MapHub<TestHub>("/testhub-nowebsockets", options => options.Transports = HttpTransportType.ServerSentEvents | HttpTransportType.LongPolling);
routes.MapHub<UncreatableHub>("/uncreatable"); routes.MapHub<UncreatableHub>("/uncreatable");
routes.MapHub<HubWithAuthorization>("/authorizedhub"); routes.MapHub<HubWithAuthorization>("/authorizedhub");
}); });

10
samples/JwtClientSample/Program.cs
View File

@ -16,9 +16,9 @@ namespace JwtClientSample
{ {
var app = new Program(); var app = new Program();
await Task.WhenAll( await Task.WhenAll(
app.RunConnection(TransportType.WebSockets), app.RunConnection(HttpTransportType.WebSockets),
app.RunConnection(TransportType.ServerSentEvents), app.RunConnection(HttpTransportType.ServerSentEvents),
app.RunConnection(TransportType.LongPolling)); app.RunConnection(HttpTransportType.LongPolling));
} }
private const string ServerUrl = "http://localhost:54543"; private const string ServerUrl = "http://localhost:54543";
@ -26,7 +26,7 @@ namespace JwtClientSample
private readonly ConcurrentDictionary<string, string> _tokens = new ConcurrentDictionary<string, string>(); private readonly ConcurrentDictionary<string, string> _tokens = new ConcurrentDictionary<string, string>();
private readonly Random _random = new Random(); private readonly Random _random = new Random();
private async Task RunConnection(TransportType transportType) private async Task RunConnection(HttpTransportType transportType)
{ {
var userId = "C#" + transportType.ToString(); var userId = "C#" + transportType.ToString();
_tokens[userId] = await GetJwtToken(userId); _tokens[userId] = await GetJwtToken(userId);
@ -56,7 +56,7 @@ namespace JwtClientSample
if (ticks % 15 == 0) if (ticks % 15 == 0)
{ {
// no need to refresh the token for websockets // no need to refresh the token for websockets
if (transportType != TransportType.WebSockets) if (transportType != HttpTransportType.WebSockets)
{ {
_tokens[userId] = await GetJwtToken(userId); _tokens[userId] = await GetJwtToken(userId);
Console.WriteLine($"[{userId}] Token refreshed"); Console.WriteLine($"[{userId}] Token refreshed");

16
src/Microsoft.AspNetCore.Http.Connections.Client/DefaultTransportFactory.cs
View File

@ -14,18 +14,18 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
{ {
private readonly HttpClient _httpClient; private readonly HttpClient _httpClient;
private readonly HttpOptions _httpOptions; private readonly HttpOptions _httpOptions;
private readonly TransportType _requestedTransportType; private readonly HttpTransportType _requestedTransportType;
private readonly ILoggerFactory _loggerFactory; private readonly ILoggerFactory _loggerFactory;
private static volatile bool _websocketsSupported = true; private static volatile bool _websocketsSupported = true;
public DefaultTransportFactory(TransportType requestedTransportType, ILoggerFactory loggerFactory, HttpClient httpClient, HttpOptions httpOptions) public DefaultTransportFactory(HttpTransportType requestedTransportType, ILoggerFactory loggerFactory, HttpClient httpClient, HttpOptions httpOptions)
{ {
if (requestedTransportType <= 0 || requestedTransportType > TransportType.All) if (requestedTransportType <= 0 || requestedTransportType > HttpTransportType.All)
{ {
throw new ArgumentOutOfRangeException(nameof(requestedTransportType)); throw new ArgumentOutOfRangeException(nameof(requestedTransportType));
} }
if (httpClient == null && requestedTransportType != TransportType.WebSockets) if (httpClient == null && requestedTransportType != HttpTransportType.WebSockets)
{ {
throw new ArgumentNullException(nameof(httpClient)); throw new ArgumentNullException(nameof(httpClient));
} }
@ -36,9 +36,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
_httpOptions = httpOptions; _httpOptions = httpOptions;
} }
public ITransport CreateTransport(TransportType availableServerTransports) public ITransport CreateTransport(HttpTransportType availableServerTransports)
{ {
if (_websocketsSupported && (availableServerTransports & TransportType.WebSockets & _requestedTransportType) == TransportType.WebSockets) if (_websocketsSupported && (availableServerTransports & HttpTransportType.WebSockets & _requestedTransportType) == HttpTransportType.WebSockets)
{ {
try try
{ {
@ -50,12 +50,12 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
} }
} }
if ((availableServerTransports & TransportType.ServerSentEvents & _requestedTransportType) == TransportType.ServerSentEvents) if ((availableServerTransports & HttpTransportType.ServerSentEvents & _requestedTransportType) == HttpTransportType.ServerSentEvents)
{ {
return new ServerSentEventsTransport(_httpClient, _loggerFactory); return new ServerSentEventsTransport(_httpClient, _loggerFactory);
} }
if ((availableServerTransports & TransportType.LongPolling & _requestedTransportType) == TransportType.LongPolling) if ((availableServerTransports & HttpTransportType.LongPolling & _requestedTransportType) == HttpTransportType.LongPolling)
{ {
return new LongPollingTransport(_httpClient, _loggerFactory); return new LongPollingTransport(_httpClient, _loggerFactory);
} }

8
src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnection.Log.cs
View File

@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
_disposed(logger, null); _disposed(logger, null);
} }
public static void StartingTransport(ILogger logger, TransportType transportType, Uri url) public static void StartingTransport(ILogger logger, HttpTransportType transportType, Uri url)
{ {
if (logger.IsEnabled(LogLevel.Debug)) if (logger.IsEnabled(LogLevel.Debug))
{ {
@ -131,7 +131,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
_transportNotSupported(logger, transport, null); _transportNotSupported(logger, transport, null);
} }
public static void TransportDoesNotSupportTransferFormat(ILogger logger, TransportType transport, TransferFormat transferFormat) public static void TransportDoesNotSupportTransferFormat(ILogger logger, HttpTransportType transport, TransferFormat transferFormat)
{ {
if (logger.IsEnabled(LogLevel.Debug)) if (logger.IsEnabled(LogLevel.Debug))
{ {
@ -139,7 +139,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
} }
} }
public static void TransportDisabledByClient(ILogger logger, TransportType transport) public static void TransportDisabledByClient(ILogger logger, HttpTransportType transport)
{ {
if (logger.IsEnabled(LogLevel.Debug)) if (logger.IsEnabled(LogLevel.Debug))
{ {
@ -147,7 +147,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
} }
} }
public static void TransportFailed(ILogger logger, TransportType transport, Exception ex) public static void TransportFailed(ILogger logger, HttpTransportType transport, Exception ex)
{ {
if (logger.IsEnabled(LogLevel.Debug)) if (logger.IsEnabled(LogLevel.Debug))
{ {

22
src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnection.cs
View File

@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
private ITransport _transport; private ITransport _transport;
private readonly ITransportFactory _transportFactory; private readonly ITransportFactory _transportFactory;
private string _connectionId; private string _connectionId;
private readonly TransportType _requestedTransportType = TransportType.All; private readonly HttpTransportType _requestedTransportType = HttpTransportType.All;
private readonly ConnectionLogScope _logScope; private readonly ConnectionLogScope _logScope;
private readonly IDisposable _scopeDisposable; private readonly IDisposable _scopeDisposable;
private readonly ILoggerFactory _loggerFactory; private readonly ILoggerFactory _loggerFactory;
@ -60,25 +60,25 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
public IFeatureCollection Features { get; } = new FeatureCollection(); public IFeatureCollection Features { get; } = new FeatureCollection();
public HttpConnection(Uri url) public HttpConnection(Uri url)
: this(url, TransportType.All) : this(url, HttpTransportType.All)
{ } { }
public HttpConnection(Uri url, TransportType transportType) public HttpConnection(Uri url, HttpTransportType transportType)
: this(url, transportType, loggerFactory: null) : this(url, transportType, loggerFactory: null)
{ {
} }
public HttpConnection(Uri url, ILoggerFactory loggerFactory) public HttpConnection(Uri url, ILoggerFactory loggerFactory)
: this(url, TransportType.All, loggerFactory, httpOptions: null) : this(url, HttpTransportType.All, loggerFactory, httpOptions: null)
{ {
} }
public HttpConnection(Uri url, TransportType transportType, ILoggerFactory loggerFactory) public HttpConnection(Uri url, HttpTransportType transportType, ILoggerFactory loggerFactory)
: this(url, transportType, loggerFactory, httpOptions: null) : this(url, transportType, loggerFactory, httpOptions: null)
{ {
} }
public HttpConnection(Uri url, TransportType transportType, ILoggerFactory loggerFactory, HttpOptions httpOptions) public HttpConnection(Uri url, HttpTransportType transportType, ILoggerFactory loggerFactory, HttpOptions httpOptions)
{ {
Url = url ?? throw new ArgumentNullException(nameof(url)); Url = url ?? throw new ArgumentNullException(nameof(url));
_loggerFactory = loggerFactory ?? NullLoggerFactory.Instance; _loggerFactory = loggerFactory ?? NullLoggerFactory.Instance;
@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
_httpOptions = httpOptions; _httpOptions = httpOptions;
_requestedTransportType = transportType; _requestedTransportType = transportType;
if (_requestedTransportType != TransportType.WebSockets) if (_requestedTransportType != HttpTransportType.WebSockets)
{ {
_httpClient = CreateHttpClient(); _httpClient = CreateHttpClient();
} }
@ -205,7 +205,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
private async Task SelectAndStartTransport(TransferFormat transferFormat) private async Task SelectAndStartTransport(TransferFormat transferFormat)
{ {
if (_requestedTransportType == TransportType.WebSockets) if (_requestedTransportType == HttpTransportType.WebSockets)
{ {
Log.StartingTransport(_logger, _requestedTransportType, Url); Log.StartingTransport(_logger, _requestedTransportType, Url);
await StartTransport(Url, _requestedTransportType, transferFormat); await StartTransport(Url, _requestedTransportType, transferFormat);
@ -224,13 +224,13 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
foreach (var transport in negotiationResponse.AvailableTransports) foreach (var transport in negotiationResponse.AvailableTransports)
{ {
if (!Enum.TryParse<TransportType>(transport.Transport, out var transportType)) if (!Enum.TryParse<HttpTransportType>(transport.Transport, out var transportType))
{ {
Log.TransportNotSupported(_logger, transport.Transport); Log.TransportNotSupported(_logger, transport.Transport);
continue; continue;
} }
if (transportType == TransportType.WebSockets && !IsWebSocketsSupported()) if (transportType == HttpTransportType.WebSockets && !IsWebSocketsSupported())
{ {
Log.WebSocketsNotSupportedByOperatingSystem(_logger); Log.WebSocketsNotSupportedByOperatingSystem(_logger);
continue; continue;
@ -328,7 +328,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
return Utils.AppendQueryString(url, "id=" + connectionId); return Utils.AppendQueryString(url, "id=" + connectionId);
} }
private async Task StartTransport(Uri connectUrl, TransportType transportType, TransferFormat transferFormat) private async Task StartTransport(Uri connectUrl, HttpTransportType transportType, TransferFormat transferFormat)
{ {
// Create the pipe pair (Application's writer is connected to Transport's reader, and vice versa) // Create the pipe pair (Application's writer is connected to Transport's reader, and vice versa)
var options = new PipeOptions(writerScheduler: PipeScheduler.ThreadPool, readerScheduler: PipeScheduler.ThreadPool, useSynchronizationContext: false, pauseWriterThreshold: 0, resumeWriterThreshold: 0); var options = new PipeOptions(writerScheduler: PipeScheduler.ThreadPool, readerScheduler: PipeScheduler.ThreadPool, useSynchronizationContext: false, pauseWriterThreshold: 0, resumeWriterThreshold: 0);

2
src/Microsoft.AspNetCore.Http.Connections.Client/ITransportFactory.cs
View File

@ -5,6 +5,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
{ {
public interface ITransportFactory public interface ITransportFactory
{ {
ITransport CreateTransport(TransportType availableServerTransports); ITransport CreateTransport(HttpTransportType availableServerTransports);
} }
} }

2
src/Microsoft.AspNetCore.Http.Connections.Common/TransportType.cs
View File

@ -6,7 +6,7 @@ using System;
namespace Microsoft.AspNetCore.Http.Connections namespace Microsoft.AspNetCore.Http.Connections
{ {
[Flags] [Flags]
public enum TransportType public enum HttpTransportType
{ {
WebSockets = 1, WebSockets = 1,
ServerSentEvents = 2, ServerSentEvents = 2,

12
src/Microsoft.AspNetCore.Http.Connections/HttpConnectionDispatcher.Log.cs
View File

@ -28,11 +28,11 @@ namespace Microsoft.AspNetCore.Http.Connections
private static readonly Action<ILogger, long, Exception> _receivedBytes = private static readonly Action<ILogger, long, Exception> _receivedBytes =
LoggerMessage.Define<long>(LogLevel.Trace, new EventId(6, "ReceivedBytes"), "Received {Count} bytes."); LoggerMessage.Define<long>(LogLevel.Trace, new EventId(6, "ReceivedBytes"), "Received {Count} bytes.");
private static readonly Action<ILogger, TransportType, Exception> _transportNotSupported = private static readonly Action<ILogger, HttpTransportType, Exception> _transportNotSupported =
LoggerMessage.Define<TransportType>(LogLevel.Debug, new EventId(7, "TransportNotSupported"), "{TransportType} transport not supported by this connection handler."); LoggerMessage.Define<HttpTransportType>(LogLevel.Debug, new EventId(7, "TransportNotSupported"), "{TransportType} transport not supported by this connection handler.");
private static readonly Action<ILogger, TransportType, TransportType, Exception> _cannotChangeTransport = private static readonly Action<ILogger, HttpTransportType, HttpTransportType, Exception> _cannotChangeTransport =
LoggerMessage.Define<TransportType, TransportType>(LogLevel.Error, new EventId(8, "CannotChangeTransport"), "Cannot change transports mid-connection; currently using {TransportType}, requesting {RequestedTransport}."); LoggerMessage.Define<HttpTransportType, HttpTransportType>(LogLevel.Error, new EventId(8, "CannotChangeTransport"), "Cannot change transports mid-connection; currently using {TransportType}, requesting {RequestedTransport}.");
private static readonly Action<ILogger, Exception> _postNotallowedForWebsockets = private static readonly Action<ILogger, Exception> _postNotallowedForWebsockets =
LoggerMessage.Define(LogLevel.Debug, new EventId(9, "PostNotAllowedForWebSockets"), "POST requests are not allowed for websocket connections."); LoggerMessage.Define(LogLevel.Debug, new EventId(9, "PostNotAllowedForWebSockets"), "POST requests are not allowed for websocket connections.");
@ -70,12 +70,12 @@ namespace Microsoft.AspNetCore.Http.Connections
_receivedBytes(logger, count, null); _receivedBytes(logger, count, null);
} }
public static void TransportNotSupported(ILogger logger, TransportType transport) public static void TransportNotSupported(ILogger logger, HttpTransportType transport)
{ {
_transportNotSupported(logger, transport, null); _transportNotSupported(logger, transport, null);
} }
public static void CannotChangeTransport(ILogger logger, TransportType transport, TransportType requestTransport) public static void CannotChangeTransport(ILogger logger, HttpTransportType transport, HttpTransportType requestTransport)
{ {
_cannotChangeTransport(logger, transport, requestTransport, null); _cannotChangeTransport(logger, transport, requestTransport, null);
} }

32
src/Microsoft.AspNetCore.Http.Connections/HttpConnectionDispatcher.cs
View File

@ -24,21 +24,21 @@ namespace Microsoft.AspNetCore.Http.Connections
private static readonly AvailableTransport _webSocketAvailableTransport = private static readonly AvailableTransport _webSocketAvailableTransport =
new AvailableTransport new AvailableTransport
{ {
Transport = nameof(TransportType.WebSockets), Transport = nameof(HttpTransportType.WebSockets),
TransferFormats = new List<string> { nameof(TransferFormat.Text), nameof(TransferFormat.Binary) } TransferFormats = new List<string> { nameof(TransferFormat.Text), nameof(TransferFormat.Binary) }
}; };
private static readonly AvailableTransport _serverSentEventsAvailableTransport = private static readonly AvailableTransport _serverSentEventsAvailableTransport =
new AvailableTransport new AvailableTransport
{ {
Transport = nameof(TransportType.ServerSentEvents), Transport = nameof(HttpTransportType.ServerSentEvents),
TransferFormats = new List<string> { nameof(TransferFormat.Text) } TransferFormats = new List<string> { nameof(TransferFormat.Text) }
}; };
private static readonly AvailableTransport _longPollingAvailableTransport = private static readonly AvailableTransport _longPollingAvailableTransport =
new AvailableTransport new AvailableTransport
{ {
Transport = nameof(TransportType.LongPolling), Transport = nameof(HttpTransportType.LongPolling),
TransferFormats = new List<string> { nameof(TransferFormat.Text), nameof(TransferFormat.Binary) } TransferFormats = new List<string> { nameof(TransferFormat.Text), nameof(TransferFormat.Binary) }
}; };
@ -126,7 +126,7 @@ namespace Microsoft.AspNetCore.Http.Connections
return; return;
} }
if (!await EnsureConnectionStateAsync(connection, context, TransportType.ServerSentEvents, supportedTransports, logScope, options)) if (!await EnsureConnectionStateAsync(connection, context, HttpTransportType.ServerSentEvents, supportedTransports, logScope, options))
{ {
// Bad connection state. It's already set the response status code. // Bad connection state. It's already set the response status code.
return; return;
@ -152,7 +152,7 @@ namespace Microsoft.AspNetCore.Http.Connections
return; return;
} }
if (!await EnsureConnectionStateAsync(connection, context, TransportType.WebSockets, supportedTransports, logScope, options)) if (!await EnsureConnectionStateAsync(connection, context, HttpTransportType.WebSockets, supportedTransports, logScope, options))
{ {
// Bad connection state. It's already set the response status code. // Bad connection state. It's already set the response status code.
return; return;
@ -176,7 +176,7 @@ namespace Microsoft.AspNetCore.Http.Connections
return; return;
} }
if (!await EnsureConnectionStateAsync(connection, context, TransportType.LongPolling, supportedTransports, logScope, options)) if (!await EnsureConnectionStateAsync(connection, context, HttpTransportType.LongPolling, supportedTransports, logScope, options))
{ {
// Bad connection state. It's already set the response status code. // Bad connection state. It's already set the response status code.
return; return;
@ -221,7 +221,7 @@ namespace Microsoft.AspNetCore.Http.Connections
{ {
Log.EstablishedConnection(_logger); Log.EstablishedConnection(_logger);
connection.Items[ConnectionMetadataNames.Transport] = TransportType.LongPolling; connection.Items[ConnectionMetadataNames.Transport] = HttpTransportType.LongPolling;
connection.ApplicationTask = ExecuteApplication(connectionDelegate, connection); connection.ApplicationTask = ExecuteApplication(connectionDelegate, connection);
} }
@ -363,7 +363,7 @@ namespace Microsoft.AspNetCore.Http.Connections
// Verify some initialization invariants // Verify some initialization invariants
// We want to be positive that the IConnectionInherentKeepAliveFeature is initialized before invoking the application, if the long polling transport is in use. // We want to be positive that the IConnectionInherentKeepAliveFeature is initialized before invoking the application, if the long polling transport is in use.
Debug.Assert(connection.Items[ConnectionMetadataNames.Transport] != null, "Transport has not been initialized yet"); Debug.Assert(connection.Items[ConnectionMetadataNames.Transport] != null, "Transport has not been initialized yet");
Debug.Assert((TransportType?)connection.Items[ConnectionMetadataNames.Transport] != TransportType.LongPolling || Debug.Assert((HttpTransportType?)connection.Items[ConnectionMetadataNames.Transport] != HttpTransportType.LongPolling ||
connection.Features.Get<IConnectionInherentKeepAliveFeature>() != null, "Long-polling transport is in use but IConnectionInherentKeepAliveFeature as not configured"); connection.Features.Get<IConnectionInherentKeepAliveFeature>() != null, "Long-polling transport is in use but IConnectionInherentKeepAliveFeature as not configured");
// Jump onto the thread pool thread so blocking user code doesn't block the setup of the // Jump onto the thread pool thread so blocking user code doesn't block the setup of the
@ -401,17 +401,17 @@ namespace Microsoft.AspNetCore.Http.Connections
response.ConnectionId = connectionId; response.ConnectionId = connectionId;
response.AvailableTransports = new List<AvailableTransport>(); response.AvailableTransports = new List<AvailableTransport>();
if ((options.Transports & TransportType.WebSockets) != 0 && ServerHasWebSockets(context.Features)) if ((options.Transports & HttpTransportType.WebSockets) != 0 && ServerHasWebSockets(context.Features))
{ {
response.AvailableTransports.Add(_webSocketAvailableTransport); response.AvailableTransports.Add(_webSocketAvailableTransport);
} }
if ((options.Transports & TransportType.ServerSentEvents) != 0) if ((options.Transports & HttpTransportType.ServerSentEvents) != 0)
{ {
response.AvailableTransports.Add(_serverSentEventsAvailableTransport); response.AvailableTransports.Add(_serverSentEventsAvailableTransport);
} }
if ((options.Transports & TransportType.LongPolling) != 0) if ((options.Transports & HttpTransportType.LongPolling) != 0)
{ {
response.AvailableTransports.Add(_longPollingAvailableTransport); response.AvailableTransports.Add(_longPollingAvailableTransport);
} }
@ -440,8 +440,8 @@ namespace Microsoft.AspNetCore.Http.Connections
context.Response.ContentType = "text/plain"; context.Response.ContentType = "text/plain";
var transport = (TransportType?)connection.Items[ConnectionMetadataNames.Transport]; var transport = (HttpTransportType?)connection.Items[ConnectionMetadataNames.Transport];
if (transport == TransportType.WebSockets) if (transport == HttpTransportType.WebSockets)
{ {
Log.PostNotAllowedForWebSockets(_logger); Log.PostNotAllowedForWebSockets(_logger);
context.Response.StatusCode = StatusCodes.Status405MethodNotAllowed; context.Response.StatusCode = StatusCodes.Status405MethodNotAllowed;
@ -455,7 +455,7 @@ namespace Microsoft.AspNetCore.Http.Connections
Log.ReceivedBytes(_logger, pipeWriterStream.Length); Log.ReceivedBytes(_logger, pipeWriterStream.Length);
} }
private async Task<bool> EnsureConnectionStateAsync(HttpConnectionContext connection, HttpContext context, TransportType transportType, TransportType supportedTransports, ConnectionLogScope logScope, HttpConnectionOptions options) private async Task<bool> EnsureConnectionStateAsync(HttpConnectionContext connection, HttpContext context, HttpTransportType transportType, HttpTransportType supportedTransports, ConnectionLogScope logScope, HttpConnectionOptions options)
{ {
if ((supportedTransports & transportType) == 0) if ((supportedTransports & transportType) == 0)
{ {
@ -469,7 +469,7 @@ namespace Microsoft.AspNetCore.Http.Connections
// Set the IHttpConnectionFeature now that we can access it. // Set the IHttpConnectionFeature now that we can access it.
connection.Features.Set(context.Features.Get<IHttpConnectionFeature>()); connection.Features.Set(context.Features.Get<IHttpConnectionFeature>());
var transport = (TransportType?)connection.Items[ConnectionMetadataNames.Transport]; var transport = (HttpTransportType?)connection.Items[ConnectionMetadataNames.Transport];
if (transport == null) if (transport == null)
{ {
@ -488,7 +488,7 @@ namespace Microsoft.AspNetCore.Http.Connections
connection.User = context.User; connection.User = context.User;
// Configure transport-specific features. // Configure transport-specific features.
if (transportType == TransportType.LongPolling) if (transportType == HttpTransportType.LongPolling)
{ {
connection.Features.Set<IConnectionInherentKeepAliveFeature>(new ConnectionInherentKeepAliveFeature(options.LongPolling.PollTimeout)); connection.Features.Set<IConnectionInherentKeepAliveFeature>(new ConnectionInherentKeepAliveFeature(options.LongPolling.PollTimeout));

2
src/Microsoft.AspNetCore.Http.Connections/HttpConnectionOptions.cs
View File

@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Http.Connections
{ {
public IList<IAuthorizeData> AuthorizationData { get; } = new List<IAuthorizeData>(); public IList<IAuthorizeData> AuthorizationData { get; } = new List<IAuthorizeData>();
public TransportType Transports { get; set; } = TransportType.All; public HttpTransportType Transports { get; set; } = HttpTransportType.All;
public WebSocketOptions WebSockets { get; } = new WebSocketOptions(); public WebSocketOptions WebSockets { get; } = new WebSocketOptions();

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

@ -67,7 +67,7 @@ namespace Microsoft.AspNetCore.SignalR.Client
return hubConnectionBuilder; return hubConnectionBuilder;
} }
public static IHubConnectionBuilder WithTransport(this IHubConnectionBuilder hubConnectionBuilder, TransportType transportType) public static IHubConnectionBuilder WithTransport(this IHubConnectionBuilder hubConnectionBuilder, HttpTransportType transportType)
{ {
hubConnectionBuilder.AddSetting(TransportTypeKey, transportType); hubConnectionBuilder.AddSetting(TransportTypeKey, transportType);
return hubConnectionBuilder; return hubConnectionBuilder;
@ -184,14 +184,14 @@ namespace Microsoft.AspNetCore.SignalR.Client
return hubConnectionBuilder; return hubConnectionBuilder;
} }
public static TransportType GetTransport(this IHubConnectionBuilder hubConnectionBuilder) public static HttpTransportType GetTransport(this IHubConnectionBuilder hubConnectionBuilder)
{ {
if (hubConnectionBuilder.TryGetSetting<TransportType>(TransportTypeKey, out var transportType)) if (hubConnectionBuilder.TryGetSetting<HttpTransportType>(TransportTypeKey, out var transportType))
{ {
return transportType; return transportType;
} }
return TransportType.All; return HttpTransportType.All;
} }
/// <summary> /// <summary>

114
test/Microsoft.AspNetCore.Http.Connections.Tests/HttpConnectionDispatcherTests.cs
View File

@ -96,9 +96,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
} }
[Theory] [Theory]
[InlineData(TransportType.LongPolling)] [InlineData(HttpTransportType.LongPolling)]
[InlineData(TransportType.ServerSentEvents)] [InlineData(HttpTransportType.ServerSentEvents)]
public async Task CheckThatThresholdValuesAreEnforcedWithSends(TransportType transportType) public async Task CheckThatThresholdValuesAreEnforcedWithSends(HttpTransportType transportType)
{ {
using (StartLog(out var loggerFactory, LogLevel.Debug)) using (StartLog(out var loggerFactory, LogLevel.Debug))
{ {
@ -147,10 +147,10 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
} }
[Theory] [Theory]
[InlineData(TransportType.All)] [InlineData(HttpTransportType.All)]
[InlineData((TransportType)0)] [InlineData((HttpTransportType)0)]
[InlineData(TransportType.LongPolling | TransportType.WebSockets)] [InlineData(HttpTransportType.LongPolling | HttpTransportType.WebSockets)]
public async Task NegotiateReturnsAvailableTransportsAfterFilteringByOptions(TransportType transports) public async Task NegotiateReturnsAvailableTransportsAfterFilteringByOptions(HttpTransportType transports)
{ {
using (StartLog(out var loggerFactory, LogLevel.Debug)) using (StartLog(out var loggerFactory, LogLevel.Debug))
{ {
@ -169,10 +169,10 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
await dispatcher.ExecuteNegotiateAsync(context, new HttpConnectionOptions { Transports = transports }); await dispatcher.ExecuteNegotiateAsync(context, new HttpConnectionOptions { Transports = transports });
var negotiateResponse = JsonConvert.DeserializeObject<JObject>(Encoding.UTF8.GetString(ms.ToArray())); var negotiateResponse = JsonConvert.DeserializeObject<JObject>(Encoding.UTF8.GetString(ms.ToArray()));
var availableTransports = (TransportType)0; var availableTransports = (HttpTransportType)0;
foreach (var transport in negotiateResponse["availableTransports"]) foreach (var transport in negotiateResponse["availableTransports"])
{ {
var transportType = (TransportType)Enum.Parse(typeof(TransportType), transport.Value<string>("transport")); var transportType = (HttpTransportType)Enum.Parse(typeof(HttpTransportType), transport.Value<string>("transport"));
availableTransports |= transportType; availableTransports |= transportType;
} }
@ -181,10 +181,10 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
} }
[Theory] [Theory]
[InlineData(TransportType.WebSockets)] [InlineData(HttpTransportType.WebSockets)]
[InlineData(TransportType.ServerSentEvents)] [InlineData(HttpTransportType.ServerSentEvents)]
[InlineData(TransportType.LongPolling)] [InlineData(HttpTransportType.LongPolling)]
public async Task EndpointsThatAcceptConnectionId404WhenUnknownConnectionIdProvided(TransportType transportType) public async Task EndpointsThatAcceptConnectionId404WhenUnknownConnectionIdProvided(HttpTransportType transportType)
{ {
using (StartLog(out var loggerFactory, LogLevel.Debug)) using (StartLog(out var loggerFactory, LogLevel.Debug))
{ {
@ -263,7 +263,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
var manager = CreateConnectionManager(loggerFactory); var manager = CreateConnectionManager(loggerFactory);
var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory);
var connection = manager.CreateConnection(); var connection = manager.CreateConnection();
connection.Items[ConnectionMetadataNames.Transport] = TransportType.WebSockets; connection.Items[ConnectionMetadataNames.Transport] = HttpTransportType.WebSockets;
using (var strm = new MemoryStream()) using (var strm = new MemoryStream())
{ {
@ -293,9 +293,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
} }
[Theory] [Theory]
[InlineData(TransportType.LongPolling)] [InlineData(HttpTransportType.LongPolling)]
[InlineData(TransportType.ServerSentEvents)] [InlineData(HttpTransportType.ServerSentEvents)]
public async Task PostSendsToConnection(TransportType transportType) public async Task PostSendsToConnection(HttpTransportType transportType)
{ {
using (StartLog(out var loggerFactory, LogLevel.Debug)) using (StartLog(out var loggerFactory, LogLevel.Debug))
{ {
@ -429,9 +429,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
} }
[Theory] [Theory]
[InlineData(TransportType.ServerSentEvents)] [InlineData(HttpTransportType.ServerSentEvents)]
[InlineData(TransportType.LongPolling)] [InlineData(HttpTransportType.LongPolling)]
public async Task EndpointsThatRequireConnectionId400WhenNoConnectionIdProvided(TransportType transportType) public async Task EndpointsThatRequireConnectionId400WhenNoConnectionIdProvided(HttpTransportType transportType)
{ {
using (StartLog(out var loggerFactory, LogLevel.Debug)) using (StartLog(out var loggerFactory, LogLevel.Debug))
{ {
@ -492,48 +492,48 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
} }
[Theory] [Theory]
[InlineData(TransportType.LongPolling, 204)] [InlineData(HttpTransportType.LongPolling, 204)]
[InlineData(TransportType.WebSockets, 404)] [InlineData(HttpTransportType.WebSockets, 404)]
[InlineData(TransportType.ServerSentEvents, 404)] [InlineData(HttpTransportType.ServerSentEvents, 404)]
public async Task EndPointThatOnlySupportsLongPollingRejectsOtherTransports(TransportType transportType, int status) public async Task EndPointThatOnlySupportsLongPollingRejectsOtherTransports(HttpTransportType transportType, int status)
{ {
using (StartLog(out var loggerFactory, LogLevel.Debug)) using (StartLog(out var loggerFactory, LogLevel.Debug))
{ {
await CheckTransportSupported(TransportType.LongPolling, transportType, status, loggerFactory); await CheckTransportSupported(HttpTransportType.LongPolling, transportType, status, loggerFactory);
} }
} }
[Theory] [Theory]
[InlineData(TransportType.ServerSentEvents, 200)] [InlineData(HttpTransportType.ServerSentEvents, 200)]
[InlineData(TransportType.WebSockets, 404)] [InlineData(HttpTransportType.WebSockets, 404)]
[InlineData(TransportType.LongPolling, 404)] [InlineData(HttpTransportType.LongPolling, 404)]
public async Task EndPointThatOnlySupportsSSERejectsOtherTransports(TransportType transportType, int status) public async Task EndPointThatOnlySupportsSSERejectsOtherTransports(HttpTransportType transportType, int status)
{ {
using (StartLog(out var loggerFactory, LogLevel.Debug)) using (StartLog(out var loggerFactory, LogLevel.Debug))
{ {
await CheckTransportSupported(TransportType.ServerSentEvents, transportType, status, loggerFactory); await CheckTransportSupported(HttpTransportType.ServerSentEvents, transportType, status, loggerFactory);
} }
} }
[Theory] [Theory]
[InlineData(TransportType.WebSockets, 200)] [InlineData(HttpTransportType.WebSockets, 200)]
[InlineData(TransportType.ServerSentEvents, 404)] [InlineData(HttpTransportType.ServerSentEvents, 404)]
[InlineData(TransportType.LongPolling, 404)] [InlineData(HttpTransportType.LongPolling, 404)]
public async Task EndPointThatOnlySupportsWebSockesRejectsOtherTransports(TransportType transportType, int status) public async Task EndPointThatOnlySupportsWebSockesRejectsOtherTransports(HttpTransportType transportType, int status)
{ {
using (StartLog(out var loggerFactory, LogLevel.Debug)) using (StartLog(out var loggerFactory, LogLevel.Debug))
{ {
await CheckTransportSupported(TransportType.WebSockets, transportType, status, loggerFactory); await CheckTransportSupported(HttpTransportType.WebSockets, transportType, status, loggerFactory);
} }
} }
[Theory] [Theory]
[InlineData(TransportType.LongPolling, 404)] [InlineData(HttpTransportType.LongPolling, 404)]
public async Task EndPointThatOnlySupportsWebSocketsAndSSERejectsLongPolling(TransportType transportType, int status) public async Task EndPointThatOnlySupportsWebSocketsAndSSERejectsLongPolling(HttpTransportType transportType, int status)
{ {
using (StartLog(out var loggerFactory, LogLevel.Debug)) using (StartLog(out var loggerFactory, LogLevel.Debug))
{ {
await CheckTransportSupported(TransportType.WebSockets | TransportType.ServerSentEvents, transportType, status, loggerFactory); await CheckTransportSupported(HttpTransportType.WebSockets | HttpTransportType.ServerSentEvents, transportType, status, loggerFactory);
} }
} }
@ -548,7 +548,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory);
var context = MakeRequest("/foo", connection); var context = MakeRequest("/foo", connection);
SetTransport(context, TransportType.ServerSentEvents); SetTransport(context, HttpTransportType.ServerSentEvents);
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddSingleton<ImmediatelyCompleteConnectionHandler>(); services.AddSingleton<ImmediatelyCompleteConnectionHandler>();
@ -574,7 +574,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory);
var context = MakeRequest("/foo", connection); var context = MakeRequest("/foo", connection);
SetTransport(context, TransportType.ServerSentEvents); SetTransport(context, HttpTransportType.ServerSentEvents);
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddSingleton<SynchronusExceptionConnectionHandler>(); services.AddSingleton<SynchronusExceptionConnectionHandler>();
@ -652,7 +652,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory);
var context = MakeRequest("/foo", connection); var context = MakeRequest("/foo", connection);
SetTransport(context, TransportType.WebSockets); SetTransport(context, HttpTransportType.WebSockets);
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddSingleton<ImmediatelyCompleteConnectionHandler>(); services.AddSingleton<ImmediatelyCompleteConnectionHandler>();
@ -669,9 +669,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
} }
[Theory] [Theory]
[InlineData(TransportType.WebSockets)] [InlineData(HttpTransportType.WebSockets)]
[InlineData(TransportType.ServerSentEvents)] [InlineData(HttpTransportType.ServerSentEvents)]
public async Task RequestToActiveConnectionId409ForStreamingTransports(TransportType transportType) public async Task RequestToActiveConnectionId409ForStreamingTransports(HttpTransportType transportType)
{ {
using (StartLog(out var loggerFactory, LogLevel.Debug)) using (StartLog(out var loggerFactory, LogLevel.Debug))
{ {
@ -748,9 +748,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
} }
[Theory] [Theory]
[InlineData(TransportType.ServerSentEvents)] [InlineData(HttpTransportType.ServerSentEvents)]
[InlineData(TransportType.LongPolling)] [InlineData(HttpTransportType.LongPolling)]
public async Task RequestToDisposedConnectionIdReturns404(TransportType transportType) public async Task RequestToDisposedConnectionIdReturns404(HttpTransportType transportType)
{ {
using (StartLog(out var loggerFactory, LogLevel.Debug)) using (StartLog(out var loggerFactory, LogLevel.Debug))
{ {
@ -821,7 +821,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory);
var context = MakeRequest("/foo", connection); var context = MakeRequest("/foo", connection);
SetTransport(context, TransportType.ServerSentEvents); SetTransport(context, HttpTransportType.ServerSentEvents);
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddSingleton<BlockingConnectionHandler>(); services.AddSingleton<BlockingConnectionHandler>();
@ -916,10 +916,10 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
} }
[Theory] [Theory]
[InlineData(TransportType.LongPolling, null)] [InlineData(HttpTransportType.LongPolling, null)]
[InlineData(TransportType.ServerSentEvents, TransferFormat.Text)] [InlineData(HttpTransportType.ServerSentEvents, TransferFormat.Text)]
[InlineData(TransportType.WebSockets, TransferFormat.Binary | TransferFormat.Text)] [InlineData(HttpTransportType.WebSockets, TransferFormat.Binary | TransferFormat.Text)]
public async Task TransferModeSet(TransportType transportType, TransferFormat? expectedTransferFormats) public async Task TransferModeSet(HttpTransportType transportType, TransferFormat? expectedTransferFormats)
{ {
using (StartLog(out var loggerFactory, LogLevel.Debug)) using (StartLog(out var loggerFactory, LogLevel.Debug))
{ {
@ -1333,7 +1333,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
context.Request.Path = "/foo"; context.Request.Path = "/foo";
context.Request.Method = "POST"; context.Request.Method = "POST";
context.Response.Body = ms; context.Response.Body = ms;
await dispatcher.ExecuteNegotiateAsync(context, new HttpConnectionOptions { Transports = TransportType.WebSockets }); await dispatcher.ExecuteNegotiateAsync(context, new HttpConnectionOptions { Transports = HttpTransportType.WebSockets });
var negotiateResponse = JsonConvert.DeserializeObject<JObject>(Encoding.UTF8.GetString(ms.ToArray())); var negotiateResponse = JsonConvert.DeserializeObject<JObject>(Encoding.UTF8.GetString(ms.ToArray()));
var availableTransports = (JArray)negotiateResponse["availableTransports"]; var availableTransports = (JArray)negotiateResponse["availableTransports"];
@ -1386,7 +1386,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
} }
} }
private static async Task CheckTransportSupported(TransportType supportedTransports, TransportType transportType, int status, ILoggerFactory loggerFactory) private static async Task CheckTransportSupported(HttpTransportType supportedTransports, HttpTransportType transportType, int status, ILoggerFactory loggerFactory)
{ {
var manager = CreateConnectionManager(loggerFactory); var manager = CreateConnectionManager(loggerFactory);
var connection = manager.CreateConnection(); var connection = manager.CreateConnection();
@ -1443,14 +1443,14 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
return context; return context;
} }
private static void SetTransport(HttpContext context, TransportType transportType) private static void SetTransport(HttpContext context, HttpTransportType transportType)
{ {
switch (transportType) switch (transportType)
{ {
case TransportType.WebSockets: case HttpTransportType.WebSockets:
context.Features.Set<IHttpWebSocketFeature>(new TestWebSocketConnectionFeature()); context.Features.Set<IHttpWebSocketFeature>(new TestWebSocketConnectionFeature());
break; break;
case TransportType.ServerSentEvents: case HttpTransportType.ServerSentEvents:
context.Request.Headers["Accept"] = "text/event-stream"; context.Request.Headers["Accept"] = "text/event-stream";
break; break;
default: default:

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

@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task CheckFixedMessage(string protocolName, TransportType transportType, string path) public async Task CheckFixedMessage(string protocolName, HttpTransportType transportType, string path)
{ {
var protocol = HubProtocols[protocolName]; var protocol = HubProtocols[protocolName];
using (StartLog(out var loggerFactory, $"{nameof(CheckFixedMessage)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) using (StartLog(out var loggerFactory, $"{nameof(CheckFixedMessage)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}"))
@ -78,7 +78,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task CanSendAndReceiveMessage(string protocolName, TransportType transportType, string path) public async Task CanSendAndReceiveMessage(string protocolName, HttpTransportType transportType, string path)
{ {
var protocol = HubProtocols[protocolName]; var protocol = HubProtocols[protocolName];
using (StartLog(out var loggerFactory, $"{nameof(CanSendAndReceiveMessage)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) using (StartLog(out var loggerFactory, $"{nameof(CanSendAndReceiveMessage)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}"))
@ -107,7 +107,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task CanStopAndStartConnection(string protocolName, TransportType transportType, string path) public async Task CanStopAndStartConnection(string protocolName, HttpTransportType transportType, string path)
{ {
var protocol = HubProtocols[protocolName]; var protocol = HubProtocols[protocolName];
using (StartLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanStopAndStartConnection)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) using (StartLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanStopAndStartConnection)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}"))
@ -138,7 +138,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task CanStartConnectionFromClosedEvent(string protocolName, TransportType transportType, string path) public async Task CanStartConnectionFromClosedEvent(string protocolName, HttpTransportType transportType, string path)
{ {
var protocol = HubProtocols[protocolName]; var protocol = HubProtocols[protocolName];
using (StartLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanStartConnectionFromClosedEvent)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) using (StartLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanStartConnectionFromClosedEvent)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}"))
@ -189,14 +189,14 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
} }
} }
private Func<IConnection> GetHttpConnectionFactory(ILoggerFactory loggerFactory, string path, TransportType transportType) private Func<IConnection> GetHttpConnectionFactory(ILoggerFactory loggerFactory, string path, HttpTransportType transportType)
{ {
return () => new HttpConnection(new Uri(_serverFixture.Url + path), transportType, loggerFactory); return () => new HttpConnection(new Uri(_serverFixture.Url + path), transportType, loggerFactory);
} }
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task MethodsAreCaseInsensitive(string protocolName, TransportType transportType, string path) public async Task MethodsAreCaseInsensitive(string protocolName, HttpTransportType transportType, string path)
{ {
var protocol = HubProtocols[protocolName]; var protocol = HubProtocols[protocolName];
using (StartLog(out var loggerFactory, $"{nameof(MethodsAreCaseInsensitive)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) using (StartLog(out var loggerFactory, $"{nameof(MethodsAreCaseInsensitive)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}"))
@ -226,7 +226,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task CanInvokeClientMethodFromServer(string protocolName, TransportType transportType, string path) public async Task CanInvokeClientMethodFromServer(string protocolName, HttpTransportType transportType, string path)
{ {
var protocol = HubProtocols[protocolName]; var protocol = HubProtocols[protocolName];
using (StartLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanInvokeClientMethodFromServer)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) using (StartLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanInvokeClientMethodFromServer)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}"))
@ -259,7 +259,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task InvokeNonExistantClientMethodFromServer(string protocolName, TransportType transportType, string path) public async Task InvokeNonExistantClientMethodFromServer(string protocolName, HttpTransportType transportType, string path)
{ {
var protocol = HubProtocols[protocolName]; var protocol = HubProtocols[protocolName];
using (StartLog(out var loggerFactory, LogLevel.Trace, $"{nameof(InvokeNonExistantClientMethodFromServer)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) using (StartLog(out var loggerFactory, LogLevel.Trace, $"{nameof(InvokeNonExistantClientMethodFromServer)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}"))
@ -299,7 +299,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task CanStreamClientMethodFromServer(string protocolName, TransportType transportType, string path) public async Task CanStreamClientMethodFromServer(string protocolName, HttpTransportType transportType, string path)
{ {
var protocol = HubProtocols[protocolName]; var protocol = HubProtocols[protocolName];
using (StartLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanStreamClientMethodFromServer)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) using (StartLog(out var loggerFactory, LogLevel.Trace, $"{nameof(CanStreamClientMethodFromServer)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}"))
@ -328,7 +328,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task CanCloseStreamMethodEarly(string protocolName, TransportType transportType, string path) public async Task CanCloseStreamMethodEarly(string protocolName, HttpTransportType transportType, string path)
{ {
var protocol = HubProtocols[protocolName]; var protocol = HubProtocols[protocolName];
using (StartLog(out var loggerFactory, $"{nameof(CanCloseStreamMethodEarly)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) using (StartLog(out var loggerFactory, $"{nameof(CanCloseStreamMethodEarly)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}"))
@ -368,7 +368,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task StreamDoesNotStartIfTokenAlreadyCanceled(string protocolName, TransportType transportType, string path) public async Task StreamDoesNotStartIfTokenAlreadyCanceled(string protocolName, HttpTransportType transportType, string path)
{ {
var protocol = HubProtocols[protocolName]; var protocol = HubProtocols[protocolName];
using (StartLog(out var loggerFactory, LogLevel.Trace, $"{nameof(StreamDoesNotStartIfTokenAlreadyCanceled)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) using (StartLog(out var loggerFactory, LogLevel.Trace, $"{nameof(StreamDoesNotStartIfTokenAlreadyCanceled)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}"))
@ -403,7 +403,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task ExceptionFromStreamingSentToClient(string protocolName, TransportType transportType, string path) public async Task ExceptionFromStreamingSentToClient(string protocolName, HttpTransportType transportType, string path)
{ {
var protocol = HubProtocols[protocolName]; var protocol = HubProtocols[protocolName];
using (StartLog(out var loggerFactory, $"{nameof(ExceptionFromStreamingSentToClient)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}")) using (StartLog(out var loggerFactory, $"{nameof(ExceptionFromStreamingSentToClient)}_{protocol.Name}_{transportType}_{path.TrimStart('/')}"))
@ -431,7 +431,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task ServerThrowsHubExceptionIfHubMethodCannotBeResolved(string hubProtocolName, TransportType transportType, string hubPath) public async Task ServerThrowsHubExceptionIfHubMethodCannotBeResolved(string hubProtocolName, HttpTransportType transportType, string hubPath)
{ {
var hubProtocol = HubProtocols[hubProtocolName]; var hubProtocol = HubProtocols[hubProtocolName];
using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfHubMethodCannotBeResolved)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}")) using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfHubMethodCannotBeResolved)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}"))
@ -458,7 +458,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task ServerThrowsHubExceptionOnHubMethodArgumentCountMismatch(string hubProtocolName, TransportType transportType, string hubPath) public async Task ServerThrowsHubExceptionOnHubMethodArgumentCountMismatch(string hubProtocolName, HttpTransportType transportType, string hubPath)
{ {
var hubProtocol = HubProtocols[hubProtocolName]; var hubProtocol = HubProtocols[hubProtocolName];
using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnHubMethodArgumentCountMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}")) using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnHubMethodArgumentCountMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}"))
@ -485,7 +485,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task ServerThrowsHubExceptionOnHubMethodArgumentTypeMismatch(string hubProtocolName, TransportType transportType, string hubPath) public async Task ServerThrowsHubExceptionOnHubMethodArgumentTypeMismatch(string hubProtocolName, HttpTransportType transportType, string hubPath)
{ {
var hubProtocol = HubProtocols[hubProtocolName]; var hubProtocol = HubProtocols[hubProtocolName];
using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnHubMethodArgumentTypeMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}")) using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnHubMethodArgumentTypeMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}"))
@ -512,7 +512,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task ServerThrowsHubExceptionIfStreamingHubMethodCannotBeResolved(string hubProtocolName, TransportType transportType, string hubPath) public async Task ServerThrowsHubExceptionIfStreamingHubMethodCannotBeResolved(string hubProtocolName, HttpTransportType transportType, string hubPath)
{ {
var hubProtocol = HubProtocols[hubProtocolName]; var hubProtocol = HubProtocols[hubProtocolName];
using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfStreamingHubMethodCannotBeResolved)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}")) using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfStreamingHubMethodCannotBeResolved)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}"))
@ -540,7 +540,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task ServerThrowsHubExceptionOnStreamingHubMethodArgumentCountMismatch(string hubProtocolName, TransportType transportType, string hubPath) public async Task ServerThrowsHubExceptionOnStreamingHubMethodArgumentCountMismatch(string hubProtocolName, HttpTransportType transportType, string hubPath)
{ {
var hubProtocol = HubProtocols[hubProtocolName]; var hubProtocol = HubProtocols[hubProtocolName];
using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnStreamingHubMethodArgumentCountMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}")) using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnStreamingHubMethodArgumentCountMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}"))
@ -569,7 +569,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task ServerThrowsHubExceptionOnStreamingHubMethodArgumentTypeMismatch(string hubProtocolName, TransportType transportType, string hubPath) public async Task ServerThrowsHubExceptionOnStreamingHubMethodArgumentTypeMismatch(string hubProtocolName, HttpTransportType transportType, string hubPath)
{ {
var hubProtocol = HubProtocols[hubProtocolName]; var hubProtocol = HubProtocols[hubProtocolName];
using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnStreamingHubMethodArgumentTypeMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}")) using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionOnStreamingHubMethodArgumentTypeMismatch)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}"))
@ -597,7 +597,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task ServerThrowsHubExceptionIfNonStreamMethodInvokedWithStreamAsync(string hubProtocolName, TransportType transportType, string hubPath) public async Task ServerThrowsHubExceptionIfNonStreamMethodInvokedWithStreamAsync(string hubProtocolName, HttpTransportType transportType, string hubPath)
{ {
var hubProtocol = HubProtocols[hubProtocolName]; var hubProtocol = HubProtocols[hubProtocolName];
using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfNonStreamMethodInvokedWithStreamAsync)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}")) using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfNonStreamMethodInvokedWithStreamAsync)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}"))
@ -624,7 +624,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task ServerThrowsHubExceptionIfStreamMethodInvokedWithInvoke(string hubProtocolName, TransportType transportType, string hubPath) public async Task ServerThrowsHubExceptionIfStreamMethodInvokedWithInvoke(string hubProtocolName, HttpTransportType transportType, string hubPath)
{ {
var hubProtocol = HubProtocols[hubProtocolName]; var hubProtocol = HubProtocols[hubProtocolName];
using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfStreamMethodInvokedWithInvoke)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}")) using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfStreamMethodInvokedWithInvoke)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}"))
@ -651,7 +651,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
public async Task ServerThrowsHubExceptionIfBuildingAsyncEnumeratorIsNotPossible(string hubProtocolName, TransportType transportType, string hubPath) public async Task ServerThrowsHubExceptionIfBuildingAsyncEnumeratorIsNotPossible(string hubProtocolName, HttpTransportType transportType, string hubPath)
{ {
var hubProtocol = HubProtocols[hubProtocolName]; var hubProtocol = HubProtocols[hubProtocolName];
using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfBuildingAsyncEnumeratorIsNotPossible)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}")) using (StartLog(out var loggerFactory, $"{nameof(ServerThrowsHubExceptionIfBuildingAsyncEnumeratorIsNotPossible)}_{hubProtocol.Name}_{transportType}_{hubPath.TrimStart('/')}"))
@ -678,7 +678,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(TransportTypes))] [MemberData(nameof(TransportTypes))]
public async Task ClientCanUseJwtBearerTokenForAuthentication(TransportType transportType) public async Task ClientCanUseJwtBearerTokenForAuthentication(HttpTransportType transportType)
{ {
using (StartLog(out var loggerFactory, $"{nameof(ClientCanUseJwtBearerTokenForAuthentication)}_{transportType}")) using (StartLog(out var loggerFactory, $"{nameof(ClientCanUseJwtBearerTokenForAuthentication)}_{transportType}"))
{ {
@ -712,7 +712,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(TransportTypes))] [MemberData(nameof(TransportTypes))]
public async Task ClientCanSendHeaders(TransportType transportType) public async Task ClientCanSendHeaders(HttpTransportType transportType)
{ {
using (StartLog(out var loggerFactory, $"{nameof(ClientCanSendHeaders)}_{transportType}")) using (StartLog(out var loggerFactory, $"{nameof(ClientCanSendHeaders)}_{transportType}"))
{ {
@ -753,7 +753,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
var hubConnection = new HubConnectionBuilder() var hubConnection = new HubConnectionBuilder()
.WithUrl(_serverFixture.Url + "/default") .WithUrl(_serverFixture.Url + "/default")
.WithTransport(TransportType.WebSockets) .WithTransport(HttpTransportType.WebSockets)
.WithLoggerFactory(loggerFactory) .WithLoggerFactory(loggerFactory)
.WithWebSocketOptions(options => options.Cookies = cookieJar) .WithWebSocketOptions(options => options.Cookies = cookieJar)
.Build(); .Build();
@ -777,7 +777,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
[Theory] [Theory]
[MemberData(nameof(TransportTypes))] [MemberData(nameof(TransportTypes))]
public async Task CheckHttpConnectionFeatures(TransportType transportType) public async Task CheckHttpConnectionFeatures(HttpTransportType transportType)
{ {
using (StartLog(out var loggerFactory, $"{nameof(CheckHttpConnectionFeatures)}_{transportType}")) using (StartLog(out var loggerFactory, $"{nameof(CheckHttpConnectionFeatures)}_{transportType}"))
{ {
@ -827,8 +827,8 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
{ {
await hubConnection.StartAsync().OrTimeout(); await hubConnection.StartAsync().OrTimeout();
var transport = await hubConnection.InvokeAsync<TransportType>(nameof(TestHub.GetActiveTransportName)).OrTimeout(); var transport = await hubConnection.InvokeAsync<HttpTransportType>(nameof(TestHub.GetActiveTransportName)).OrTimeout();
Assert.Equal(TransportType.LongPolling, transport); Assert.Equal(HttpTransportType.LongPolling, transport);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -848,11 +848,11 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
{ {
foreach (var protocol in HubProtocols) foreach (var protocol in HubProtocols)
{ {
foreach (var transport in TransportTypes().SelectMany(t => t).Cast<TransportType>()) foreach (var transport in TransportTypes().SelectMany(t => t).Cast<HttpTransportType>())
{ {
foreach (var hubPath in HubPaths) foreach (var hubPath in HubPaths)
{ {
if (!(protocol.Value is MessagePackHubProtocol) || transport != TransportType.ServerSentEvents) if (!(protocol.Value is MessagePackHubProtocol) || transport != HttpTransportType.ServerSentEvents)
{ {
yield return new object[] { protocol.Key, transport, hubPath }; yield return new object[] { protocol.Key, transport, hubPath };
} }
@ -876,10 +876,10 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
{ {
if (TestHelpers.IsWebSocketsSupported()) if (TestHelpers.IsWebSocketsSupported())
{ {
yield return new object[] { TransportType.WebSockets }; yield return new object[] { HttpTransportType.WebSockets };
} }
yield return new object[] { TransportType.ServerSentEvents }; yield return new object[] { HttpTransportType.ServerSentEvents };
yield return new object[] { TransportType.LongPolling }; yield return new object[] { HttpTransportType.LongPolling };
} }
} }
} }

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

@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
routes.MapHub<DynamicTestHub>("/dynamic"); routes.MapHub<DynamicTestHub>("/dynamic");
routes.MapHub<TestHubT>("/hubT"); routes.MapHub<TestHubT>("/hubT");
routes.MapHub<HubWithAuthorization>("/authorizedhub"); routes.MapHub<HubWithAuthorization>("/authorizedhub");
routes.MapHub<TestHub>("/default-nowebsockets", options => options.Transports = TransportType.LongPolling | TransportType.ServerSentEvents); routes.MapHub<TestHub>("/default-nowebsockets", options => options.Transports = HttpTransportType.LongPolling | HttpTransportType.ServerSentEvents);
}); });
app.Run(async (context) => app.Run(async (context) =>

2
test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Helpers.cs
View File

@ -9,8 +9,6 @@ using Microsoft.AspNetCore.Http.Connections.Client;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;
using HttpTransportType = Microsoft.AspNetCore.Http.Connections.TransportType;
namespace Microsoft.AspNetCore.SignalR.Client.Tests namespace Microsoft.AspNetCore.SignalR.Client.Tests
{ {
public partial class HttpConnectionTests public partial class HttpConnectionTests

13
test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Negotiate.cs
View File

@ -6,13 +6,12 @@ using System.IO;
using System.Net; using System.Net;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections;
using Microsoft.AspNetCore.Http.Connections;
using Microsoft.AspNetCore.Http.Connections.Client; using Microsoft.AspNetCore.Http.Connections.Client;
using Moq; using Moq;
using Newtonsoft.Json; using Newtonsoft.Json;
using Xunit; using Xunit;
using TransportType = Microsoft.AspNetCore.Http.Connections.TransportType;
namespace Microsoft.AspNetCore.SignalR.Client.Tests namespace Microsoft.AspNetCore.SignalR.Client.Tests
{ {
public partial class HttpConnectionTests public partial class HttpConnectionTests
@ -40,9 +39,9 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
} }
[Theory] [Theory]
[InlineData((TransportType)0)] [InlineData((HttpTransportType)0)]
[InlineData(TransportType.ServerSentEvents)] [InlineData(HttpTransportType.ServerSentEvents)]
public Task ConnectionCannotBeStartedIfNoCommonTransportsBetweenClientAndServer(TransportType serverTransports) public Task ConnectionCannotBeStartedIfNoCommonTransportsBetweenClientAndServer(HttpTransportType serverTransports)
{ {
return RunInvalidNegotiateResponseTest<InvalidOperationException>(ResponseUtils.CreateNegotiationContent(transportTypes: serverTransports), "Unable to connect to the server with any of the available transports."); return RunInvalidNegotiateResponseTest<InvalidOperationException>(ResponseUtils.CreateNegotiationContent(transportTypes: serverTransports), "Unable to connect to the server with any of the available transports.");
} }
@ -112,7 +111,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
var transportFactory = new Mock<ITransportFactory>(MockBehavior.Strict); var transportFactory = new Mock<ITransportFactory>(MockBehavior.Strict);
transportFactory.Setup(t => t.CreateTransport(TransportType.LongPolling)) transportFactory.Setup(t => t.CreateTransport(HttpTransportType.LongPolling))
.Returns(new TestTransport(transferFormat: TransferFormat.Text | TransferFormat.Binary)); .Returns(new TestTransport(transferFormat: TransferFormat.Text | TransferFormat.Binary));
await WithConnectionAsync( await WithConnectionAsync(
@ -158,7 +157,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
var transportFactory = new Mock<ITransportFactory>(MockBehavior.Strict); var transportFactory = new Mock<ITransportFactory>(MockBehavior.Strict);
transportFactory.Setup(t => t.CreateTransport(TransportType.LongPolling)) transportFactory.Setup(t => t.CreateTransport(HttpTransportType.LongPolling))
.Returns(new TestTransport(transferFormat: TransferFormat.Text | TransferFormat.Binary)); .Returns(new TestTransport(transferFormat: TransferFormat.Text | TransferFormat.Binary));
await WithConnectionAsync( await WithConnectionAsync(

2
test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Transport.cs
View File

@ -13,8 +13,6 @@ using Microsoft.AspNetCore.Http.Connections;
using Microsoft.AspNetCore.Http.Connections.Client; using Microsoft.AspNetCore.Http.Connections.Client;
using Xunit; using Xunit;
using HttpTransportType = Microsoft.AspNetCore.Http.Connections.TransportType;
namespace Microsoft.AspNetCore.SignalR.Client.Tests namespace Microsoft.AspNetCore.SignalR.Client.Tests
{ {
public partial class HttpConnectionTests public partial class HttpConnectionTests

10
test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.cs
View File

@ -7,6 +7,7 @@ using System.Net.Http;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections;
using Microsoft.AspNetCore.Http.Connections;
using Microsoft.AspNetCore.Http.Connections.Client; using Microsoft.AspNetCore.Http.Connections.Client;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;
@ -15,9 +16,6 @@ using Moq;
using Xunit; using Xunit;
using Xunit.Abstractions; using Xunit.Abstractions;
// This is needed because there's a System.Net.TransportType in net461 (it's internal in netcoreapp).
using TransportType = Microsoft.AspNetCore.Http.Connections.TransportType;
namespace Microsoft.AspNetCore.SignalR.Client.Tests namespace Microsoft.AspNetCore.SignalR.Client.Tests
{ {
public partial class HttpConnectionTests : LoggedTest public partial class HttpConnectionTests : LoggedTest
@ -41,9 +39,9 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
} }
[Theory] [Theory]
[InlineData((TransportType)0)] [InlineData((HttpTransportType)0)]
[InlineData(TransportType.All + 1)] [InlineData(HttpTransportType.All + 1)]
public void CannotStartConnectionWithInvalidTransportType(TransportType requestedTransportType) public void CannotStartConnectionWithInvalidTransportType(HttpTransportType requestedTransportType)
{ {
Assert.Throws<ArgumentOutOfRangeException>( Assert.Throws<ArgumentOutOfRangeException>(
() => new HttpConnection(new Uri("http://fakeuri.org/"), requestedTransportType)); () => new HttpConnection(new Uri("http://fakeuri.org/"), requestedTransportType));

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

@ -6,12 +6,12 @@ using System.Linq;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using Microsoft.AspNetCore.Http.Connections;
using Microsoft.AspNetCore.SignalR.Internal.Protocol; using Microsoft.AspNetCore.SignalR.Internal.Protocol;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Console; using Microsoft.Extensions.Logging.Console;
using Moq; using Moq;
using Xunit; using Xunit;
using TransportType = Microsoft.AspNetCore.Http.Connections.TransportType;
namespace Microsoft.AspNetCore.SignalR.Client.Tests namespace Microsoft.AspNetCore.SignalR.Client.Tests
{ {
@ -117,11 +117,11 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
} }
[Theory] [Theory]
[InlineData(TransportType.All)] [InlineData(HttpTransportType.All)]
[InlineData(TransportType.WebSockets)] [InlineData(HttpTransportType.WebSockets)]
[InlineData(TransportType.ServerSentEvents)] [InlineData(HttpTransportType.ServerSentEvents)]
[InlineData(TransportType.LongPolling)] [InlineData(HttpTransportType.LongPolling)]
public void WithTransportRegistersGivenTransportType(TransportType transportType) public void WithTransportRegistersGivenTransportType(HttpTransportType transportType)
{ {
var connectionBuilder = new HubConnectionBuilder(); var connectionBuilder = new HubConnectionBuilder();
connectionBuilder.WithTransport(transportType); connectionBuilder.WithTransport(transportType);

17
test/Microsoft.AspNetCore.SignalR.Client.Tests/ResponseUtils.cs
View File

@ -6,10 +6,9 @@ using System.Collections.Generic;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections;
using Microsoft.AspNetCore.Http.Connections;
using Newtonsoft.Json; using Newtonsoft.Json;
using TransportType = Microsoft.AspNetCore.Http.Connections.TransportType;
namespace Microsoft.AspNetCore.SignalR.Client.Tests namespace Microsoft.AspNetCore.SignalR.Client.Tests
{ {
internal static class ResponseUtils internal static class ResponseUtils
@ -38,31 +37,31 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
} }
public static string CreateNegotiationContent(string connectionId = "00000000-0000-0000-0000-000000000000", public static string CreateNegotiationContent(string connectionId = "00000000-0000-0000-0000-000000000000",
TransportType transportTypes = TransportType.All) HttpTransportType transportTypes = HttpTransportType.All)
{ {
var availableTransports = new List<object>(); var availableTransports = new List<object>();
if ((transportTypes & TransportType.WebSockets) != 0) if ((transportTypes & HttpTransportType.WebSockets) != 0)
{ {
availableTransports.Add(new availableTransports.Add(new
{ {
transport = nameof(TransportType.WebSockets), transport = nameof(HttpTransportType.WebSockets),
transferFormats = new[] { nameof(TransferFormat.Text), nameof(TransferFormat.Binary) } transferFormats = new[] { nameof(TransferFormat.Text), nameof(TransferFormat.Binary) }
}); });
} }
if ((transportTypes & TransportType.ServerSentEvents) != 0) if ((transportTypes & HttpTransportType.ServerSentEvents) != 0)
{ {
availableTransports.Add(new availableTransports.Add(new
{ {
transport = nameof(TransportType.ServerSentEvents), transport = nameof(HttpTransportType.ServerSentEvents),
transferFormats = new[] { nameof(TransferFormat.Text) } transferFormats = new[] { nameof(TransferFormat.Text) }
}); });
} }
if ((transportTypes & TransportType.LongPolling) != 0) if ((transportTypes & HttpTransportType.LongPolling) != 0)
{ {
availableTransports.Add(new availableTransports.Add(new
{ {
transport = nameof(TransportType.LongPolling), transport = nameof(HttpTransportType.LongPolling),
transferFormats = new[] { nameof(TransferFormat.Text), nameof(TransferFormat.Binary) } transferFormats = new[] { nameof(TransferFormat.Text), nameof(TransferFormat.Binary) }
}); });
} }

2
test/Microsoft.AspNetCore.SignalR.Client.Tests/TestTransportFactory.cs
View File

@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
_transport = transport; _transport = transport;
} }
public ITransport CreateTransport(TransportType availableServerTransports) public ITransport CreateTransport(HttpTransportType availableServerTransports)
{ {
return _transport; return _transport;
} }

16
test/Microsoft.AspNetCore.SignalR.Redis.Tests/RedisEndToEnd.cs
View File

@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.SignalR.Redis.Tests
[ConditionalTheory()] [ConditionalTheory()]
[SkipIfDockerNotPresent] [SkipIfDockerNotPresent]
[MemberData(nameof(TransportTypesAndProtocolTypes))] [MemberData(nameof(TransportTypesAndProtocolTypes))]
public async Task HubConnectionCanSendAndReceiveMessages(TransportType transportType, string protocolName) public async Task HubConnectionCanSendAndReceiveMessages(HttpTransportType transportType, string protocolName)
{ {
using (StartLog(out var loggerFactory, testName: using (StartLog(out var loggerFactory, testName:
$"{nameof(HubConnectionCanSendAndReceiveMessages)}_{transportType.ToString()}_{protocolName}")) $"{nameof(HubConnectionCanSendAndReceiveMessages)}_{transportType.ToString()}_{protocolName}"))
@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.SignalR.Redis.Tests
[ConditionalTheory()] [ConditionalTheory()]
[SkipIfDockerNotPresent] [SkipIfDockerNotPresent]
[MemberData(nameof(TransportTypesAndProtocolTypes))] [MemberData(nameof(TransportTypesAndProtocolTypes))]
public async Task HubConnectionCanSendAndReceiveGroupMessages(TransportType transportType, string protocolName) public async Task HubConnectionCanSendAndReceiveGroupMessages(HttpTransportType transportType, string protocolName)
{ {
using (StartLog(out var loggerFactory, testName: using (StartLog(out var loggerFactory, testName:
$"{nameof(HubConnectionCanSendAndReceiveGroupMessages)}_{transportType.ToString()}_{protocolName}")) $"{nameof(HubConnectionCanSendAndReceiveGroupMessages)}_{transportType.ToString()}_{protocolName}"))
@ -89,7 +89,7 @@ namespace Microsoft.AspNetCore.SignalR.Redis.Tests
} }
} }
private static HubConnection CreateConnection(string url, TransportType transportType, IHubProtocol protocol, ILoggerFactory loggerFactory) private static HubConnection CreateConnection(string url, HttpTransportType transportType, IHubProtocol protocol, ILoggerFactory loggerFactory)
{ {
return new HubConnectionBuilder() return new HubConnectionBuilder()
.WithUrl(url) .WithUrl(url)
@ -99,14 +99,14 @@ namespace Microsoft.AspNetCore.SignalR.Redis.Tests
.Build(); .Build();
} }
private static IEnumerable<TransportType> TransportTypes() private static IEnumerable<HttpTransportType> TransportTypes()
{ {
if (TestHelpers.IsWebSocketsSupported()) if (TestHelpers.IsWebSocketsSupported())
{ {
yield return TransportType.WebSockets; yield return HttpTransportType.WebSockets;
} }
yield return TransportType.ServerSentEvents; yield return HttpTransportType.ServerSentEvents;
yield return TransportType.LongPolling; yield return HttpTransportType.LongPolling;
} }
public static IEnumerable<object[]> TransportTypesAndProtocolTypes public static IEnumerable<object[]> TransportTypesAndProtocolTypes
@ -117,7 +117,7 @@ namespace Microsoft.AspNetCore.SignalR.Redis.Tests
{ {
yield return new object[] { transport, JsonHubProtocol.ProtocolName }; yield return new object[] { transport, JsonHubProtocol.ProtocolName };
if (transport != TransportType.ServerSentEvents) if (transport != HttpTransportType.ServerSentEvents)
{ {
yield return new object[] { transport, MessagePackHubProtocol.ProtocolName }; yield return new object[] { transport, MessagePackHubProtocol.ProtocolName };
} }

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

@ -15,21 +15,21 @@ namespace Microsoft.AspNetCore.SignalR.Tests
public class DefaultTransportFactoryTests public class DefaultTransportFactoryTests
{ {
[Theory] [Theory]
[InlineData((TransportType)0)] [InlineData((HttpTransportType)0)]
[InlineData(TransportType.All + 1)] [InlineData(HttpTransportType.All + 1)]
public void DefaultTransportFactoryCannotBeCreatedWithInvalidTransportType(TransportType transportType) public void DefaultTransportFactoryCannotBeCreatedWithInvalidTransportType(HttpTransportType transportType)
{ {
Assert.Throws<ArgumentOutOfRangeException>( Assert.Throws<ArgumentOutOfRangeException>(
() => new DefaultTransportFactory(transportType, new LoggerFactory(), new HttpClient(), httpOptions: null)); () => new DefaultTransportFactory(transportType, new LoggerFactory(), new HttpClient(), httpOptions: null));
} }
[Theory] [Theory]
[InlineData(TransportType.All)] [InlineData(HttpTransportType.All)]
[InlineData(TransportType.LongPolling)] [InlineData(HttpTransportType.LongPolling)]
[InlineData(TransportType.ServerSentEvents)] [InlineData(HttpTransportType.ServerSentEvents)]
[InlineData(TransportType.LongPolling | TransportType.WebSockets)] [InlineData(HttpTransportType.LongPolling | HttpTransportType.WebSockets)]
[InlineData(TransportType.ServerSentEvents | TransportType.WebSockets)] [InlineData(HttpTransportType.ServerSentEvents | HttpTransportType.WebSockets)]
public void DefaultTransportFactoryCannotBeCreatedWithoutHttpClient(TransportType transportType) public void DefaultTransportFactoryCannotBeCreatedWithoutHttpClient(HttpTransportType transportType)
{ {
var exception = Assert.Throws<ArgumentNullException>( var exception = Assert.Throws<ArgumentNullException>(
() => new DefaultTransportFactory(transportType, new LoggerFactory(), httpClient: null, httpOptions: null)); () => new DefaultTransportFactory(transportType, new LoggerFactory(), httpClient: null, httpOptions: null));
@ -40,27 +40,27 @@ namespace Microsoft.AspNetCore.SignalR.Tests
[Fact] [Fact]
public void DefaultTransportFactoryCanBeCreatedWithoutHttpClientIfWebSocketsTransportRequestedExplicitly() public void DefaultTransportFactoryCanBeCreatedWithoutHttpClientIfWebSocketsTransportRequestedExplicitly()
{ {
new DefaultTransportFactory(TransportType.WebSockets, new LoggerFactory(), httpClient: null, httpOptions: null); new DefaultTransportFactory(HttpTransportType.WebSockets, new LoggerFactory(), httpClient: null, httpOptions: null);
} }
[ConditionalTheory] [ConditionalTheory]
[InlineData(TransportType.WebSockets, typeof(WebSocketsTransport))] [InlineData(HttpTransportType.WebSockets, typeof(WebSocketsTransport))]
[InlineData(TransportType.ServerSentEvents, typeof(ServerSentEventsTransport))] [InlineData(HttpTransportType.ServerSentEvents, typeof(ServerSentEventsTransport))]
[InlineData(TransportType.LongPolling, typeof(LongPollingTransport))] [InlineData(HttpTransportType.LongPolling, typeof(LongPollingTransport))]
[WebSocketsSupportedCondition] [WebSocketsSupportedCondition]
public void DefaultTransportFactoryCreatesRequestedTransportIfAvailable(TransportType requestedTransport, Type expectedTransportType) public void DefaultTransportFactoryCreatesRequestedTransportIfAvailable(HttpTransportType requestedTransport, Type expectedTransportType)
{ {
var transportFactory = new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpOptions: null); var transportFactory = new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpOptions: null);
Assert.IsType(expectedTransportType, Assert.IsType(expectedTransportType,
transportFactory.CreateTransport(TransportType.All)); transportFactory.CreateTransport(HttpTransportType.All));
} }
[Theory] [Theory]
[InlineData(TransportType.WebSockets)] [InlineData(HttpTransportType.WebSockets)]
[InlineData(TransportType.ServerSentEvents)] [InlineData(HttpTransportType.ServerSentEvents)]
[InlineData(TransportType.LongPolling)] [InlineData(HttpTransportType.LongPolling)]
[InlineData(TransportType.All)] [InlineData(HttpTransportType.All)]
public void DefaultTransportFactoryThrowsIfItCannotCreateRequestedTransport(TransportType requestedTransport) public void DefaultTransportFactoryThrowsIfItCannotCreateRequestedTransport(HttpTransportType requestedTransport)
{ {
var transportFactory = var transportFactory =
new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpOptions: null); new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpOptions: null);
@ -75,34 +75,34 @@ namespace Microsoft.AspNetCore.SignalR.Tests
public void DefaultTransportFactoryCreatesWebSocketsTransportIfAvailable() public void DefaultTransportFactoryCreatesWebSocketsTransportIfAvailable()
{ {
Assert.IsType<WebSocketsTransport>( Assert.IsType<WebSocketsTransport>(
new DefaultTransportFactory(TransportType.All, loggerFactory: null, httpClient: new HttpClient(), httpOptions: null) new DefaultTransportFactory(HttpTransportType.All, loggerFactory: null, httpClient: new HttpClient(), httpOptions: null)
.CreateTransport(TransportType.All)); .CreateTransport(HttpTransportType.All));
} }
[Theory] [Theory]
[InlineData(TransportType.All, typeof(ServerSentEventsTransport))] [InlineData(HttpTransportType.All, typeof(ServerSentEventsTransport))]
[InlineData(TransportType.ServerSentEvents, typeof(ServerSentEventsTransport))] [InlineData(HttpTransportType.ServerSentEvents, typeof(ServerSentEventsTransport))]
[InlineData(TransportType.LongPolling, typeof(LongPollingTransport))] [InlineData(HttpTransportType.LongPolling, typeof(LongPollingTransport))]
public void DefaultTransportFactoryCreatesRequestedTransportIfAvailable_Win7(TransportType requestedTransport, Type expectedTransportType) public void DefaultTransportFactoryCreatesRequestedTransportIfAvailable_Win7(HttpTransportType requestedTransport, Type expectedTransportType)
{ {
if (!TestHelpers.IsWebSocketsSupported()) if (!TestHelpers.IsWebSocketsSupported())
{ {
var transportFactory = new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpOptions: null); var transportFactory = new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpOptions: null);
Assert.IsType(expectedTransportType, Assert.IsType(expectedTransportType,
transportFactory.CreateTransport(TransportType.All)); transportFactory.CreateTransport(HttpTransportType.All));
} }
} }
[Theory] [Theory]
[InlineData(TransportType.WebSockets)] [InlineData(HttpTransportType.WebSockets)]
public void DefaultTransportFactoryThrowsIfItCannotCreateRequestedTransport_Win7(TransportType requestedTransport) public void DefaultTransportFactoryThrowsIfItCannotCreateRequestedTransport_Win7(HttpTransportType requestedTransport)
{ {
if (!TestHelpers.IsWebSocketsSupported()) if (!TestHelpers.IsWebSocketsSupported())
{ {
var transportFactory = var transportFactory =
new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpOptions: null); new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpOptions: null);
var ex = Assert.Throws<InvalidOperationException>( var ex = Assert.Throws<InvalidOperationException>(
() => transportFactory.CreateTransport(TransportType.All)); () => transportFactory.CreateTransport(HttpTransportType.All));
Assert.Equal("No requested transports available on the server.", ex.Message); Assert.Equal("No requested transports available on the server.", ex.Message);
} }

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

@ -72,7 +72,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
[Theory] [Theory]
[MemberData(nameof(TransportTypes))] [MemberData(nameof(TransportTypes))]
public async Task CanStartAndStopConnectionUsingGivenTransport(TransportType transportType) public async Task CanStartAndStopConnectionUsingGivenTransport(HttpTransportType transportType)
{ {
var url = _serverFixture.Url + "/echo"; var url = _serverFixture.Url + "/echo";
var connection = new HttpConnection(new Uri(url), transportType); var connection = new HttpConnection(new Uri(url), transportType);
@ -170,7 +170,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
.Returns<HttpRequestMessage, CancellationToken>( .Returns<HttpRequestMessage, CancellationToken>(
(request, cancellationToken) => Task.FromException<HttpResponseMessage>(new InvalidOperationException("HTTP requests should not be sent."))); (request, cancellationToken) => Task.FromException<HttpResponseMessage>(new InvalidOperationException("HTTP requests should not be sent.")));
var connection = new HttpConnection(new Uri(url), TransportType.WebSockets, loggerFactory, new HttpOptions { HttpMessageHandler = (httpMessageHandler) => mockHttpHandler.Object }); var connection = new HttpConnection(new Uri(url), HttpTransportType.WebSockets, loggerFactory, new HttpOptions { HttpMessageHandler = (httpMessageHandler) => mockHttpHandler.Object });
try try
{ {
@ -198,7 +198,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
[Theory] [Theory]
[MemberData(nameof(TransportTypesAndTransferFormats))] [MemberData(nameof(TransportTypesAndTransferFormats))]
public async Task ConnectionCanSendAndReceiveMessages(TransportType transportType, TransferFormat requestedTransferFormat) public async Task ConnectionCanSendAndReceiveMessages(HttpTransportType transportType, TransferFormat requestedTransferFormat)
{ {
using (StartLog(out var loggerFactory, minLogLevel: LogLevel.Trace, testName: $"ConnectionCanSendAndReceiveMessages_{transportType.ToString()}_{requestedTransferFormat.ToString()}")) using (StartLog(out var loggerFactory, minLogLevel: LogLevel.Trace, testName: $"ConnectionCanSendAndReceiveMessages_{transportType.ToString()}_{requestedTransferFormat.ToString()}"))
{ {
@ -269,7 +269,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
var logger = loggerFactory.CreateLogger<EndToEndTests>(); var logger = loggerFactory.CreateLogger<EndToEndTests>();
var url = _serverFixture.Url + "/echo"; var url = _serverFixture.Url + "/echo";
var connection = new HttpConnection(new Uri(url), TransportType.WebSockets, loggerFactory); var connection = new HttpConnection(new Uri(url), HttpTransportType.WebSockets, loggerFactory);
try try
{ {
@ -308,7 +308,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
{ {
try try
{ {
await ServerClosesConnectionWithErrorIfHubCannotBeCreated(TransportType.WebSockets); await ServerClosesConnectionWithErrorIfHubCannotBeCreated(HttpTransportType.WebSockets);
Assert.True(false, "Expected error was not thrown."); Assert.True(false, "Expected error was not thrown.");
} }
catch catch
@ -322,7 +322,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
{ {
try try
{ {
await ServerClosesConnectionWithErrorIfHubCannotBeCreated(TransportType.LongPolling); await ServerClosesConnectionWithErrorIfHubCannotBeCreated(HttpTransportType.LongPolling);
Assert.True(false, "Expected error was not thrown."); Assert.True(false, "Expected error was not thrown.");
} }
catch catch
@ -331,7 +331,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
} }
} }
private async Task ServerClosesConnectionWithErrorIfHubCannotBeCreated(TransportType transportType) private async Task ServerClosesConnectionWithErrorIfHubCannotBeCreated(HttpTransportType transportType)
{ {
using (StartLog(out var loggerFactory, testName: $"ConnectionCanSendAndReceiveMessages_{transportType.ToString()}")) using (StartLog(out var loggerFactory, testName: $"ConnectionCanSendAndReceiveMessages_{transportType.ToString()}"))
{ {
@ -393,7 +393,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
{ {
private ITransport _transport; private ITransport _transport;
public ITransport CreateTransport(TransportType availableServerTransports) public ITransport CreateTransport(HttpTransportType availableServerTransports)
{ {
if (_transport == null) if (_transport == null)
{ {
@ -458,10 +458,10 @@ namespace Microsoft.AspNetCore.SignalR.Tests
{ {
if (TestHelpers.IsWebSocketsSupported()) if (TestHelpers.IsWebSocketsSupported())
{ {
yield return new object[] { TransportType.WebSockets }; yield return new object[] { HttpTransportType.WebSockets };
} }
yield return new object[] { TransportType.ServerSentEvents }; yield return new object[] { HttpTransportType.ServerSentEvents };
yield return new object[] { TransportType.LongPolling }; yield return new object[] { HttpTransportType.LongPolling };
} }
} }
@ -473,7 +473,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
{ {
yield return new[] { transport[0], TransferFormat.Text }; yield return new[] { transport[0], TransferFormat.Text };
if ((TransportType)transport[0] != TransportType.ServerSentEvents) if ((HttpTransportType)transport[0] != HttpTransportType.ServerSentEvents)
{ {
yield return new[] { transport[0], TransferFormat.Binary }; yield return new[] { transport[0], TransferFormat.Binary };
} }