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

Allow sending null params in Java client (#11272)

This commit is contained in:
Mikael Mengistu 2019-06-17 14:32:02 -07:00 committed by GitHub
parent 9c4faf86e5
commit 4235dd2999
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
View File

@ -577,6 +577,10 @@ public class HubConnection {
}
Object[] checkUploadStream(Object[] args, List<String> streamIds) {
if (args == null) {
return new Object[] { null };
}
List<Object> params = new ArrayList<>(Arrays.asList(args));
for (Object arg: args) {
if (arg instanceof Observable) {
@ -587,7 +591,7 @@ public class HubConnection {
this.streamMap.put(streamId, stream);
}
}
return params.toArray();
}

36
src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionTest.java
View File

@ -954,6 +954,42 @@ class HubConnectionTest {
assertEquals(Integer.valueOf(42), result.timeout(1000, TimeUnit.MILLISECONDS).blockingGet());
}
@Test
public void canSendNullArgInInvocation() {
MockTransport mockTransport = new MockTransport();
HubConnection hubConnection = TestUtils.createHubConnection("http://example.com", mockTransport);
hubConnection.start().timeout(1, TimeUnit.SECONDS).blockingAwait();
AtomicBoolean done = new AtomicBoolean();
Single<String> result = hubConnection.invoke(String.class, "fixedMessage", null);
result.doOnSuccess(value -> done.set(true));
assertEquals("{\"type\":1,\"invocationId\":\"1\",\"target\":\"fixedMessage\",\"arguments\":[null]}" + RECORD_SEPARATOR, mockTransport.getSentMessages()[1]);
assertFalse(done.get());
mockTransport.receiveMessage("{\"type\":3,\"invocationId\":\"1\",\"result\":\"Hello World\"}" + RECORD_SEPARATOR);
assertEquals("Hello World", result.timeout(1000, TimeUnit.MILLISECONDS).blockingGet());
}
@Test
public void canSendMultipleNullArgsInInvocation() {
MockTransport mockTransport = new MockTransport();
HubConnection hubConnection = TestUtils.createHubConnection("http://example.com", mockTransport);
hubConnection.start().timeout(1, TimeUnit.SECONDS).blockingAwait();
AtomicBoolean done = new AtomicBoolean();
Single<String> result = hubConnection.invoke(String.class, "fixedMessage", null, null);
result.doOnSuccess(value -> done.set(true));
assertEquals("{\"type\":1,\"invocationId\":\"1\",\"target\":\"fixedMessage\",\"arguments\":[null,null]}"+ RECORD_SEPARATOR, mockTransport.getSentMessages()[1]);
assertFalse(done.get());
mockTransport.receiveMessage("{\"type\":3,\"invocationId\":\"1\",\"result\":\"Hello World\"}" + RECORD_SEPARATOR);
assertEquals("Hello World", result.timeout(1000, TimeUnit.MILLISECONDS).blockingGet());
}
@Test
public void multipleInvokesWaitForOwnCompletionMessage() {