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

Polish "Use Awaitility instead of Thread.sleep" 

See gh-21988
This commit is contained in:
Andy Wilkinson 2020-06-19 08:17:35 +01:00
parent c13385ea74
commit 41173f7c40
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
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;
@ -89,16 +90,18 @@ class LiveReloadServerTests {
void triggerReload() throws Exception { void triggerReload() throws Exception {
LiveReloadWebSocketHandler handler = connect(); LiveReloadWebSocketHandler handler = connect();
this.server.triggerReload(); this.server.triggerReload();
await().atMost(Duration.ofSeconds(1)).until(handler::getMessages, List<String> messages = await().atMost(Duration.ofSeconds(10)).until(handler::getMessages,
(msgs) -> msgs.get(0).contains("http://livereload.com/protocols/official-7") (msgs) -> msgs.size() == 2);
&& msgs.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());
await().atMost(Duration.ofSeconds(1)).until(handler::getPongCount, is(1)); await().atMost(Duration.ofSeconds(10)).until(handler::getPongCount, is(1));
} }
@Test @Test
@ -117,7 +120,9 @@ class LiveReloadServerTests {
void serverClose() throws Exception { void serverClose() throws Exception {
LiveReloadWebSocketHandler handler = connect(); LiveReloadWebSocketHandler handler = connect();
this.server.stop(); this.server.stop();
await().atMost(Duration.ofSeconds(1)).until(() -> handler.getCloseStatus().getCode(), is(1006)); CloseStatus closeStatus = await().atMost(Duration.ofSeconds(10)).until(handler::getCloseStatus,
Objects::nonNull);
assertThat(closeStatus.getCode()).isEqualTo(1006);
} }
private LiveReloadWebSocketHandler connect() throws Exception { private LiveReloadWebSocketHandler connect() throws Exception {