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

Merge branch '2.3.x' 

Closes gh-22021
This commit is contained in:
Andy Wilkinson 2020-06-19 08:23:30 +01:00
parent c37fd865c0 136c9b1af8
commit ca76b60de2
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/LiveReloadServerTests.java
View File

@ -23,6 +23,7 @@ import java.net.URI;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -45,6 +46,7 @@ import org.springframework.web.socket.client.standard.StandardWebSocketClient;
import org.springframework.web.socket.handler.TextWebSocketHandler; import org.springframework.web.socket.handler.TextWebSocketHandler;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.not;
@ -88,17 +90,18 @@ class LiveReloadServerTests {
void triggerReload() throws Exception { void triggerReload() throws Exception {
LiveReloadWebSocketHandler handler = connect(); LiveReloadWebSocketHandler handler = connect();
this.server.triggerReload(); this.server.triggerReload();
Thread.sleep(200); List<String> messages = await().atMost(Duration.ofSeconds(10)).until(handler::getMessages,
assertThat(handler.getMessages().get(0)).contains("http://livereload.com/protocols/official-7"); (msgs) -> msgs.size() == 2);
assertThat(handler.getMessages().get(1)).contains("command\":\"reload\""); assertThat(messages.get(0)).contains("http://livereload.com/protocols/official-7");
assertThat(messages.get(1)).contains("command\":\"reload\"");
} }
@Test @Test
void pingPong() throws Exception { void pingPong() throws Exception {
LiveReloadWebSocketHandler handler = connect(); LiveReloadWebSocketHandler handler = connect();
handler.sendMessage(new PingMessage()); handler.sendMessage(new PingMessage());
Thread.sleep(200); await().atMost(Duration.ofSeconds(10)).until(handler::getPongCount, is(1));
assertThat(handler.getPongCount()).isEqualTo(1);
} }
@Test @Test
@ -117,8 +120,9 @@ class LiveReloadServerTests {
void serverClose() throws Exception { void serverClose() throws Exception {
LiveReloadWebSocketHandler handler = connect(); LiveReloadWebSocketHandler handler = connect();
this.server.stop(); this.server.stop();
Thread.sleep(200); CloseStatus closeStatus = await().atMost(Duration.ofSeconds(10)).until(handler::getCloseStatus,
assertThat(handler.getCloseStatus().getCode()).isEqualTo(1006); Objects::nonNull);
assertThat(closeStatus.getCode()).isEqualTo(1006);
} }
private LiveReloadWebSocketHandler connect() throws Exception { private LiveReloadWebSocketHandler connect() throws Exception {