SONAR-3182 Do not use PMD CPD

11 files changed, 82 insertions, 835 deletions

diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdAnalyser.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdAnalyser.java
deleted file mode 100644
index 25bf47f6247..00000000000
--- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdAnalyser.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.plugins.cpd;
-
-import net.sourceforge.pmd.cpd.TokenEntry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.CpdMapping;
-import org.sonar.api.batch.SensorContext;
-import org.sonar.api.resources.Project;
-import org.sonar.api.resources.Resource;
-import org.sonar.duplications.cpd.Match;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-public class CpdAnalyser {
-
-  private static final Logger LOG = LoggerFactory.getLogger(CpdAnalyser.class);
-
-  private CpdMapping mapping;
-  private SensorContext context;
-  private Project project;
-
-  public CpdAnalyser(Project project, SensorContext context, CpdMapping mapping) {
-    this.mapping = mapping;
-    this.context = context;
-    this.project = project;
-  }
-
-  public void analyse(Iterator<Match> matches) {
-    Map<Resource, DuplicationsData> duplicationsData = new HashMap<Resource, DuplicationsData>();
-    while (matches.hasNext()) {
-      Match match = matches.next();
-
-      for (TokenEntry firstMark : match.getMarkSet()) {
-        String firstAbsolutePath = firstMark.getTokenSrcID();
-        int firstLine = firstMark.getBeginLine();
-
-        Resource firstFile = mapping.createResource(new File(firstAbsolutePath), project.getFileSystem().getSourceDirs());
-        if (firstFile == null) {
-          LOG.warn("CPD - File not found : {}", firstAbsolutePath);
-          continue;
-        }
-
-        DuplicationsData firstFileData = getDuplicationsData(duplicationsData, firstFile);
-        firstFileData.incrementDuplicatedBlock();
-
-        for (TokenEntry tokenEntry : match.getMarkSet()) {
-          String secondAbsolutePath = tokenEntry.getTokenSrcID();
-          int secondLine = tokenEntry.getBeginLine();
-          if (secondAbsolutePath.equals(firstAbsolutePath) && firstLine == secondLine) {
-            continue;
-          }
-          Resource secondFile = mapping.createResource(new File(secondAbsolutePath), project.getFileSystem().getSourceDirs());
-          if (secondFile == null) {
-            LOG.warn("CPD - File not found : {}", secondAbsolutePath);
-            continue;
-          }
-
-          String resourceKey = SonarEngine.getFullKey(project, secondFile);
-          firstFileData.cumulate(resourceKey, secondLine, firstLine, match.getLineCount());
-        }
-      }
-    }
-
-    for (Map.Entry<Resource, DuplicationsData> entry : duplicationsData.entrySet()) {
-      entry.getValue().save(context, entry.getKey());
-    }
-  }
-
-  private DuplicationsData getDuplicationsData(Map<Resource, DuplicationsData> fileContainer, Resource file) {
-    DuplicationsData data = fileContainer.get(file);
-    if (data == null) {
-      String resourceKey = SonarEngine.getFullKey(project, file);
-      data = new DuplicationsData(resourceKey);
-      fileContainer.put(file, data);
-    }
-    return data;
-  }
-
-}
diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdException.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdException.java
deleted file mode 100644
index f4cd45b4d55..00000000000
--- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdException.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.plugins.cpd;
-
-public class CpdException extends RuntimeException {
-  public CpdException(Throwable throwable) {
-    super(throwable);
-  }
-}
diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java
index 9b734290990..ccbe4936d82 100644
--- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java
+++ b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java
@@ -20,12 +20,7 @@
 package org.sonar.plugins.cpd;
 
 import com.google.common.collect.ImmutableList;
-import org.sonar.api.BatchExtension;
-import org.sonar.api.CoreProperties;
-import org.sonar.api.Properties;
-import org.sonar.api.Property;
-import org.sonar.api.PropertyType;
-import org.sonar.api.SonarPlugin;
+import org.sonar.api.*;
 import org.sonar.plugins.cpd.decorators.DuplicationDensityDecorator;
 import org.sonar.plugins.cpd.decorators.SumDuplicationsDecorator;
 import org.sonar.plugins.cpd.index.IndexFactory;
@@ -103,7 +98,6 @@ public final class CpdPlugin extends SonarPlugin {
         DuplicationDensityDecorator.class,
         IndexFactory.class,
         SonarEngine.class,
-        PmdEngine.class,
         SonarBridgeEngine.class);
   }
 
diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdSensor.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdSensor.java
index b07ff10dbff..754ef176ee0 100644
--- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdSensor.java
+++ b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdSensor.java
@@ -19,67 +19,51 @@
  */
 package org.sonar.plugins.cpd;
 
+import com.google.common.annotations.VisibleForTesting;
 import org.apache.commons.configuration.Configuration;
-import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.Sensor;
 import org.sonar.api.batch.SensorContext;
 import org.sonar.api.resources.Project;
-import org.sonar.api.utils.Logs;
 
 public class CpdSensor implements Sensor {
 
+  private static final Logger LOG = LoggerFactory.getLogger(CpdSensor.class);
+
   private CpdEngine sonarEngine;
-  private CpdEngine pmdEngine;
   private CpdEngine sonarBridgeEngine;
 
-  public CpdSensor(SonarEngine sonarEngine, PmdEngine pmdEngine) {
+  public CpdSensor(SonarEngine sonarEngine, SonarBridgeEngine sonarBridgeEngine) {
     this.sonarEngine = sonarEngine;
-    this.pmdEngine = pmdEngine;
-  }
-
-  public CpdSensor(SonarEngine sonarEngine, PmdEngine pmdEngine, SonarBridgeEngine sonarBridgeEngine) {
-    this.sonarEngine = sonarEngine;
-    this.pmdEngine = pmdEngine;
     this.sonarBridgeEngine = sonarBridgeEngine;
   }
 
   public boolean shouldExecuteOnProject(Project project) {
     if (isSkipped(project)) {
-      LoggerFactory.getLogger(getClass()).info("Detection of duplicated code is skipped");
+      LOG.info("Detection of duplicated code is skipped");
       return false;
     }
 
     if (!getEngine(project).isLanguageSupported(project.getLanguage())) {
-      LoggerFactory.getLogger(getClass()).info("Detection of duplication code is not supported for {}.", project.getLanguage());
+      LOG.info("Detection of duplicated code is not supported for {}.", project.getLanguage());
       return false;
     }
 
     return true;
   }
 
-  private CpdEngine getEngine(Project project) {
-    if (isEngineEnabled(project, "sonar")) {
-      if (sonarEngine.isLanguageSupported(project.getLanguage())) {
-        return sonarEngine;
-      }
-      // falback to bridge
-    } else if (isEngineEnabled(project, "pmd")) {
-      return pmdEngine;
+  @VisibleForTesting
+  CpdEngine getEngine(Project project) {
+    if (sonarEngine.isLanguageSupported(project.getLanguage())) {
+      return sonarEngine;
+    } else {
+      return sonarBridgeEngine;
     }
-    return sonarBridgeEngine;
-  }
-
-  boolean isEngineEnabled(Project project, String engineName) {
-    Configuration conf = project.getConfiguration();
-    return StringUtils.equalsIgnoreCase(conf.getString(CoreProperties.CPD_ENGINE, CoreProperties.CPD_ENGINE_DEFAULT_VALUE), engineName);
-  }
-
-  boolean isSonarEngineEnabled(Project project) {
-    return isEngineEnabled(project, "sonar");
   }
 
+  @VisibleForTesting
   boolean isSkipped(Project project) {
     Configuration conf = project.getConfiguration();
     return conf.getBoolean("sonar.cpd." + project.getLanguageKey() + ".skip",
@@ -88,7 +72,7 @@ public class CpdSensor implements Sensor {
 
   public void analyse(Project project, SensorContext context) {
     CpdEngine engine = getEngine(project);
-    Logs.INFO.info("{} is used", engine);
+    LOG.info("{} is used", engine);
     engine.analyse(project, context);
   }
 
@@ -96,4 +80,5 @@ public class CpdSensor implements Sensor {
   public String toString() {
     return getClass().getSimpleName();
   }
+
 }
diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/DuplicationsData.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/DuplicationsData.java
deleted file mode 100644
index fc800738a86..00000000000
--- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/DuplicationsData.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.plugins.cpd;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import org.sonar.api.batch.SensorContext;
-import org.sonar.api.measures.CoreMetrics;
-import org.sonar.api.measures.Measure;
-import org.sonar.api.measures.PersistenceMode;
-import org.sonar.api.resources.Resource;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-
-public class DuplicationsData {
-
-  private final String resourceKey;
-  private final Set<Integer> duplicatedLines = Sets.newHashSet();
-  private final List<XmlEntry> duplicationXMLEntries = Lists.newArrayList();
-
-  private double duplicatedBlocks;
-
-  public DuplicationsData(String resourceKey) {
-    this.resourceKey = resourceKey;
-  }
-
-  public void cumulate(String targetResourceKey, int targetDuplicationStartLine, int duplicationStartLine, int duplicatedLines) {
-    duplicationXMLEntries.add(new XmlEntry(targetResourceKey, targetDuplicationStartLine, duplicationStartLine, duplicatedLines));
-    for (int duplicatedLine = duplicationStartLine; duplicatedLine < duplicationStartLine + duplicatedLines; duplicatedLine++) {
-      this.duplicatedLines.add(duplicatedLine);
-    }
-  }
-
-  public void incrementDuplicatedBlock() {
-    duplicatedBlocks++;
-  }
-
-  public void save(SensorContext context, Resource resource) {
-    context.saveMeasure(resource, CoreMetrics.DUPLICATED_FILES, 1d);
-    context.saveMeasure(resource, CoreMetrics.DUPLICATED_LINES, (double) duplicatedLines.size());
-    context.saveMeasure(resource, CoreMetrics.DUPLICATED_BLOCKS, duplicatedBlocks);
-
-    Measure data = new Measure(CoreMetrics.DUPLICATIONS_DATA, getDuplicationXMLData())
-        .setPersistenceMode(PersistenceMode.DATABASE);
-    context.saveMeasure(resource, data);
-  }
-
-  private String getDuplicationXMLData() {
-    Collections.sort(duplicationXMLEntries, COMPARATOR);
-    StringBuilder duplicationXML = new StringBuilder("<duplications>");
-    for (XmlEntry xmlEntry : duplicationXMLEntries) {
-      duplicationXML.append(xmlEntry.toString());
-    }
-    duplicationXML.append("</duplications>");
-    return duplicationXML.toString();
-  }
-
-  private static final Comparator<XmlEntry> COMPARATOR = new Comparator<XmlEntry>() {
-    public int compare(XmlEntry o1, XmlEntry o2) {
-      if (o1.startLine == o2.startLine) {
-        return o1.lines - o2.lines;
-      }
-      return o1.startLine - o2.startLine;
-    }
-  };
-
-  private final class XmlEntry {
-    private final String target;
-    private final int targetStartLine;
-    private final int startLine;
-    private final int lines;
-
-    private XmlEntry(String target, int targetStartLine, int startLine, int lines) {
-      this.target = target;
-      this.targetStartLine = targetStartLine;
-      this.startLine = startLine;
-      this.lines = lines;
-    }
-
-    @Override
-    public String toString() {
-      return new StringBuilder()
-          .append("<g>")
-          .append("<b s=\"").append(startLine).append("\" l=\"").append(lines).append("\" r=\"").append(resourceKey).append("\" />")
-          .append("<b s=\"").append(targetStartLine).append("\" l=\"").append(lines).append("\" r=\"").append(target).append("\" />")
-          .append("</g>")
-          .toString();
-    }
-  }
-
-}
diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/PmdEngine.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/PmdEngine.java
deleted file mode 100644
index e84f22e36de..00000000000
--- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/PmdEngine.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.plugins.cpd;
-
-import com.google.common.annotations.VisibleForTesting;
-import net.sourceforge.pmd.cpd.AbstractLanguage;
-import net.sourceforge.pmd.cpd.TokenEntry;
-import org.apache.commons.configuration.Configuration;
-import org.sonar.api.CoreProperties;
-import org.sonar.api.batch.CpdMapping;
-import org.sonar.api.batch.SensorContext;
-import org.sonar.api.resources.Language;
-import org.sonar.api.resources.Project;
-import org.sonar.duplications.cpd.CPD;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-
-public class PmdEngine extends CpdEngine {
-
-  private final CpdMapping[] mappings;
-
-  public PmdEngine() {
-    this.mappings = null;
-  }
-
-  public PmdEngine(CpdMapping[] mappings) {
-    this.mappings = mappings;
-  }
-
-  @Override
-  public boolean isLanguageSupported(Language language) {
-    return getMapping(language) != null;
-  }
-
-  private CpdMapping getMapping(Language language) {
-    if (mappings != null) {
-      for (CpdMapping cpdMapping : mappings) {
-        if (cpdMapping.getLanguage().equals(language)) {
-          return cpdMapping;
-        }
-      }
-    }
-    return null;
-  }
-
-  @Override
-  public void analyse(Project project, SensorContext context) {
-    CpdMapping mapping = getMapping(project.getLanguage());
-    CPD cpd = executeCPD(project, mapping, project.getFileSystem().getSourceCharset());
-    saveResults(cpd, mapping, project, context);
-  }
-
-  private void saveResults(CPD cpd, CpdMapping mapping, Project project, SensorContext context) {
-    CpdAnalyser cpdAnalyser = new CpdAnalyser(project, context, mapping);
-    cpdAnalyser.analyse(cpd.getMatches());
-  }
-
-  private CPD executeCPD(Project project, CpdMapping mapping, Charset encoding) {
-    try {
-      CPD cpd = configureCPD(project, mapping, encoding);
-      cpd.go();
-      return cpd;
-
-    } catch (Exception e) {
-      throw new CpdException(e);
-    }
-  }
-
-  private CPD configureCPD(Project project, CpdMapping mapping, Charset encoding) throws IOException {
-    // To avoid a cpd bug generating error as "java.lang.IndexOutOfBoundsException: Index: 259, Size: 248"
-    // See http://sourceforge.net/tracker/?func=detail&atid=479921&aid=1947823&group_id=56262 for more details
-    TokenEntry.clearImages();
-
-    int minTokens = getMinimumTokens(project);
-    AbstractLanguage cpdLanguage = new AbstractLanguage(mapping.getTokenizer()) {
-    };
-
-    CPD cpd = new CPD(minTokens, cpdLanguage);
-    cpd.setEncoding(encoding.name());
-    cpd.setLoadSourceCodeSlices(false);
-    cpd.add(project.getFileSystem().getSourceFiles(project.getLanguage()));
-    return cpd;
-  }
-
-  @VisibleForTesting
-  static int getMinimumTokens(Project project) {
-    Configuration conf = project.getConfiguration();
-    return conf.getInt("sonar.cpd." + project.getLanguageKey() + ".minimumTokens",
-        conf.getInt("sonar.cpd.minimumTokens", CoreProperties.CPD_MINIMUM_TOKENS_DEFAULT_VALUE));
-  }
-
-}
diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarBridgeEngine.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarBridgeEngine.java
index 026893d031c..2b3cfe2e8bc 100644
--- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarBridgeEngine.java
+++ b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarBridgeEngine.java
@@ -22,8 +22,10 @@ package org.sonar.plugins.cpd;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
+import org.apache.commons.configuration.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.CpdMapping;
 import org.sonar.api.batch.SensorContext;
 import org.sonar.api.resources.*;
@@ -89,7 +91,7 @@ public class SonarBridgeEngine extends CpdEngine {
     }
 
     // Detect
-    Predicate<CloneGroup> minimumTokensPredicate = DuplicationPredicates.numberOfUnitsNotLessThan(PmdEngine.getMinimumTokens(project));
+    Predicate<CloneGroup> minimumTokensPredicate = DuplicationPredicates.numberOfUnitsNotLessThan(getMinimumTokens(project));
 
     ExecutorService executorService = Executors.newSingleThreadExecutor();
     try {
@@ -137,6 +139,13 @@ public class SonarBridgeEngine extends CpdEngine {
     }
   }
 
+  @VisibleForTesting
+  static int getMinimumTokens(Project project) {
+    Configuration conf = project.getConfiguration();
+    return conf.getInt("sonar.cpd." + project.getLanguageKey() + ".minimumTokens",
+        conf.getInt("sonar.cpd.minimumTokens", CoreProperties.CPD_MINIMUM_TOKENS_DEFAULT_VALUE));
+  }
+
   private CpdMapping getMapping(Language language) {
     if (mappings != null) {
       for (CpdMapping cpdMapping : mappings) {
diff --git a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/CpdAnalyserTest.java b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/CpdAnalyserTest.java
deleted file mode 100644
index ada79ec7400..00000000000
--- a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/CpdAnalyserTest.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.plugins.cpd;
-
-import net.sourceforge.pmd.cpd.TokenEntry;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.sonar.api.batch.CpdMapping;
-import org.sonar.api.batch.SensorContext;
-import org.sonar.api.measures.CoreMetrics;
-import org.sonar.api.measures.Measure;
-import org.sonar.api.resources.JavaFile;
-import org.sonar.api.resources.Project;
-import org.sonar.api.resources.ProjectFileSystem;
-import org.sonar.api.resources.Resource;
-import org.sonar.duplications.cpd.Match;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.*;
-
-public class CpdAnalyserTest {
-
-  @Test
-  public void testOneSimpleDuplicationBetweenTwoFiles() throws Exception {
-    ProjectFileSystem fileSystem = mock(ProjectFileSystem.class);
-    when(fileSystem.getSourceDirs()).thenReturn(Collections.<File> emptyList());
-    File file1 = new File("target/tmp/file1.ext");
-    File file2 = new File("target/tmp/file2.ext");
-
-    Project project = new Project("key").setFileSystem(fileSystem);
-
-    SensorContext context = mock(SensorContext.class);
-
-    CpdMapping cpdMapping = mock(CpdMapping.class);
-    Resource resource1 = new JavaFile("foo.Foo");
-    Resource resource2 = new JavaFile("foo.Bar");
-    when(cpdMapping.createResource((File) anyObject(), anyList())).thenReturn(resource1).thenReturn(resource2).thenReturn(resource2)
-        .thenReturn(resource1);
-
-    Match match1 = new Match(5, new TokenEntry(null, file1.getAbsolutePath(), 5), new TokenEntry(null, file2.getAbsolutePath(), 15));
-    match1.setLineCount(200);
-
-    CpdAnalyser cpdAnalyser = new CpdAnalyser(project, context, cpdMapping);
-    cpdAnalyser.analyse(Arrays.asList(match1).iterator());
-
-    ArgumentCaptor<Measure> measureCaptor = ArgumentCaptor.forClass(Measure.class);
-
-    verify(context).saveMeasure(resource1, CoreMetrics.DUPLICATED_FILES, 1d);
-    verify(context).saveMeasure(resource1, CoreMetrics.DUPLICATED_BLOCKS, 1d);
-    verify(context).saveMeasure(resource1, CoreMetrics.DUPLICATED_LINES, 200d);
-    verify(context).saveMeasure(eq(resource1), measureCaptor.capture());
-    Measure measure = measureCaptor.getValue();
-    assertThat(measure.getMetric(), is(CoreMetrics.DUPLICATIONS_DATA));
-    assertThat(measure.getData(), is("<duplications><g>"
-      + "<b s=\"5\" l=\"200\" r=\"key:foo.Foo\" />"
-      + "<b s=\"15\" l=\"200\" r=\"key:foo.Bar\" />"
-      + "</g></duplications>"));
-
-    verify(context).saveMeasure(resource2, CoreMetrics.DUPLICATED_FILES, 1d);
-    verify(context).saveMeasure(resource2, CoreMetrics.DUPLICATED_LINES, 200d);
-    verify(context).saveMeasure(resource2, CoreMetrics.DUPLICATED_BLOCKS, 1d);
-    verify(context).saveMeasure(eq(resource2), measureCaptor.capture());
-    assertThat(measure.getMetric(), is(CoreMetrics.DUPLICATIONS_DATA));
-    assertThat(measure.getData(), is("<duplications><g>"
-      + "<b s=\"5\" l=\"200\" r=\"key:foo.Foo\" />"
-      + "<b s=\"15\" l=\"200\" r=\"key:foo.Bar\" />"
-      + "</g></duplications>"));
-  }
-
-  @Test
-  public void testClassicalCaseWithTwoDuplicatedBlocsInvolvingThreeFiles() throws Exception {
-    ProjectFileSystem fileSystem = mock(ProjectFileSystem.class);
-    when(fileSystem.getSourceDirs()).thenReturn(Collections.<File> emptyList());
-    File file1 = new File("target/tmp/file1.ext");
-    File file2 = new File("target/tmp/file2.ext");
-    File file3 = new File("target/tmp/file3.ext");
-
-    Project project = new Project("key").setFileSystem(fileSystem);
-
-    SensorContext context = mock(SensorContext.class);
-
-    CpdMapping cpdMapping = mock(CpdMapping.class);
-    Resource resource1 = new JavaFile("foo.Foo");
-    Resource resource2 = new JavaFile("foo.Bar");
-    Resource resource3 = new JavaFile("foo.Hotel");
-    when(cpdMapping.createResource((File) anyObject(), anyList())).thenReturn(resource1).thenReturn(resource2).thenReturn(resource2)
-        .thenReturn(resource1).thenReturn(resource1).thenReturn(resource3).thenReturn(resource3).thenReturn(resource1);
-
-    Match match1 = new Match(5, new TokenEntry(null, file1.getAbsolutePath(), 5), new TokenEntry(null, file2.getAbsolutePath(), 15));
-    match1.setLineCount(200);
-    Match match2 = new Match(5, new TokenEntry(null, file1.getAbsolutePath(), 5), new TokenEntry(null, file3.getAbsolutePath(), 15));
-    match2.setLineCount(100);
-
-    CpdAnalyser cpdAnalyser = new CpdAnalyser(project, context, cpdMapping);
-    cpdAnalyser.analyse(Arrays.asList(match1, match2).iterator());
-
-    ArgumentCaptor<Measure> measureCaptor = ArgumentCaptor.forClass(Measure.class);
-
-    verify(context).saveMeasure(resource1, CoreMetrics.DUPLICATED_FILES, 1d);
-    verify(context).saveMeasure(resource1, CoreMetrics.DUPLICATED_BLOCKS, 2d);
-    verify(context).saveMeasure(resource1, CoreMetrics.DUPLICATED_LINES, 200d);
-    verify(context).saveMeasure(eq(resource1), measureCaptor.capture());
-
-    Measure measure = measureCaptor.getValue();
-    assertThat(measure.getMetric(), is(CoreMetrics.DUPLICATIONS_DATA));
-    assertThat(measure.getData(), is("<duplications>"
-      + "<g>"
-      + "<b s=\"5\" l=\"100\" r=\"key:foo.Foo\" />"
-      + "<b s=\"15\" l=\"100\" r=\"key:foo.Hotel\" />"
-      + "</g>"
-      + "<g>"
-      + "<b s=\"5\" l=\"200\" r=\"key:foo.Foo\" />"
-      + "<b s=\"15\" l=\"200\" r=\"key:foo.Bar\" />"
-      + "</g>"
-      + "</duplications>"));
-
-    verify(context).saveMeasure(resource2, CoreMetrics.DUPLICATED_FILES, 1d);
-    verify(context).saveMeasure(resource2, CoreMetrics.DUPLICATED_LINES, 200d);
-    verify(context).saveMeasure(resource2, CoreMetrics.DUPLICATED_BLOCKS, 1d);
-    verify(context).saveMeasure(eq(resource2), measureCaptor.capture());
-
-    measure = measureCaptor.getValue();
-    assertThat(measure.getMetric(), is(CoreMetrics.DUPLICATIONS_DATA));
-    assertThat(measure.getData(), is("<duplications>"
-      + "<g>"
-      + "<b s=\"15\" l=\"200\" r=\"key:foo.Bar\" />"
-      + "<b s=\"5\" l=\"200\" r=\"key:foo.Foo\" />"
-      + "</g>"
-      + "</duplications>"));
-
-    verify(context).saveMeasure(resource3, CoreMetrics.DUPLICATED_FILES, 1d);
-    verify(context).saveMeasure(resource3, CoreMetrics.DUPLICATED_LINES, 100d);
-    verify(context).saveMeasure(resource3, CoreMetrics.DUPLICATED_BLOCKS, 1d);
-    verify(context).saveMeasure(eq(resource3), measureCaptor.capture());
-
-    measure = measureCaptor.getValue();
-    assertThat(measure.getMetric(), is(CoreMetrics.DUPLICATIONS_DATA));
-    assertThat(measure.getData(), is("<duplications>"
-      + "<g>"
-      + "<b s=\"15\" l=\"100\" r=\"key:foo.Hotel\" />"
-      + "<b s=\"5\" l=\"100\" r=\"key:foo.Foo\" />"
-      + "</g>"
-      + "</duplications>"));
-  }
-
-  @Test
-  public void testOneDuplicatedBlocInvolvingMoreThanTwoFiles() throws Exception {
-    ProjectFileSystem fileSystem = mock(ProjectFileSystem.class);
-    when(fileSystem.getSourceDirs()).thenReturn(Collections.<File> emptyList());
-    File file1 = new File("target/tmp/file1.ext");
-    File file2 = new File("target/tmp/file2.ext");
-    File file3 = new File("target/tmp/file3.ext");
-    File file4 = new File("target/tmp/file4.ext");
-
-    Project project = new Project("key").setFileSystem(fileSystem);
-
-    SensorContext context = mock(SensorContext.class);
-
-    CpdMapping cpdMapping = mock(CpdMapping.class);
-    Resource resource1 = new JavaFile("foo.Foo");
-    Resource resource2 = new JavaFile("foo.Bar");
-    Resource resource3 = new JavaFile("foo.Hotel");
-    Resource resource4 = new JavaFile("foo.Coffee");
-    when(cpdMapping.createResource((File) anyObject(), anyList())).thenReturn(resource1).thenReturn(resource2).thenReturn(resource3)
-        .thenReturn(resource4).thenReturn(resource2).thenReturn(resource1).thenReturn(resource3).thenReturn(resource4)
-        .thenReturn(resource3).thenReturn(resource1).thenReturn(resource2).thenReturn(resource4).thenReturn(resource4)
-        .thenReturn(resource1).thenReturn(resource2).thenReturn(resource3);
-
-    Match match = new Match(5, createTokenEntry(file1.getAbsolutePath(), 5), createTokenEntry(file2.getAbsolutePath(), 15));
-    match.setLineCount(200);
-    Set<TokenEntry> tokenEntries = new LinkedHashSet<TokenEntry>();
-    tokenEntries.add(createTokenEntry(file1.getAbsolutePath(), 5));
-    tokenEntries.add(createTokenEntry(file2.getAbsolutePath(), 15));
-    tokenEntries.add(createTokenEntry(file3.getAbsolutePath(), 7));
-    tokenEntries.add(createTokenEntry(file4.getAbsolutePath(), 10));
-    match.setMarkSet(tokenEntries);
-
-    CpdAnalyser cpdAnalyser = new CpdAnalyser(project, context, cpdMapping);
-    cpdAnalyser.analyse(Arrays.asList(match).iterator());
-
-    ArgumentCaptor<Measure> measureCaptor = ArgumentCaptor.forClass(Measure.class);
-
-    verify(context).saveMeasure(resource1, CoreMetrics.DUPLICATED_FILES, 1d);
-    verify(context).saveMeasure(resource1, CoreMetrics.DUPLICATED_BLOCKS, 1d);
-    verify(context).saveMeasure(resource1, CoreMetrics.DUPLICATED_LINES, 200d);
-    verify(context).saveMeasure(eq(resource1), measureCaptor.capture());
-
-    Measure measure = measureCaptor.getValue();
-    assertThat(measure.getMetric(), is(CoreMetrics.DUPLICATIONS_DATA));
-    assertThat(measure.getData(), is("<duplications>"
-      + "<g>"
-      + "<b s=\"5\" l=\"200\" r=\"key:foo.Foo\" />"
-      + "<b s=\"15\" l=\"200\" r=\"key:foo.Bar\" />"
-      + "</g>"
-      + "<g>"
-      + "<b s=\"5\" l=\"200\" r=\"key:foo.Foo\" />"
-      + "<b s=\"7\" l=\"200\" r=\"key:foo.Hotel\" />"
-      + "</g>"
-      + "<g>"
-      + "<b s=\"5\" l=\"200\" r=\"key:foo.Foo\" />"
-      + "<b s=\"10\" l=\"200\" r=\"key:foo.Coffee\" />"
-      + "</g>"
-      + "</duplications>"));
-
-    verify(context).saveMeasure(resource3, CoreMetrics.DUPLICATED_FILES, 1d);
-    verify(context).saveMeasure(resource3, CoreMetrics.DUPLICATED_LINES, 200d);
-    verify(context).saveMeasure(resource3, CoreMetrics.DUPLICATED_BLOCKS, 1d);
-    verify(context).saveMeasure(eq(resource3), measureCaptor.capture());
-
-    measure = measureCaptor.getValue();
-    assertThat(measure.getMetric(), is(CoreMetrics.DUPLICATIONS_DATA));
-    assertThat(measure.getData(), is("<duplications>"
-      + "<g>"
-      + "<b s=\"7\" l=\"200\" r=\"key:foo.Hotel\" />"
-      + "<b s=\"5\" l=\"200\" r=\"key:foo.Foo\" />"
-      + "</g>"
-      + "<g>"
-      + "<b s=\"7\" l=\"200\" r=\"key:foo.Hotel\" />"
-      + "<b s=\"15\" l=\"200\" r=\"key:foo.Bar\" />"
-      + "</g>"
-      + "<g>"
-      + "<b s=\"7\" l=\"200\" r=\"key:foo.Hotel\" />"
-      + "<b s=\"10\" l=\"200\" r=\"key:foo.Coffee\" />"
-      + "</g>"
-      + "</duplications>"));
-
-    verify(context).saveMeasure(resource2, CoreMetrics.DUPLICATED_FILES, 1d);
-    verify(context).saveMeasure(resource2, CoreMetrics.DUPLICATED_LINES, 200d);
-    verify(context).saveMeasure(resource2, CoreMetrics.DUPLICATED_BLOCKS, 1d);
-    verify(context).saveMeasure(eq(resource2), measureCaptor.capture());
-
-    measure = measureCaptor.getValue();
-    assertThat(measure.getMetric(), is(CoreMetrics.DUPLICATIONS_DATA));
-    assertThat(measure.getData(), is("<duplications>"
-      + "<g>"
-      + "<b s=\"15\" l=\"200\" r=\"key:foo.Bar\" />"
-      + "<b s=\"5\" l=\"200\" r=\"key:foo.Foo\" />"
-      + "</g>"
-      + "<g>"
-      + "<b s=\"15\" l=\"200\" r=\"key:foo.Bar\" />"
-      + "<b s=\"7\" l=\"200\" r=\"key:foo.Hotel\" />"
-      + "</g>"
-      + "<g>"
-      + "<b s=\"15\" l=\"200\" r=\"key:foo.Bar\" />"
-      + "<b s=\"10\" l=\"200\" r=\"key:foo.Coffee\" />"
-      + "</g>"
-      + "</duplications>"));
-
-    verify(context).saveMeasure(resource4, CoreMetrics.DUPLICATED_LINES, 200d);
-    verify(context).saveMeasure(resource4, CoreMetrics.DUPLICATED_FILES, 1d);
-    verify(context).saveMeasure(resource4, CoreMetrics.DUPLICATED_BLOCKS, 1d);
-    verify(context).saveMeasure(eq(resource4), measureCaptor.capture());
-
-    measure = measureCaptor.getValue();
-    assertThat(measure.getMetric(), is(CoreMetrics.DUPLICATIONS_DATA));
-    assertThat(measure.getData(), is("<duplications>"
-      + "<g>"
-      + "<b s=\"10\" l=\"200\" r=\"key:foo.Coffee\" />"
-      + "<b s=\"5\" l=\"200\" r=\"key:foo.Foo\" />"
-      + "</g>"
-      + "<g>"
-      + "<b s=\"10\" l=\"200\" r=\"key:foo.Coffee\" />"
-      + "<b s=\"15\" l=\"200\" r=\"key:foo.Bar\" />"
-      + "</g>"
-      + "<g>"
-      + "<b s=\"10\" l=\"200\" r=\"key:foo.Coffee\" />"
-      + "<b s=\"7\" l=\"200\" r=\"key:foo.Hotel\" />"
-      + "</g>"
-      + "</duplications>"));
-  }
-
-  @Test
-  public void testDuplicationOnSameFile() throws Exception {
-    ProjectFileSystem fileSystem = mock(ProjectFileSystem.class);
-    when(fileSystem.getSourceDirs()).thenReturn(Collections.<File> emptyList());
-    File file1 = new File("target/tmp/file1.ext");
-
-    Project project = new Project("key").setFileSystem(fileSystem);
-
-    SensorContext context = mock(SensorContext.class);
-
-    CpdMapping cpdMapping = mock(CpdMapping.class);
-    Resource resource1 = new JavaFile("foo.Foo");
-    when(cpdMapping.createResource((File) anyObject(), anyList())).thenReturn(resource1).thenReturn(resource1);
-
-    Match match1 = new Match(304, new TokenEntry(null, file1.getAbsolutePath(), 5), new TokenEntry(null, file1.getAbsolutePath(), 215));
-    match1.setLineCount(200);
-
-    CpdAnalyser cpdAnalyser = new CpdAnalyser(project, context, cpdMapping);
-    cpdAnalyser.analyse(Arrays.asList(match1).iterator());
-
-    ArgumentCaptor<Measure> measureCaptor = ArgumentCaptor.forClass(Measure.class);
-
-    verify(context).saveMeasure(resource1, CoreMetrics.DUPLICATED_FILES, 1d);
-    verify(context).saveMeasure(resource1, CoreMetrics.DUPLICATED_LINES, 400d);
-    verify(context).saveMeasure(resource1, CoreMetrics.DUPLICATED_BLOCKS, 2d);
-    verify(context).saveMeasure(eq(resource1), measureCaptor.capture());
-
-    Measure measure = measureCaptor.getValue();
-    assertThat(measure.getMetric(), is(CoreMetrics.DUPLICATIONS_DATA));
-    // FIXME in fact should be only one group - see SONAR-3131
-    assertThat(measure.getData(), is("<duplications>"
-      + "<g>"
-      + "<b s=\"5\" l=\"200\" r=\"key:foo.Foo\" />"
-      + "<b s=\"215\" l=\"200\" r=\"key:foo.Foo\" />"
-      + "</g>"
-      + "<g>"
-      + "<b s=\"215\" l=\"200\" r=\"key:foo.Foo\" />"
-      + "<b s=\"5\" l=\"200\" r=\"key:foo.Foo\" />"
-      + "</g>"
-      + "</duplications>"));
-  }
-
-  private static TokenEntry createTokenEntry(String sourceId, int line) {
-    TokenEntry entry = new TokenEntry(null, sourceId, line);
-    entry.setHashCode(sourceId.hashCode() + line);
-    return entry;
-  }
-}
diff --git a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/CpdSensorTest.java b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/CpdSensorTest.java
index 028b6f707a2..66e946c6d49 100644
--- a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/CpdSensorTest.java
+++ b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/CpdSensorTest.java
@@ -20,8 +20,10 @@
 package org.sonar.plugins.cpd;
 
 import org.apache.commons.configuration.PropertiesConfiguration;
+import org.junit.Before;
 import org.junit.Test;
-import org.sonar.api.batch.CpdMapping;
+import org.sonar.api.resources.Java;
+import org.sonar.api.resources.Language;
 import org.sonar.api.resources.Project;
 import org.sonar.plugins.cpd.index.IndexFactory;
 
@@ -29,9 +31,22 @@ import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
 
 public class CpdSensorTest {
 
+  private SonarEngine sonarEngine;
+  private SonarBridgeEngine sonarBridgeEngine;
+  private CpdSensor sensor;
+
+  @Before
+  public void setUp() {
+    IndexFactory indexFactory = new IndexFactory(null);
+    sonarEngine = new SonarEngine(indexFactory);
+    sonarBridgeEngine = new SonarBridgeEngine(indexFactory);
+    sensor = new CpdSensor(sonarEngine, sonarBridgeEngine);
+  }
+
   @Test
   public void generalSkip() {
     PropertiesConfiguration conf = new PropertiesConfiguration();
@@ -39,7 +54,6 @@ public class CpdSensorTest {
 
     Project project = createJavaProject().setConfiguration(conf);
 
-    CpdSensor sensor = new CpdSensor(new SonarEngine(new IndexFactory(null)), new PmdEngine(new CpdMapping[0]));
     assertTrue(sensor.isSkipped(project));
   }
 
@@ -47,7 +61,6 @@ public class CpdSensorTest {
   public void doNotSkipByDefault() {
     Project project = createJavaProject().setConfiguration(new PropertiesConfiguration());
 
-    CpdSensor sensor = new CpdSensor(new SonarEngine(new IndexFactory(null)), new PmdEngine(new CpdMapping[0]));
     assertFalse(sensor.isSkipped(project));
   }
 
@@ -60,28 +73,26 @@ public class CpdSensorTest {
     Project phpProject = createPhpProject().setConfiguration(conf);
     Project javaProject = createJavaProject().setConfiguration(conf);
 
-    CpdSensor sensor = new CpdSensor(new SonarEngine(new IndexFactory(null)), new PmdEngine(new CpdMapping[0]));
     assertTrue(sensor.isSkipped(phpProject));
     assertFalse(sensor.isSkipped(javaProject));
   }
 
   @Test
   public void engine() {
-    PropertiesConfiguration conf = new PropertiesConfiguration();
-    Project project = createJavaProject().setConfiguration(conf);
-    CpdSensor sensor = new CpdSensor(new SonarEngine(new IndexFactory(null)), new PmdEngine(new CpdMapping[0]));
+    Project phpProject = createPhpProject();
+    Project javaProject = createJavaProject();
 
-    assertThat(sensor.isSonarEngineEnabled(project), is(true));
-    conf.setProperty("sonar.cpd.engine", "pmd");
-    assertThat(sensor.isSonarEngineEnabled(project), is(false));
+    assertThat(sensor.getEngine(javaProject), is((CpdEngine) sonarEngine));
+    assertThat(sensor.getEngine(phpProject), is((CpdEngine) sonarBridgeEngine));
   }
 
   private Project createJavaProject() {
-    return new Project("java_project").setLanguageKey("java");
+    return new Project("java_project").setLanguageKey("java").setLanguage(Java.INSTANCE);
   }
 
   private Project createPhpProject() {
-    return new Project("php_project").setLanguageKey("php");
+    Language phpLanguage = mock(Language.class);
+    return new Project("php_project").setLanguageKey("php").setLanguage(phpLanguage);
   }
 
 }
diff --git a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/PmdEngineTest.java b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/PmdEngineTest.java
deleted file mode 100644
index 3bbedf7f787..00000000000
--- a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/PmdEngineTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.plugins.cpd;
-
-import static junit.framework.Assert.assertEquals;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.junit.Test;
-import org.sonar.api.CoreProperties;
-import org.sonar.api.batch.CpdMapping;
-import org.sonar.api.resources.Java;
-import org.sonar.api.resources.Language;
-import org.sonar.api.resources.Project;
-
-public class PmdEngineTest {
-
-  @Test
-  public void shouldNotFailWhenNoMappings() {
-    PmdEngine engine = new PmdEngine();
-    assertThat(engine.isLanguageSupported(Java.INSTANCE), is(false));
-  }
-
-  @Test
-  public void shouldCheckLanguageSupport() {
-    CpdMapping mapping = mock(CpdMapping.class);
-    when(mapping.getLanguage()).thenReturn(Java.INSTANCE);
-    PmdEngine engine = new PmdEngine(new CpdMapping[] { mapping });
-    assertThat(engine.isLanguageSupported(Java.INSTANCE), is(true));
-
-    Language anotherLanguage = mock(Language.class);
-    assertThat(engine.isLanguageSupported(anotherLanguage), is(false));
-  }
-
-  @Test
-  public void defaultMinimumTokens() {
-    Project project = createJavaProject().setConfiguration(new PropertiesConfiguration());
-
-    assertEquals(CoreProperties.CPD_MINIMUM_TOKENS_DEFAULT_VALUE, PmdEngine.getMinimumTokens(project));
-  }
-
-  @Test
-  public void generalMinimumTokens() {
-    PropertiesConfiguration conf = new PropertiesConfiguration();
-    conf.setProperty("sonar.cpd.minimumTokens", "33");
-    Project project = createJavaProject().setConfiguration(conf);
-
-    assertEquals(33, PmdEngine.getMinimumTokens(project));
-  }
-
-  @Test
-  public void minimumTokensByLanguage() {
-    PropertiesConfiguration conf = new PropertiesConfiguration();
-    conf.setProperty("sonar.cpd.minimumTokens", "100");
-    conf.setProperty("sonar.cpd.php.minimumTokens", "33");
-
-    Project phpProject = createPhpProject().setConfiguration(conf);
-    Project javaProject = createJavaProject().setConfiguration(conf);
-
-    assertEquals(100, PmdEngine.getMinimumTokens(javaProject));
-    assertEquals(33, PmdEngine.getMinimumTokens(phpProject));
-  }
-
-  private Project createJavaProject() {
-    return new Project("java_project").setLanguageKey("java");
-  }
-
-  private Project createPhpProject() {
-    return new Project("php_project").setLanguageKey("php");
-  }
-
-}
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 e9ae76e300f..b036804b74e 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
@@ -19,7 +19,10 @@
  */
 package org.sonar.plugins.cpd;
 
+import org.apache.commons.configuration.PropertiesConfiguration;
 import org.junit.Test;
+import org.sonar.api.CoreProperties;
+import org.sonar.api.resources.Project;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
@@ -34,4 +37,33 @@ public class SonarBridgeEngineTest {
     assertThat(SonarBridgeEngine.getDefaultBlockSize("other"), is(10));
   }
 
+  @Test
+  public void defaultMinimumTokens() {
+    Project project = new Project("foo").setConfiguration(new PropertiesConfiguration());
+
+    assertThat(SonarBridgeEngine.getMinimumTokens(project), is(CoreProperties.CPD_MINIMUM_TOKENS_DEFAULT_VALUE));
+  }
+
+  @Test
+  public void generalMinimumTokens() {
+    PropertiesConfiguration conf = new PropertiesConfiguration();
+    conf.setProperty("sonar.cpd.minimumTokens", "33");
+    Project project = new Project("foo").setConfiguration(conf);
+
+    assertThat(SonarBridgeEngine.getMinimumTokens(project), is(33));
+  }
+
+  @Test
+  public void minimumTokensByLanguage() {
+    PropertiesConfiguration conf = new PropertiesConfiguration();
+    conf.setProperty("sonar.cpd.java.minimumTokens", "42");
+    conf.setProperty("sonar.cpd.php.minimumTokens", "33");
+
+    Project javaProject = new Project("foo").setLanguageKey("java").setConfiguration(conf);
+    Project phpProject = new Project("foo").setLanguageKey("php").setConfiguration(conf);
+
+    assertThat(SonarBridgeEngine.getMinimumTokens(javaProject), is(42));
+    assertThat(SonarBridgeEngine.getMinimumTokens(phpProject), is(33));
+  }
+
 }