Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add logging to randomly failing websocket test

Browse Source
This commit is contained in:
Rossen Stoyanchev
2017-07-06 15:07:41 +02:00
parent acd6b9df06
commit 5f9f323b12
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
View File

@@ -22,7 +22,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hamcrest.Matchers;
import org.junit.Test;
import org.reactivestreams.Publisher;
@@ -30,6 +33,8 @@ import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.publisher.MonoProcessor;
import reactor.core.publisher.ReplayProcessor;
import reactor.core.publisher.SignalType;
import sun.util.logging.PlatformLogger;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -46,6 +51,9 @@ import static org.junit.Assert.*;
*/
public class WebSocketIntegrationTests extends AbstractWebSocketIntegrationTests {
private static final Log logger = LogFactory.getLog(WebSocketIntegrationTests.class);
@Override
protected Class<?> getWebConfigClass() {
return WebConfig.class;
@@ -59,14 +67,21 @@ public class WebSocketIntegrationTests extends AbstractWebSocketIntegrationTests
ReplayProcessor<Object> output = ReplayProcessor.create(count);
client.execute(getUrl("/echo"),
session -> session
.send(input.map(session::textMessage))
.thenMany(session.receive().take(count).map(WebSocketMessage::getPayloadAsText))
.subscribeWith(output)
.then())
session -> {
logger.debug("Starting to send messages");
return session
.send(input.doOnNext(s -> logger.debug("outbound " + s)).map(session::textMessage))
.thenMany(session.receive().take(count).map(WebSocketMessage::getPayloadAsText))
.subscribeWith(output)
.doOnNext(s -> logger.debug("inbound " + s))
.then()
.doOnTerminate((aVoid, ex) ->
logger.debug("Done with " + (ex != null ? ex.getMessage() : "success")));
})
.block(Duration.ofMillis(5000));
assertEquals(input.collectList().block(Duration.ofMillis(5000)), output.collectList().block(Duration.ofMillis(5000)));
assertEquals(input.collectList().block(Duration.ofMillis(5000)),
output.collectList().block(Duration.ofMillis(5000)));
}
@Test

6
spring-webflux/src/test/resources/log4j2-test.xml
View File

@@ -8,9 +8,13 @@
<Loggers>
<Logger name="org.springframework.http" level="debug" />
<!--<Logger name="org.springframework.web" level="debug" />-->
<!-- temporarily while we resolve random failures -->
<Logger name="org.springframework.web.reactive.socket.WebSocketIntegrationTests" level="debug" />
<Logger name="reactor" level="info" />
<Logger name="io.reactivex" level="info" />
<Root level="error">
<Root level="info">
<AppenderRef ref="Console" />
</Root>
</Loggers>