Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Try to stabilize TunnelClientTests.addListener()

Browse Source 
Closes gh-26885
This commit is contained in:
Andy Wilkinson 2021-06-14 10:52:12 +01:00
parent 65e3267065
commit 7a14a53250
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/client/TunnelClientTests.java
View File

@ -25,15 +25,13 @@ import java.nio.channels.Channels;
import java.nio.channels.SocketChannel; import java.nio.channels.SocketChannel;
import java.nio.channels.WritableByteChannel; import java.nio.channels.WritableByteChannel;
import java.time.Duration; import java.time.Duration;
import java.util.concurrent.atomic.AtomicInteger;
import org.awaitility.Awaitility; import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
/** /**
* Tests for {@link TunnelClient}. * Tests for {@link TunnelClient}.
@ -98,16 +96,34 @@ class TunnelClientTests {
@Test @Test
void addListener() throws Exception { void addListener() throws Exception {
TunnelClient client = new TunnelClient(0, this.tunnelConnection); TunnelClient client = new TunnelClient(0, this.tunnelConnection);
TunnelClientListener listener = mock(TunnelClientListener.class); MockTunnelClientListener listener = new MockTunnelClientListener();
client.addListener(listener); client.addListener(listener);
int port = client.start(); int port = client.start();
SocketChannel channel = SocketChannel.open(new InetSocketAddress(port)); SocketChannel channel = SocketChannel.open(new InetSocketAddress(port));
Thread.sleep(200); Awaitility.await().atMost(Duration.ofSeconds(30)).until(listener.onOpen::get, (open) -> open == 1);
channel.close(); assertThat(listener.onClose).hasValue(0);
client.getServerThread().stopAcceptingConnections(); client.getServerThread().stopAcceptingConnections();
channel.close();
Awaitility.await().atMost(Duration.ofSeconds(30)).until(listener.onClose::get, (close) -> close == 1);
client.getServerThread().join(2000); client.getServerThread().join(2000);
verify(listener).onOpen(any(SocketChannel.class)); }
verify(listener).onClose(any(SocketChannel.class));
static class MockTunnelClientListener implements TunnelClientListener {
private final AtomicInteger onOpen = new AtomicInteger();
private final AtomicInteger onClose = new AtomicInteger();
@Override
public void onOpen(SocketChannel socket) {
this.onOpen.incrementAndGet();
}
@Override
public void onClose(SocketChannel socket) {
this.onClose.incrementAndGet();
}
} }
static class MockTunnelConnection implements TunnelConnection { static class MockTunnelConnection implements TunnelConnection {