SONAR-12043 Minor refactor

2 files changed, 5 insertions, 9 deletions

diff --git a/server/sonar-process/src/test/java/org/sonar/process/AbstractStopWatcherTest.java b/server/sonar-process/src/test/java/org/sonar/process/StopWatcherTest.java
index 8fbc9b2cefd..79561fdf967 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/AbstractStopWatcherTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/StopWatcherTest.java
@@ -32,7 +32,7 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class AbstractStopWatcherTest {
+public class StopWatcherTest {
 
   @Rule
   public TestRule safeguardTimeout = new DisableOnDebug(Timeout.seconds(60));
@@ -44,8 +44,7 @@ public class AbstractStopWatcherTest {
     when(commands.askedForHardStop()).thenReturn(false, true);
     Stoppable stoppable = mock(Stoppable.class);
 
-    AbstractStopWatcher underTest = new AbstractStopWatcher("TheThreadName",
-      stoppable::hardStopAsync, commands::askedForHardStop, 1L) {};
+    StopWatcher underTest = new StopWatcher("TheThreadName", stoppable::hardStopAsync, commands::askedForHardStop, 1L);
     underTest.start();
 
     while (underTest.isAlive()) {
@@ -61,8 +60,7 @@ public class AbstractStopWatcherTest {
     when(commands.askedForHardStop()).thenReturn(false);
     Stoppable stoppable = mock(Stoppable.class);
 
-    AbstractStopWatcher underTest = new AbstractStopWatcher("TheThreadName",
-      stoppable::hardStopAsync, commands::askedForHardStop, 1L) {};
+    StopWatcher underTest = new StopWatcher("TheThreadName", stoppable::hardStopAsync, commands::askedForHardStop, 1L);
     underTest.start();
     underTest.interrupt();
 
diff --git a/server/sonar-process/src/test/java/org/sonar/process/test/StandardProcess.java b/server/sonar-process/src/test/java/org/sonar/process/test/StandardProcess.java
index 3f449d635fe..e360cd03605 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/test/StandardProcess.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/test/StandardProcess.java
@@ -36,11 +36,9 @@ public class StandardProcess implements Monitored {
     @Override
     public void run() {
       try {
-        while (true) {
-          Thread.sleep(100L);
-        }
+        Thread.sleep(Long.MAX_VALUE);
       } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
+        interrupt();
       }
     }
   };