Skip to content

Commit 0d741f1

Browse files
Backport Java test fixes (#39290)
1 parent 1272293 commit 0d741f1

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
@@ -71,7 +71,7 @@ public void StatusCode204StopsLongPollingTriggersOnClosed() {
7171

7272
assertFalse(onClosedRan.get());
7373
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
74-
assertTrue(block.blockingAwait(1, TimeUnit.SECONDS));
74+
assertTrue(block.blockingAwait(30, TimeUnit.SECONDS));
7575
assertTrue(onClosedRan.get());
7676
assertFalse(transport.isActive());
7777
}
@@ -100,7 +100,7 @@ public void LongPollingFailsWhenReceivingUnexpectedErrorCode() {
100100
});
101101

102102
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
103-
assertTrue(blocker.blockingAwait(1, TimeUnit.SECONDS));
103+
assertTrue(blocker.blockingAwait(30, TimeUnit.SECONDS));
104104
assertFalse(transport.isActive());
105105
assertTrue(onClosedRan.get());
106106
}
@@ -126,7 +126,6 @@ public void CanSetAndTriggerOnReceive() {
126126
assertTrue(onReceivedRan.get());
127127
}
128128

129-
@Disabled("https://github.com/dotnet/aspnetcore/issues/34563")
130129
@Test
131130
public void LongPollingTransportOnReceiveGetsCalled() {
132131
AtomicInteger requestCount = new AtomicInteger();
@@ -158,7 +157,7 @@ public void LongPollingTransportOnReceiveGetsCalled() {
158157
transport.setOnClose((error) -> {});
159158

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

205204
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
206-
assertTrue(blocker.blockingAwait(1, TimeUnit.SECONDS));
205+
assertTrue(blocker.blockingAwait(30, TimeUnit.SECONDS));
207206
assertTrue(onReceiveCalled.get());
208207
assertEquals("FIRSTSECONDTHIRD", message.get());
209208
}
@@ -219,7 +218,7 @@ public void LongPollingTransportSendsHeaders() {
219218
requestCount.incrementAndGet();
220219
return Single.just(new HttpResponse(200, "", TestUtils.emptyByteBuffer));
221220
}
222-
assertTrue(close.blockingAwait(1, TimeUnit.SECONDS));
221+
assertTrue(close.blockingAwait(30, TimeUnit.SECONDS));
223222
return Single.just(new HttpResponse(204, "", TestUtils.emptyByteBuffer));
224223
}).on("POST", (req) -> {
225224
assertFalse(req.getHeaders().isEmpty());
@@ -234,7 +233,7 @@ public void LongPollingTransportSendsHeaders() {
234233

235234
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
236235
ByteBuffer sendBuffer = TestUtils.stringToByteBuffer("TEST");
237-
assertTrue(transport.send(sendBuffer).blockingAwait(1, TimeUnit.SECONDS));
236+
assertTrue(transport.send(sendBuffer).blockingAwait(30, TimeUnit.SECONDS));
238237
close.onComplete();
239238
assertEquals(headerValue.get(), "VALUE");
240239
}
@@ -250,7 +249,7 @@ public void LongPollingTransportSetsAuthorizationHeader() {
250249
requestCount.incrementAndGet();
251250
return Single.just(new HttpResponse(200, "", TestUtils.emptyByteBuffer));
252251
}
253-
assertTrue(close.blockingAwait(1, TimeUnit.SECONDS));
252+
assertTrue(close.blockingAwait(30, TimeUnit.SECONDS));
254253
return Single.just(new HttpResponse(204, "", TestUtils.emptyByteBuffer));
255254
})
256255
.on("POST", (req) -> {
@@ -266,7 +265,7 @@ public void LongPollingTransportSetsAuthorizationHeader() {
266265

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

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

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

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

@@ -355,7 +354,7 @@ public void StoppingTransportRunsCloseHandlersOnce() {
355354
firstPoll.set(false);
356355
return Single.just(new HttpResponse(200, "", TestUtils.emptyByteBuffer));
357356
} else {
358-
assertTrue(block.blockingAwait(1, TimeUnit.SECONDS));
357+
assertTrue(block.blockingAwait(30, TimeUnit.SECONDS));
359358
return Single.just(new HttpResponse(204, "", TestUtils.emptyByteBuffer));
360359
}
361360
})
@@ -374,7 +373,7 @@ public void StoppingTransportRunsCloseHandlersOnce() {
374373

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

0 commit comments

Comments
 (0)