From f9bd9cb982a494a6198e465866926f4d3190f11e Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Tue, 15 Sep 2020 17:51:42 -0700 Subject: [PATCH] Increase more SignalR Java client test timeouts --- .../com/microsoft/signalr/HubConnectionTest.java | 14 ++++++-------- .../signalr/LongPollingTransportTest.java | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java index 7780a12ecb89..a566348ccaf0 100644 --- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java @@ -17,7 +17,6 @@ import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.Disabled; import ch.qos.logback.classic.spi.ILoggingEvent; import io.reactivex.Completable; @@ -2584,14 +2583,14 @@ public void throwFromOnHandlerRunsAllHandlers() { value2.set(param1); }, String.class); - hubConnection.start().timeout(1, TimeUnit.SECONDS).blockingAwait(); + hubConnection.start().timeout(30, TimeUnit.SECONDS).blockingAwait(); mockTransport.receiveMessage("{\"type\":1,\"target\":\"inc\",\"arguments\":[\"Hello World\"]}" + RECORD_SEPARATOR); // Confirming that our handler was called and the correct message was passed in. assertEquals("Hello World", value1.get()); assertEquals("Hello World", value2.get()); - hubConnection.stop().timeout(1, TimeUnit.SECONDS).blockingAwait(); + hubConnection.stop().timeout(30, TimeUnit.SECONDS).blockingAwait(); ILoggingEvent log = logger.assertLog("Invoking client side method 'inc' failed:"); assertEquals("throw from on handler", log.getThrowableProxy().getMessage()); @@ -3190,15 +3189,14 @@ public void stopWithoutObservingWithLongPollingTransportStops() { closed.onComplete(); }); - hubConnection.start().timeout(1, TimeUnit.SECONDS).blockingAwait(); + hubConnection.start().timeout(30, TimeUnit.SECONDS).blockingAwait(); hubConnection.stop(); - closed.timeout(1, TimeUnit.SECONDS).blockingAwait(); + closed.timeout(30, TimeUnit.SECONDS).blockingAwait(); blockGet.onComplete(); assertEquals(HubConnectionState.DISCONNECTED, hubConnection.getConnectionState()); } - @Disabled @Test public void hubConnectionClosesAndRunsOnClosedCallbackAfterCloseMessageWithLongPolling() { AtomicInteger requestCount = new AtomicInteger(0); @@ -3229,12 +3227,12 @@ public void hubConnectionClosesAndRunsOnClosedCallbackAfterCloseMessageWithLongP hubConnection.onClosed((ex) -> { closed.onComplete(); }); - hubConnection.start().timeout(1, TimeUnit.SECONDS).blockingAwait(); + hubConnection.start().timeout(30, TimeUnit.SECONDS).blockingAwait(); assertEquals(HubConnectionState.CONNECTED, hubConnection.getConnectionState()); blockGet.onComplete(); - closed.timeout(1, TimeUnit.SECONDS).blockingAwait(); + closed.timeout(30, TimeUnit.SECONDS).blockingAwait(); assertEquals(HubConnectionState.DISCONNECTED, hubConnection.getConnectionState()); } diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java index f4dda53cf346..f089587cab0b 100644 --- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java @@ -392,7 +392,7 @@ public void ErrorFromClosePropagatesOnSecondStopCall() { Map headers = new HashMap<>(); LongPollingTransport transport = new LongPollingTransport(headers, client, Single.just("")); - transport.start("http://example.com").timeout(100, TimeUnit.SECONDS).blockingAwait(); + transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait(); RuntimeException exception = assertThrows(RuntimeException.class, () -> transport.stop().blockingAwait(100, TimeUnit.SECONDS)); assertEquals("Request has no handler: DELETE http://example.com", exception.getMessage());