SONAR-2602 the extensions Language must not be declared with InstantiationStrategy=PER_BATCH

2 files changed, 30 insertions, 20 deletions

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 66e946c6d49..d49dd75daf2 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
@@ -65,16 +65,18 @@ public class CpdSensorTest {
   }
 
   @Test
-  public void skipByLanguage() {
-    PropertiesConfiguration conf = new PropertiesConfiguration();
-    conf.setProperty("sonar.cpd.skip", "false");
-    conf.setProperty("sonar.cpd.php.skip", "true");
-
-    Project phpProject = createPhpProject().setConfiguration(conf);
-    Project javaProject = createJavaProject().setConfiguration(conf);
+  public void shouldSkipByLanguage() {
 
+    Project phpProject = createPhpProject();
+    phpProject.getConfiguration().setProperty("sonar.cpd.skip", "false");
+    phpProject.getConfiguration().setProperty("sonar.cpd.php.skip", "true");
     assertTrue(sensor.isSkipped(phpProject));
+
+    Project javaProject = createJavaProject();
+    javaProject.getConfiguration().setProperty("sonar.cpd.skip", "false");
+    javaProject.getConfiguration().setProperty("sonar.cpd.php.skip", "true");
     assertFalse(sensor.isSkipped(javaProject));
+
   }
 
   @Test
@@ -87,12 +89,16 @@ public class CpdSensorTest {
   }
 
   private Project createJavaProject() {
-    return new Project("java_project").setLanguageKey("java").setLanguage(Java.INSTANCE);
+    PropertiesConfiguration conf = new PropertiesConfiguration();
+    conf.setProperty("sonar.language", "java");
+    return new Project("java_project").setConfiguration(conf).setLanguage(Java.INSTANCE);
   }
 
   private Project createPhpProject() {
+    PropertiesConfiguration conf = new PropertiesConfiguration();
+    conf.setProperty("sonar.language", "php");
     Language phpLanguage = mock(Language.class);
-    return new Project("php_project").setLanguageKey("php").setLanguage(phpLanguage);
+    return new Project("php_project").setConfiguration(conf).setLanguage(phpLanguage);
   }
 
 }
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 b036804b74e..c36facc230a 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
@@ -39,31 +39,35 @@ public class SonarBridgeEngineTest {
 
   @Test
   public void defaultMinimumTokens() {
-    Project project = new Project("foo").setConfiguration(new PropertiesConfiguration());
+    Project project = newProject("foo", "java");
 
     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);
+    Project project = newProject("foo", "java");
+    project.getConfiguration().setProperty("sonar.cpd.minimumTokens", "33");
 
     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);
-
+    Project javaProject = newProject("foo", "java");
+    javaProject.getConfiguration().setProperty("sonar.cpd.java.minimumTokens", "42");
+    javaProject.getConfiguration().setProperty("sonar.cpd.php.minimumTokens", "33");
     assertThat(SonarBridgeEngine.getMinimumTokens(javaProject), is(42));
+
+    Project phpProject = newProject("foo", "php");
+    phpProject.getConfiguration().setProperty("sonar.cpd.java.minimumTokens", "42");
+    phpProject.getConfiguration().setProperty("sonar.cpd.php.minimumTokens", "33");
     assertThat(SonarBridgeEngine.getMinimumTokens(phpProject), is(33));
   }
 
+  private static Project newProject(String key, String language) {
+    PropertiesConfiguration conf = new PropertiesConfiguration();
+    conf.setProperty("sonar.language", language);
+    return new Project(key).setConfiguration(conf).setAnalysisType(Project.AnalysisType.DYNAMIC);
+  }
 }