Skip to content

Commit 1795898

Browse files
Update timeouts in Java tests (#35687)
1 parent c6b1628 commit 1795898

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java

+15-16
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public void LongPollingTransportCantSendBeforeStart() {
4949
}
5050

5151
@Test
52-
@Disabled("https://github.com/dotnet/aspnetcore/issues/35684")
5352
public void StatusCode204StopsLongPollingTriggersOnClosed() {
5453
AtomicBoolean firstPoll = new AtomicBoolean(true);
5554
CompletableSubject block = CompletableSubject.create();
@@ -72,7 +71,7 @@ public void StatusCode204StopsLongPollingTriggersOnClosed() {
7271

7372
assertFalse(onClosedRan.get());
7473
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
75-
assertTrue(block.blockingAwait(1, TimeUnit.SECONDS));
74+
assertTrue(block.blockingAwait(30, TimeUnit.SECONDS));
7675
assertTrue(onClosedRan.get());
7776
assertFalse(transport.isActive());
7877
}
@@ -101,7 +100,7 @@ public void LongPollingFailsWhenReceivingUnexpectedErrorCode() {
101100
});
102101

103102
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
104-
assertTrue(blocker.blockingAwait(1, TimeUnit.SECONDS));
103+
assertTrue(blocker.blockingAwait(30, TimeUnit.SECONDS));
105104
assertFalse(transport.isActive());
106105
assertTrue(onClosedRan.get());
107106
}
@@ -159,7 +158,7 @@ public void LongPollingTransportOnReceiveGetsCalled() {
159158
transport.setOnClose((error) -> {});
160159

161160
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
162-
assertTrue(block.blockingAwait(1,TimeUnit.SECONDS));
161+
assertTrue(block.blockingAwait(30, TimeUnit.SECONDS));
163162
assertTrue(onReceiveCalled.get());
164163
assertEquals("TEST", message.get());
165164
}
@@ -204,7 +203,7 @@ public void LongPollingTransportOnReceiveGetsCalledMultipleTimes() {
204203
transport.setOnClose((error) -> {});
205204

206205
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
207-
assertTrue(blocker.blockingAwait(1, TimeUnit.SECONDS));
206+
assertTrue(blocker.blockingAwait(30, TimeUnit.SECONDS));
208207
assertTrue(onReceiveCalled.get());
209208
assertEquals("FIRSTSECONDTHIRD", message.get());
210209
}
@@ -220,7 +219,7 @@ public void LongPollingTransportSendsHeaders() {
220219
requestCount.incrementAndGet();
221220
return Single.just(new HttpResponse(200, "", TestUtils.emptyByteBuffer));
222221
}
223-
assertTrue(close.blockingAwait(1, TimeUnit.SECONDS));
222+
assertTrue(close.blockingAwait(30, TimeUnit.SECONDS));
224223
return Single.just(new HttpResponse(204, "", TestUtils.emptyByteBuffer));
225224
}).on("POST", (req) -> {
226225
assertFalse(req.getHeaders().isEmpty());
@@ -235,7 +234,7 @@ public void LongPollingTransportSendsHeaders() {
235234

236235
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
237236
ByteBuffer sendBuffer = TestUtils.stringToByteBuffer("TEST");
238-
assertTrue(transport.send(sendBuffer).blockingAwait(1, TimeUnit.SECONDS));
237+
assertTrue(transport.send(sendBuffer).blockingAwait(30, TimeUnit.SECONDS));
239238
close.onComplete();
240239
assertEquals(headerValue.get(), "VALUE");
241240
}
@@ -251,7 +250,7 @@ public void LongPollingTransportSetsAuthorizationHeader() {
251250
requestCount.incrementAndGet();
252251
return Single.just(new HttpResponse(200, "", TestUtils.emptyByteBuffer));
253252
}
254-
assertTrue(close.blockingAwait(1, TimeUnit.SECONDS));
253+
assertTrue(close.blockingAwait(30, TimeUnit.SECONDS));
255254
return Single.just(new HttpResponse(204, "", TestUtils.emptyByteBuffer));
256255
})
257256
.on("POST", (req) -> {
@@ -267,7 +266,7 @@ public void LongPollingTransportSetsAuthorizationHeader() {
267266

268267
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
269268
ByteBuffer sendBuffer = TestUtils.stringToByteBuffer("TEST");
270-
assertTrue(transport.send(sendBuffer).blockingAwait(1, TimeUnit.SECONDS));
269+
assertTrue(transport.send(sendBuffer).blockingAwait(30, TimeUnit.SECONDS));
271270
assertEquals(headerValue.get(), "Bearer TOKEN");
272271
close.onComplete();
273272
}
@@ -286,7 +285,7 @@ public void LongPollingTransportRunsAccessTokenProviderEveryRequest() {
286285
}
287286
assertEquals("Bearer TOKEN1", req.getHeaders().get("Authorization"));
288287
secondGet.onComplete();
289-
assertTrue(close.blockingAwait(1, TimeUnit.SECONDS));
288+
assertTrue(close.blockingAwait(30, TimeUnit.SECONDS));
290289
return Single.just(new HttpResponse(204, "", TestUtils.emptyByteBuffer));
291290
})
292291
.on("POST", (req) -> {
@@ -302,9 +301,9 @@ public void LongPollingTransportRunsAccessTokenProviderEveryRequest() {
302301
transport.setOnClose((error) -> {});
303302

304303
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
305-
secondGet.blockingAwait(1, TimeUnit.SECONDS);
304+
secondGet.blockingAwait(30, TimeUnit.SECONDS);
306305
ByteBuffer sendBuffer = TestUtils.stringToByteBuffer("TEST");
307-
assertTrue(transport.send(sendBuffer).blockingAwait(1, TimeUnit.SECONDS));
306+
assertTrue(transport.send(sendBuffer).blockingAwait(30, TimeUnit.SECONDS));
308307
assertEquals("Bearer TOKEN2", headerValue.get());
309308
close.onComplete();
310309
}
@@ -337,12 +336,12 @@ public void After204StopDoesNotTriggerOnCloseAgain() {
337336

338337
assertFalse(onClosedRan.get());
339338
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
340-
assertTrue(block.blockingAwait(1, TimeUnit.SECONDS));
339+
assertTrue(block.blockingAwait(30, TimeUnit.SECONDS));
341340
assertEquals(1, onCloseCount.get());
342341
assertTrue(onClosedRan.get());
343342
assertFalse(transport.isActive());
344343

345-
assertTrue(transport.stop().blockingAwait(1, TimeUnit.SECONDS));
344+
assertTrue(transport.stop().blockingAwait(30, TimeUnit.SECONDS));
346345
assertEquals(1, onCloseCount.get());
347346
}
348347

@@ -356,7 +355,7 @@ public void StoppingTransportRunsCloseHandlersOnce() {
356355
firstPoll.set(false);
357356
return Single.just(new HttpResponse(200, "", TestUtils.emptyByteBuffer));
358357
} else {
359-
assertTrue(block.blockingAwait(1, TimeUnit.SECONDS));
358+
assertTrue(block.blockingAwait(30, TimeUnit.SECONDS));
360359
return Single.just(new HttpResponse(204, "", TestUtils.emptyByteBuffer));
361360
}
362361
})
@@ -375,7 +374,7 @@ public void StoppingTransportRunsCloseHandlersOnce() {
375374

376375
assertEquals(0, onCloseCount.get());
377376
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
378-
assertTrue(transport.stop().blockingAwait(1, TimeUnit.SECONDS));
377+
assertTrue(transport.stop().blockingAwait(30, TimeUnit.SECONDS));
379378
assertEquals(1, onCloseCount.get());
380379
assertFalse(transport.isActive());
381380
}

0 commit comments

Comments
 (0)