Fix unit tests

diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapContainerTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapContainerTest.java
index 8cc7b44a86a851e437c3a162034906ba95ed4db0..270d0d1a5e11df621177bb5cd88a0bae9ecd4755 100644 (file)
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapContainerTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapContainerTest.java
@@ -24,13 +24,12 @@ import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.sonar.api.batch.maven.MavenPluginHandler;
 import org.sonar.api.resources.Project;
+import org.sonar.batch.scan.filesystem.DefaultModuleFileSystem;
 import org.sonar.batch.scan.maven.FakeMavenPluginExecutor;
 import org.sonar.batch.scan.maven.MavenPluginExecutor;
-import org.sonar.batch.scan.filesystem.DefaultModuleFileSystem;
 
 import static org.fest.assertions.Assertions.assertThat;
 
-
 public class BootstrapContainerTest {
 
   private ProjectReactor reactor = new ProjectReactor(ProjectDefinition.create());
@@ -59,7 +58,6 @@ public class BootstrapContainerTest {
 
     assertThat(module.container).isNotNull();
     assertThat(module.container.getComponentByType(FakeComponent.class)).isNotNull();
-    assertThat(module.container.getComponentByType(ProjectReactor.class)).isSameAs(reactor);
   }
 
   @Test
@@ -68,7 +66,6 @@ public class BootstrapContainerTest {
     module.init();
 
     assertThat(module.container).isNotNull();
-    assertThat(module.container.getComponentByType(ProjectReactor.class)).isSameAs(reactor);
   }
 
   public static class FakeComponent {
@@ -79,7 +76,7 @@ public class BootstrapContainerTest {
     public void execute(Project project, DefaultModuleFileSystem fs, String goal) {
     }
 
-    public MavenPluginHandler execute(Project project, DefaultModuleFileSystem  fs, MavenPluginHandler handler) {
+    public MavenPluginHandler execute(Project project, DefaultModuleFileSystem fs, MavenPluginHandler handler) {
       return handler;
     }
   }

diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionInstallerTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionInstallerTest.java
index ce31e79b46e914232ae759ca0662472712a1c0d9..a4a275fd7d631be14b52e0c87ad1bf8a7c5e0af7 100644 (file)
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionInstallerTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionInstallerTest.java
@@ -90,7 +90,7 @@ public class ExtensionInstallerTest {
   }
 
   @Test
-  public void shouldInstallTaskExtensions() {
+  public void shouldInstallProjectTaskExtensions() {
     BatchPluginRepository pluginRepository = mock(BatchPluginRepository.class);
     when(pluginRepository.getPluginsByMetadata()).thenReturn(newPlugin(SampleProjectTask.class, SampleTask.class, TaskProvider.class));
     ComponentContainer container = new ComponentContainer();
@@ -99,14 +99,14 @@ public class ExtensionInstallerTest {
     installer.installTaskExtensions(container, true);
 
     assertThat(container.getComponentByType(SampleProjectTask.class)).isNotNull();
-    assertThat(container.getComponentByType(SampleTask.class)).isNotNull();
-    assertThat(container.getComponentByType(AnotherTask.class)).isNotNull();
+    assertThat(container.getComponentByType(SampleTask.class)).isNull();
+    assertThat(container.getComponentByType(AnotherTask.class)).isNull();
   }
 
   @Test
-  public void shouldNotInstallProjectTaskExtensionsWhenNoProject() {
+  public void shouldInstallProjectLessTaskExtensions() {
     BatchPluginRepository pluginRepository = mock(BatchPluginRepository.class);
-    when(pluginRepository.getPluginsByMetadata()).thenReturn(newPlugin(SampleProjectTask.class, SampleTask.class));
+    when(pluginRepository.getPluginsByMetadata()).thenReturn(newPlugin(SampleProjectTask.class, SampleTask.class, TaskProvider.class));
     ComponentContainer container = new ComponentContainer();
     ExtensionInstaller installer = new ExtensionInstaller(pluginRepository, new EnvironmentInformation("ant", "1.7"), new Settings());
 
@@ -114,6 +114,7 @@ public class ExtensionInstallerTest {
 
     assertThat(container.getComponentByType(SampleProjectTask.class)).isNull();
     assertThat(container.getComponentByType(SampleTask.class)).isNotNull();
+    assertThat(container.getComponentByType(AnotherTask.class)).isNotNull();
   }
 
   @Test