Fix some quality flaws

2 files changed, 15 insertions, 30 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeProfiler.java b/sonar-core/src/main/java/org/sonar/core/purge/PurgeProfiler.java
index 0d1135077a1..f9c27da9bfc 100644
--- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeProfiler.java
+++ b/sonar-core/src/main/java/org/sonar/core/purge/PurgeProfiler.java
@@ -20,9 +20,9 @@
 package org.sonar.core.purge;
 
 import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
 import org.sonar.api.utils.TimeUtils;
 
-import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -66,12 +66,7 @@ public class PurgeProfiler {
     durations.put(currentTable, cumulatedDuration + (clock.now() - startTime));
   }
 
-  public void dump(long totalTime) {
-    dump(totalTime, System.out);
-  }
-
-  @VisibleForTesting
-  void dump(long totalTime, PrintStream stream) {
+  public void dump(long totalTime, Logger logger) {
     List<Entry<String, Long>> data = new ArrayList<Map.Entry<String, Long>>(durations.entrySet());
     Collections.sort(data, new Comparator<Entry<String, Long>>() {
       @Override
@@ -84,7 +79,7 @@ public class PurgeProfiler {
       StringBuilder sb = new StringBuilder();
       sb.append("   o ").append(entry.getKey()).append(": ").append(TimeUtils.formatDuration(entry.getValue()))
           .append(" (").append((int) (entry.getValue() / percent)).append("%)");
-      stream.println(sb.toString());
+      logger.info(sb.toString());
     }
   }
 
diff --git a/sonar-core/src/test/java/org/sonar/core/purge/PurgeProfilerTest.java b/sonar-core/src/test/java/org/sonar/core/purge/PurgeProfilerTest.java
index 0454295d97c..b9b6956c400 100644
--- a/sonar-core/src/test/java/org/sonar/core/purge/PurgeProfilerTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/purge/PurgeProfilerTest.java
@@ -19,33 +19,25 @@
  */
 package org.sonar.core.purge;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.Logger;
 
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-import static org.fest.assertions.Assertions.assertThat;
+import static org.mockito.Matchers.contains;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 public class PurgeProfilerTest {
 
   private MockedClock clock;
   private PurgeProfiler profiler;
-  private ByteArrayOutputStream baos;
-  private PrintStream ps;
+  private Logger logger;
 
   @Before
   public void prepare() {
     clock = new MockedClock();
     profiler = new PurgeProfiler(clock);
-    baos = new ByteArrayOutputStream();
-    ps = new PrintStream(baos);
-  }
-
-  @After
-  public void cleanup() {
-    ps.close();
+    logger = mock(Logger.class);
   }
 
   @Test
@@ -62,10 +54,9 @@ public class PurgeProfilerTest {
     clock.sleep(8);
     profiler.stop();
 
-    profiler.dump(50, ps);
-    String content = baos.toString();
-    assertThat(content).contains("foo: 18ms");
-    assertThat(content).contains("bar: 5ms");
+    profiler.dump(50, logger);
+    verify(logger).info(contains("foo: 18ms"));
+    verify(logger).info(contains("bar: 5ms"));
   }
 
   @Test
@@ -84,10 +75,9 @@ public class PurgeProfilerTest {
     clock.sleep(8);
     profiler.stop();
 
-    profiler.dump(50, ps);
-    String content = baos.toString();
-    assertThat(content).contains("foo: 8ms");
-    assertThat(content).contains("bar: 5ms");
+    profiler.dump(50, logger);
+    verify(logger).info(contains("foo: 8ms"));
+    verify(logger).info(contains("bar: 5ms"));
   }
 
   private class MockedClock extends org.sonar.core.purge.PurgeProfiler.Clock {