Skip to content
代码片段 群组 项目
未验证 提交 0d741f15 编辑于 作者: Brennan's avatar Brennan 提交者: GitHub
浏览文件

Backport Java test fixes (#39290)

上级 12722936
No related branches found
No related tags found
无相关合并请求
......@@ -71,7 +71,7 @@ public class LongPollingTransportTest {
assertFalse(onClosedRan.get());
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
assertTrue(block.blockingAwait(1, TimeUnit.SECONDS));
assertTrue(block.blockingAwait(30, TimeUnit.SECONDS));
assertTrue(onClosedRan.get());
assertFalse(transport.isActive());
}
......@@ -100,7 +100,7 @@ public class LongPollingTransportTest {
});
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
assertTrue(blocker.blockingAwait(1, TimeUnit.SECONDS));
assertTrue(blocker.blockingAwait(30, TimeUnit.SECONDS));
assertFalse(transport.isActive());
assertTrue(onClosedRan.get());
}
......@@ -126,7 +126,6 @@ public class LongPollingTransportTest {
assertTrue(onReceivedRan.get());
}
@Disabled("https://github.com/dotnet/aspnetcore/issues/34563")
@Test
public void LongPollingTransportOnReceiveGetsCalled() {
AtomicInteger requestCount = new AtomicInteger();
......@@ -158,7 +157,7 @@ public class LongPollingTransportTest {
transport.setOnClose((error) -> {});
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
assertTrue(block.blockingAwait(1,TimeUnit.SECONDS));
assertTrue(block.blockingAwait(30,TimeUnit.SECONDS));
assertTrue(onReceiveCalled.get());
assertEquals("TEST", message.get());
}
......@@ -203,7 +202,7 @@ public class LongPollingTransportTest {
transport.setOnClose((error) -> {});
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
assertTrue(blocker.blockingAwait(1, TimeUnit.SECONDS));
assertTrue(blocker.blockingAwait(30, TimeUnit.SECONDS));
assertTrue(onReceiveCalled.get());
assertEquals("FIRSTSECONDTHIRD", message.get());
}
......@@ -219,7 +218,7 @@ public class LongPollingTransportTest {
requestCount.incrementAndGet();
return Single.just(new HttpResponse(200, "", TestUtils.emptyByteBuffer));
}
assertTrue(close.blockingAwait(1, TimeUnit.SECONDS));
assertTrue(close.blockingAwait(30, TimeUnit.SECONDS));
return Single.just(new HttpResponse(204, "", TestUtils.emptyByteBuffer));
}).on("POST", (req) -> {
assertFalse(req.getHeaders().isEmpty());
......@@ -234,7 +233,7 @@ public class LongPollingTransportTest {
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
ByteBuffer sendBuffer = TestUtils.stringToByteBuffer("TEST");
assertTrue(transport.send(sendBuffer).blockingAwait(1, TimeUnit.SECONDS));
assertTrue(transport.send(sendBuffer).blockingAwait(30, TimeUnit.SECONDS));
close.onComplete();
assertEquals(headerValue.get(), "VALUE");
}
......@@ -250,7 +249,7 @@ public class LongPollingTransportTest {
requestCount.incrementAndGet();
return Single.just(new HttpResponse(200, "", TestUtils.emptyByteBuffer));
}
assertTrue(close.blockingAwait(1, TimeUnit.SECONDS));
assertTrue(close.blockingAwait(30, TimeUnit.SECONDS));
return Single.just(new HttpResponse(204, "", TestUtils.emptyByteBuffer));
})
.on("POST", (req) -> {
......@@ -266,7 +265,7 @@ public class LongPollingTransportTest {
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
ByteBuffer sendBuffer = TestUtils.stringToByteBuffer("TEST");
assertTrue(transport.send(sendBuffer).blockingAwait(1, TimeUnit.SECONDS));
assertTrue(transport.send(sendBuffer).blockingAwait(30, TimeUnit.SECONDS));
assertEquals(headerValue.get(), "Bearer TOKEN");
close.onComplete();
}
......@@ -285,7 +284,7 @@ public class LongPollingTransportTest {
}
assertEquals("Bearer TOKEN1", req.getHeaders().get("Authorization"));
secondGet.onComplete();
assertTrue(close.blockingAwait(1, TimeUnit.SECONDS));
assertTrue(close.blockingAwait(30, TimeUnit.SECONDS));
return Single.just(new HttpResponse(204, "", TestUtils.emptyByteBuffer));
})
.on("POST", (req) -> {
......@@ -301,9 +300,9 @@ public class LongPollingTransportTest {
transport.setOnClose((error) -> {});
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
secondGet.blockingAwait(1, TimeUnit.SECONDS);
secondGet.blockingAwait(30, TimeUnit.SECONDS);
ByteBuffer sendBuffer = TestUtils.stringToByteBuffer("TEST");
assertTrue(transport.send(sendBuffer).blockingAwait(1, TimeUnit.SECONDS));
assertTrue(transport.send(sendBuffer).blockingAwait(30, TimeUnit.SECONDS));
assertEquals("Bearer TOKEN2", headerValue.get());
close.onComplete();
}
......@@ -336,12 +335,12 @@ public class LongPollingTransportTest {
assertFalse(onClosedRan.get());
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
assertTrue(block.blockingAwait(1, TimeUnit.SECONDS));
assertTrue(block.blockingAwait(30, TimeUnit.SECONDS));
assertEquals(1, onCloseCount.get());
assertTrue(onClosedRan.get());
assertFalse(transport.isActive());
assertTrue(transport.stop().blockingAwait(1, TimeUnit.SECONDS));
assertTrue(transport.stop().blockingAwait(30, TimeUnit.SECONDS));
assertEquals(1, onCloseCount.get());
}
......@@ -355,7 +354,7 @@ public class LongPollingTransportTest {
firstPoll.set(false);
return Single.just(new HttpResponse(200, "", TestUtils.emptyByteBuffer));
} else {
assertTrue(block.blockingAwait(1, TimeUnit.SECONDS));
assertTrue(block.blockingAwait(30, TimeUnit.SECONDS));
return Single.just(new HttpResponse(204, "", TestUtils.emptyByteBuffer));
}
})
......@@ -374,7 +373,7 @@ public class LongPollingTransportTest {
assertEquals(0, onCloseCount.get());
transport.start("http://example.com").timeout(30, TimeUnit.SECONDS).blockingAwait();
assertTrue(transport.stop().blockingAwait(1, TimeUnit.SECONDS));
assertTrue(transport.stop().blockingAwait(30, TimeUnit.SECONDS));
assertEquals(1, onCloseCount.get());
assertFalse(transport.isActive());
}
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册