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

Rename HubConnection Extension Methods from Invoke to InvokeAsync (#637)

This commit is contained in:
Mikael Mengistu 2017-07-05 22:56:03 -07:00 committed by GitHub
parent cfaa4b69d7
commit 2597e52e53
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/ClientSample/HubSample.cs
View File

@ -60,7 +60,7 @@ namespace ClientSample
break; break;
} }
await connection.Invoke<object>("Send", cts.Token, line); await connection.InvokeAsync<object>("Send", cts.Token, line);
} }
} }
catch (AggregateException aex) when (aex.InnerExceptions.All(e => e is OperationCanceledException)) catch (AggregateException aex) when (aex.InnerExceptions.All(e => e is OperationCanceledException))

12
src/Microsoft.AspNetCore.SignalR.Client/HubConnectionExtensions.cs
View File

@ -10,10 +10,10 @@ namespace Microsoft.AspNetCore.SignalR.Client
{ {
public static class HubConnectionExtensions public static class HubConnectionExtensions
{ {
public static Task Invoke(this HubConnection hubConnection, string methodName, params object[] args) => public static Task InvokeAsync(this HubConnection hubConnection, string methodName, params object[] args) =>
Invoke(hubConnection, methodName, CancellationToken.None, args); InvokeAsync(hubConnection, methodName, CancellationToken.None, args);
public static Task Invoke(this HubConnection hubConnection, string methodName, CancellationToken cancellationToken, params object[] args) public static Task InvokeAsync(this HubConnection hubConnection, string methodName, CancellationToken cancellationToken, params object[] args)
{ {
if (hubConnection == null) if (hubConnection == null)
{ {
@ -23,10 +23,10 @@ namespace Microsoft.AspNetCore.SignalR.Client
return hubConnection.InvokeAsync(methodName, typeof(object), cancellationToken, args); return hubConnection.InvokeAsync(methodName, typeof(object), cancellationToken, args);
} }
public static Task<TResult> Invoke<TResult>(this HubConnection hubConnection, string methodName, params object[] args) => public static Task<TResult> InvokeAsync<TResult>(this HubConnection hubConnection, string methodName, params object[] args) =>
Invoke<TResult>(hubConnection, methodName, CancellationToken.None, args); InvokeAsync<TResult>(hubConnection, methodName, CancellationToken.None, args);
public async static Task<TResult> Invoke<TResult>(this HubConnection hubConnection, string methodName, CancellationToken cancellationToken, params object[] args) public async static Task<TResult> InvokeAsync<TResult>(this HubConnection hubConnection, string methodName, CancellationToken cancellationToken, params object[] args)
{ {
if (hubConnection == null) if (hubConnection == null)
{ {

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

@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
{ {
await connection.StartAsync(); await connection.StartAsync();
var result = await connection.Invoke<string>(nameof(TestHub.HelloWorld)); var result = await connection.InvokeAsync<string>(nameof(TestHub.HelloWorld));
Assert.Equal("Hello World!", result); Assert.Equal("Hello World!", result);
} }
@ -85,7 +85,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
{ {
await connection.StartAsync(); await connection.StartAsync();
var result = await connection.Invoke<string>(nameof(TestHub.Echo), originalMessage); var result = await connection.InvokeAsync<string>(nameof(TestHub.Echo), originalMessage);
Assert.Equal(originalMessage, result); Assert.Equal(originalMessage, result);
} }
@ -108,7 +108,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
{ {
await connection.StartAsync(); await connection.StartAsync();
var result = await connection.Invoke<string>(nameof(TestHub.Echo).ToLowerInvariant(), originalMessage); var result = await connection.InvokeAsync<string>(nameof(TestHub.Echo).ToLowerInvariant(), originalMessage);
Assert.Equal(originalMessage, result); Assert.Equal(originalMessage, result);
} }
@ -134,7 +134,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
var tcs = new TaskCompletionSource<string>(); var tcs = new TaskCompletionSource<string>();
connection.On<string>("Echo", tcs.SetResult); connection.On<string>("Echo", tcs.SetResult);
await connection.Invoke(nameof(TestHub.CallEcho), originalMessage).OrTimeout(); await connection.InvokeAsync(nameof(TestHub.CallEcho), originalMessage).OrTimeout();
Assert.Equal(originalMessage, await tcs.Task.OrTimeout()); Assert.Equal(originalMessage, await tcs.Task.OrTimeout());
} }
@ -181,7 +181,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
await connection.StartAsync(); await connection.StartAsync();
var ex = await Assert.ThrowsAnyAsync<Exception>( var ex = await Assert.ThrowsAnyAsync<Exception>(
async () => await connection.Invoke("!@#$%")); async () => await connection.InvokeAsync("!@#$%"));
Assert.Equal("Unknown hub method '!@#$%'", ex.Message); Assert.Equal("Unknown hub method '!@#$%'", ex.Message);
} }

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

@ -69,7 +69,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
{ {
await hubConnection.StartAsync(); await hubConnection.StartAsync();
var invokeTask = hubConnection.Invoke("Foo"); var invokeTask = hubConnection.InvokeAsync("Foo");
// skip negotiation // skip negotiation
await connection.ReadSentTextMessageAsync().OrTimeout(); await connection.ReadSentTextMessageAsync().OrTimeout();
@ -121,7 +121,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
{ {
await hubConnection.StartAsync(); await hubConnection.StartAsync();
var invokeTask = hubConnection.Invoke("Foo"); var invokeTask = hubConnection.InvokeAsync("Foo");
await connection.ReceiveJsonMessage(new { invocationId = "1", type = 3 }).OrTimeout(); await connection.ReceiveJsonMessage(new { invocationId = "1", type = 3 }).OrTimeout();
@ -165,7 +165,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
{ {
await hubConnection.StartAsync(); await hubConnection.StartAsync();
var invokeTask = hubConnection.Invoke<int>("Foo"); var invokeTask = hubConnection.InvokeAsync<int>("Foo");
await connection.ReceiveJsonMessage(new { invocationId = "1", type = 3, result = 42 }).OrTimeout(); await connection.ReceiveJsonMessage(new { invocationId = "1", type = 3, result = 42 }).OrTimeout();
@ -210,7 +210,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
{ {
await hubConnection.StartAsync(); await hubConnection.StartAsync();
var invokeTask = hubConnection.Invoke<int>("Foo"); var invokeTask = hubConnection.InvokeAsync<int>("Foo");
await connection.ReceiveJsonMessage(new { invocationId = "1", type = 3, error = "An error occurred" }).OrTimeout(); await connection.ReceiveJsonMessage(new { invocationId = "1", type = 3, error = "An error occurred" }).OrTimeout();
@ -256,7 +256,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
{ {
await hubConnection.StartAsync(); await hubConnection.StartAsync();
var invokeTask = hubConnection.Invoke<int>("Foo"); var invokeTask = hubConnection.InvokeAsync<int>("Foo");
await connection.ReceiveJsonMessage(new { invocationId = "1", type = 2, item = 42 }).OrTimeout(); await connection.ReceiveJsonMessage(new { invocationId = "1", type = 2, item = 42 }).OrTimeout();

8
test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.cs
View File

@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
await hubConnection.StartAsync(); await hubConnection.StartAsync();
var actualException = var actualException =
await Assert.ThrowsAsync<InvalidOperationException>(async () => await hubConnection.Invoke<int>("test")); await Assert.ThrowsAsync<InvalidOperationException>(async () => await hubConnection.InvokeAsync<int>("test"));
Assert.Same(exception, actualException); Assert.Same(exception, actualException);
} }
@ -102,7 +102,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
await hubConnection.StartAsync(); await hubConnection.StartAsync();
await hubConnection.DisposeAsync(); await hubConnection.DisposeAsync();
var exception = await Assert.ThrowsAsync<InvalidOperationException>( var exception = await Assert.ThrowsAsync<InvalidOperationException>(
async () => await hubConnection.Invoke<int>("test")); async () => await hubConnection.InvokeAsync<int>("test"));
Assert.Equal("Connection has been terminated.", exception.Message); Assert.Equal("Connection has been terminated.", exception.Message);
} }
@ -114,7 +114,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
var hubConnection = new HubConnection(connection, new LoggerFactory()); var hubConnection = new HubConnection(connection, new LoggerFactory());
await hubConnection.StartAsync(); await hubConnection.StartAsync();
var invokeTask = hubConnection.Invoke<int>("testMethod"); var invokeTask = hubConnection.InvokeAsync<int>("testMethod");
await hubConnection.DisposeAsync(); await hubConnection.DisposeAsync();
await Assert.ThrowsAsync<TaskCanceledException>(async () => await invokeTask); await Assert.ThrowsAsync<TaskCanceledException>(async () => await invokeTask);
@ -133,7 +133,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
var hubConnection = new HubConnection(mockConnection.Object, new LoggerFactory()); var hubConnection = new HubConnection(mockConnection.Object, new LoggerFactory());
await hubConnection.StartAsync(); await hubConnection.StartAsync();
var invokeTask = hubConnection.Invoke<int>("testMethod"); var invokeTask = hubConnection.InvokeAsync<int>("testMethod");
await hubConnection.DisposeAsync(); await hubConnection.DisposeAsync();
var thrown = await Assert.ThrowsAsync(exception.GetType(), async () => await invokeTask); var thrown = await Assert.ThrowsAsync(exception.GetType(), async () => await invokeTask);