aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-process/src/test
diff options
context:
space:
mode:
authorDavid Gageot <david@gageot.net>2015-07-07 11:14:24 +0200
committerDavid Gageot <david@gageot.net>2015-07-07 11:36:26 +0200
commit2b9d9cbc933df1391c9e483ffcd8e8dba7e0d9ea (patch)
tree44bfcd504b129709edf06257d1e578e56e7c7714 /server/sonar-process/src/test
parentf0390ff8452ea1aecf060e70d27e21e1c04629a7 (diff)
downloadsonarqube-2b9d9cbc933df1391c9e483ffcd8e8dba7e0d9ea.tar.gz
sonarqube-2b9d9cbc933df1391c9e483ffcd8e8dba7e0d9ea.zip
Test should be less flaky now
Diffstat (limited to 'server/sonar-process/src/test')
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/StopperThreadTest.java21
1 files changed, 8 insertions, 13 deletions
diff --git a/server/sonar-process/src/test/java/org/sonar/process/StopperThreadTest.java b/server/sonar-process/src/test/java/org/sonar/process/StopperThreadTest.java
index 539b29681b7..9d8b26ed58e 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/StopperThreadTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/StopperThreadTest.java
@@ -26,25 +26,21 @@ import org.mockito.stubbing.Answer;
import static org.mockito.Mockito.*;
public class StopperThreadTest {
+ ProcessCommands commands = mock(ProcessCommands.class);
+ Monitored monitored = mock(Monitored.class);
- @Test(timeout = 3000L)
- public void stop_in_a_timely_fashion() throws InterruptedException {
- ProcessCommands commands = mock(ProcessCommands.class);
- Monitored monitored = mock(Monitored.class);
-
+ @Test
+ public void stop_in_a_timely_fashion() {
// max stop timeout is 5 seconds, but test fails after 3 seconds
// -> guarantees that stop is immediate
StopperThread stopper = new StopperThread(monitored, commands, 5000L);
stopper.start();
- stopper.join();
- verify(monitored).stop();
+ verify(monitored, timeout(3000)).stop();
}
- @Test(timeout = 3000L)
- public void stop_timeout() throws InterruptedException {
- ProcessCommands commands = mock(ProcessCommands.class);
- Monitored monitored = mock(Monitored.class);
+ @Test
+ public void stop_timeout() {
doAnswer(new Answer() {
@Override
public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
@@ -56,8 +52,7 @@ public class StopperThreadTest {
// max stop timeout is 100 milliseconds
StopperThread stopper = new StopperThread(monitored, commands, 100L);
stopper.start();
- stopper.join();
- verify(monitored).stop();
+ verify(monitored, timeout(3000)).stop();
}
}