diff options
| -rw-r--r-- | server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java index 64ecfd64c74..492dcc12f59 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java @@ -54,8 +54,8 @@ public class CeServerTest { private CeServer underTest = null; private Thread waitingThread = null; - private MinimumViableSystem minimumViableSystem = mock(MinimumViableSystem.class, Mockito.RETURNS_MOCKS); - private CeSecurityManager ceSecurityManager = mock(CeSecurityManager.class); + private final MinimumViableSystem minimumViableSystem = mock(MinimumViableSystem.class, Mockito.RETURNS_MOCKS); + private final CeSecurityManager ceSecurityManager = mock(CeSecurityManager.class); @After public void tearDown() throws Exception { @@ -71,9 +71,9 @@ public class CeServerTest { @Test public void constructor_does_not_start_a_new_Thread() { - int activeCount = Thread.activeCount(); + assertThat(ceThreadExists()).isFalse(); newCeServer(); - assertThat(Thread.activeCount()).isSameAs(activeCount); + assertThat(ceThreadExists()).isFalse(); } @Test @@ -93,11 +93,9 @@ public class CeServerTest { @Test public void start_starts_a_new_Thread() { - int activeCount = Thread.activeCount(); - + assertThat(ceThreadExists()).isFalse(); newCeServer().start(); - - assertThat(Thread.activeCount()).isSameAs(activeCount + 1); + assertThat(ceThreadExists()).isTrue(); } @Test @@ -122,7 +120,10 @@ public class CeServerTest { } private static boolean ceThreadExists() { - return Thread.getAllStackTraces().keySet().stream().anyMatch(t -> t.getName().equals("ce-main")); + return Thread.getAllStackTraces().keySet() + .stream() + .map(Thread::getName) + .anyMatch("ce-main"::equals); } @Test |