From 6900f586ea8f30c0a5a35b299f7461bd1bc867ae Mon Sep 17 00:00:00 2001 From: Fabrice Bellingard Date: Mon, 18 Feb 2013 15:12:46 +0100 Subject: [PATCH] SONAR-3108 Improve log to look like the main exclusions/inclusions --- .../src/main/java/org/sonar/plugins/cpd/CpdEngine.java | 9 +++++++-- .../org/sonar/plugins/cpd/SonarBridgeEngineTest.java | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdEngine.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdEngine.java index 0b5f03ad4a8..ed44e05f6c5 100644 --- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdEngine.java +++ b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdEngine.java @@ -19,7 +19,6 @@ */ package org.sonar.plugins.cpd; -import com.google.common.base.Joiner; import org.slf4j.Logger; import org.sonar.api.BatchExtension; import org.sonar.api.batch.SensorContext; @@ -34,7 +33,13 @@ public abstract class CpdEngine implements BatchExtension { protected void logExclusions(String[] exclusions, Logger logger) { if (exclusions.length > 0) { - logger.info("Exclusions applied to copy-paste detection: " + Joiner.on(",").join(exclusions)); + StringBuilder message = new StringBuilder("Copy-paste detection exclusions:"); + for (String exclusion : exclusions) { + message.append("\n "); + message.append(exclusion); + } + + logger.info(message.toString()); } } diff --git a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/SonarBridgeEngineTest.java b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/SonarBridgeEngineTest.java index a7cde907a0d..ee6874620c3 100644 --- a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/SonarBridgeEngineTest.java +++ b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/SonarBridgeEngineTest.java @@ -55,7 +55,11 @@ public class SonarBridgeEngineTest { logger = mock(Logger.class); engine.logExclusions(new String[] {"Foo*", "**/Bar*"}, logger); - verify(logger, times(1)).info("Exclusions applied to copy-paste detection: Foo*,**/Bar*"); + + String message = "Copy-paste detection exclusions:" + + "\n Foo*" + + "\n **/Bar*"; + verify(logger, times(1)).info(message); } @Test -- 2.39.5