-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #236 from nenoNaninu/receiver_CancellationToken
Support `CancellationToken` in the last parameter of a receive method
- Loading branch information
Showing
12 changed files
with
306 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
tests/TypeScriptTests/src/json/receiverWithCancellationToken.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| import { HubConnectionBuilder } from '@microsoft/signalr' | ||
| import { getHubProxyFactory, getReceiverRegister } from '../generated/json/TypedSignalR.Client' | ||
| import { UserDefinedType } from '../generated/json/TypedSignalR.Client.TypeScript.Tests.Shared'; | ||
| import { IReceiverWithCancellationToken } from '../generated/json/TypedSignalR.Client/TypedSignalR.Client.TypeScript.Tests.Shared'; | ||
|
|
||
| const toUTCString = (date: string | Date): string => { | ||
| if (typeof date === 'string') { | ||
| const d = new Date(date); | ||
| return d.toUTCString(); | ||
| } | ||
|
|
||
| return date.toUTCString(); | ||
| } | ||
|
|
||
| const answerMessages: string[] = [ | ||
| "b1f7cd73-13b8-49bd-9557-ffb38859d18b", | ||
| "3f5c3585-d01b-4f8f-8139-62a1241850e2", | ||
| "92021a22-5823-4501-8cbd-c20d4ca6e54c", | ||
| "5b134f73-2dc1-4271-8316-1a4250f42241", | ||
| "e73acd30-e034-4569-8f30-88ac34b99052", | ||
| "0d7531b5-0a36-4fe7-bbe5-8fee38c38c07", | ||
| "32915627-3df6-41dc-8d30-7c655c2f7e61", | ||
| "c875a6f9-9ddb-440b-a7e4-6e893f59ab9e", | ||
| ]; | ||
|
|
||
| const guids: string[] = [ | ||
| "b2f626e5-b4d4-4713-891d-f6cb107e502e", | ||
| "22733524-2087-4701-a586-c6bf0ce36f74", | ||
| "b89324bf-daf2-422a-85f2-6843b9c09b6a", | ||
| "779769d1-0aee-4dba-82c7-9e1044836d75" | ||
| ]; | ||
|
|
||
| const dateTimes: string[] = [ | ||
| "2017-04-17", | ||
| "2018-05-25", | ||
| "2019-03-31", | ||
| "2022-02-06", | ||
| ]; | ||
|
|
||
| const testMethod = async () => { | ||
| const connection = new HubConnectionBuilder() | ||
| .withUrl("http://localhost:5000/hubs/receiverTestWithCancellationTokenHub") | ||
| .build(); | ||
|
|
||
| const receiveMessageList: [string, number][] = []; | ||
| const userDefinedList: UserDefinedType[] = []; | ||
| let notifyCallCount = 0; | ||
|
|
||
| const receiver: IReceiverWithCancellationToken = { | ||
| receiveMessage: (message: string, value: number): Promise<void> => { | ||
| receiveMessageList.push([message, value]); | ||
| return Promise.resolve(); | ||
| }, | ||
| notify: (): Promise<void> => { | ||
| notifyCallCount += 1; | ||
| return Promise.resolve(); | ||
| }, | ||
| receiveCustomMessage: (userDefined: UserDefinedType): Promise<void> => { | ||
| userDefinedList.push(userDefined) | ||
| return Promise.resolve(); | ||
| } | ||
| } | ||
|
|
||
| const hubProxy = getHubProxyFactory("IReceiverTestHub") | ||
| .createHubProxy(connection); | ||
|
|
||
| const subscription = getReceiverRegister("IReceiverWithCancellationToken") | ||
| .register(connection, receiver); | ||
|
|
||
| try { | ||
| await connection.start(); | ||
| await hubProxy.start(); | ||
|
|
||
| expect(notifyCallCount).toEqual(17); | ||
|
|
||
| for (let i = 0; i < receiveMessageList.length; i++) { | ||
| expect(receiveMessageList[i][0]).toEqual(answerMessages[i]); | ||
| expect(receiveMessageList[i][1]).toEqual(i); | ||
| } | ||
|
|
||
| for (let i = 0; i < userDefinedList.length; i++) { | ||
| expect(userDefinedList[i].guid).toEqual(guids[i]); | ||
| expect(toUTCString(userDefinedList[i].dateTime)).toEqual(toUTCString(dateTimes[i])); | ||
| } | ||
| } | ||
| finally { | ||
| subscription.dispose(); | ||
| await connection.stop() | ||
| } | ||
| } | ||
|
|
||
| test('receiver.test', testMethod); |
94 changes: 94 additions & 0 deletions
94
tests/TypeScriptTests/src/msgpack/receiverWithCancellationToken.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| import { HubConnectionBuilder } from '@microsoft/signalr' | ||
| import { MessagePackHubProtocol } from '@microsoft/signalr-protocol-msgpack'; | ||
| import { getHubProxyFactory, getReceiverRegister } from '../generated/msgpack/TypedSignalR.Client' | ||
| import { UserDefinedType } from '../generated/msgpack/TypedSignalR.Client.TypeScript.Tests.Shared'; | ||
| import { IReceiverWithCancellationToken } from '../generated/msgpack/TypedSignalR.Client/TypedSignalR.Client.TypeScript.Tests.Shared'; | ||
|
|
||
| const toUTCString = (date: string | Date): string => { | ||
| if (typeof date === 'string') { | ||
| const d = new Date(date); | ||
| return d.toUTCString(); | ||
| } | ||
|
|
||
| return date.toUTCString(); | ||
| } | ||
|
|
||
| const answerMessages: string[] = [ | ||
| "b1f7cd73-13b8-49bd-9557-ffb38859d18b", | ||
| "3f5c3585-d01b-4f8f-8139-62a1241850e2", | ||
| "92021a22-5823-4501-8cbd-c20d4ca6e54c", | ||
| "5b134f73-2dc1-4271-8316-1a4250f42241", | ||
| "e73acd30-e034-4569-8f30-88ac34b99052", | ||
| "0d7531b5-0a36-4fe7-bbe5-8fee38c38c07", | ||
| "32915627-3df6-41dc-8d30-7c655c2f7e61", | ||
| "c875a6f9-9ddb-440b-a7e4-6e893f59ab9e", | ||
| ]; | ||
|
|
||
| const guids: string[] = [ | ||
| "b2f626e5-b4d4-4713-891d-f6cb107e502e", | ||
| "22733524-2087-4701-a586-c6bf0ce36f74", | ||
| "b89324bf-daf2-422a-85f2-6843b9c09b6a", | ||
| "779769d1-0aee-4dba-82c7-9e1044836d75" | ||
| ]; | ||
|
|
||
| const dateTimes: string[] = [ | ||
| "2017-04-17", | ||
| "2018-05-25", | ||
| "2019-03-31", | ||
| "2022-02-06", | ||
| ]; | ||
|
|
||
| const testMethod = async () => { | ||
| const connection = new HubConnectionBuilder() | ||
| .withUrl("http://localhost:5000/hubs/receiverTestWithCancellationTokenHub") | ||
| .withHubProtocol(new MessagePackHubProtocol()) | ||
| .build(); | ||
|
|
||
| const receiveMessageList: [string, number][] = []; | ||
| const userDefinedList: UserDefinedType[] = []; | ||
| let notifyCallCount = 0; | ||
|
|
||
| const receiver: IReceiverWithCancellationToken = { | ||
| receiveMessage: (message: string, value: number): Promise<void> => { | ||
| receiveMessageList.push([message, value]); | ||
| return Promise.resolve(); | ||
| }, | ||
| notify: (): Promise<void> => { | ||
| notifyCallCount += 1; | ||
| return Promise.resolve(); | ||
| }, | ||
| receiveCustomMessage: (userDefined: UserDefinedType): Promise<void> => { | ||
| userDefinedList.push(userDefined) | ||
| return Promise.resolve(); | ||
| } | ||
| } | ||
|
|
||
| const hubProxy = getHubProxyFactory("IReceiverTestHub") | ||
| .createHubProxy(connection); | ||
|
|
||
| const subscription = getReceiverRegister("IReceiverWithCancellationToken") | ||
| .register(connection, receiver); | ||
|
|
||
| try { | ||
| await connection.start(); | ||
| await hubProxy.start(); | ||
|
|
||
| expect(notifyCallCount).toEqual(17); | ||
|
|
||
| for (let i = 0; i < receiveMessageList.length; i++) { | ||
| expect(receiveMessageList[i][0]).toEqual(answerMessages[i]); | ||
| expect(receiveMessageList[i][1]).toEqual(i); | ||
| } | ||
|
|
||
| for (let i = 0; i < userDefinedList.length; i++) { | ||
| expect(userDefinedList[i].Guid).toEqual(guids[i]); | ||
| expect(toUTCString(userDefinedList[i].DateTime)).toEqual(toUTCString(dateTimes[i])); | ||
| } | ||
| } | ||
| finally { | ||
| subscription.dispose(); | ||
| await connection.stop(); | ||
| } | ||
| } | ||
|
|
||
| test('receiver.test', testMethod); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
tests/TypedSignalR.Client.TypeScript.Tests.Server/Hubs/ReceiverTestHub.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.