root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Polish AbstractWebSocketIntegrationTests

This commit is contained in:
Sam Brannen 2019-08-20 12:10:19 +02:00
parent 26dc93d0f6
commit 91560d51ac
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java
View File

@ -26,6 +26,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.stream.Stream;
import org.apache.tomcat.websocket.server.WsContextListener;
import org.junit.jupiter.api.AfterEach;
@ -73,7 +74,7 @@ import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
* @author Sam Brannen
*/
@SuppressWarnings({"unused", "WeakerAccess"})
public abstract class AbstractWebSocketIntegrationTests {
abstract class AbstractWebSocketIntegrationTests {
private static final File TMP_DIR = new File(System.getProperty("java.io.tmpdir"));
@ -84,7 +85,7 @@ public abstract class AbstractWebSocketIntegrationTests {
@interface ParameterizedWebSocketTest {
}
static Object[][] arguments() throws IOException {
static Stream<Object[]> arguments() throws IOException {
WebSocketClient[] clients = new WebSocketClient[] {
new TomcatWebSocketClient(),
@ -110,9 +111,7 @@ public abstract class AbstractWebSocketIntegrationTests {
return Flux.zip(f1, f2.map(Map.Entry::getKey), f2.map(Map.Entry::getValue))
.map(Tuple3::toArray)
.collectList()
.block()
.toArray(new Object[clients.length * servers.size()][2]);
.toStream();
}