From 72eac35f15c5b373840c1d80e26b39b20b18128b Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Mon, 11 Feb 2013 10:33:54 +0100 Subject: [PATCH] Rename pico *Module classes to *Container to not confuse with Sonar Module concept --- .../src/main/java/org/sonar/batch/Batch.java | 12 ++++++------ ...trapModule.java => BootstrapContainer.java} | 8 ++++---- .../bootstrap/{Module.java => Container.java} | 14 +++++++------- ...ionModule.java => InspectionContainer.java} | 6 +++--- ...Module.java => TaskBootstrapContainer.java} | 6 +++--- .../{TaskModule.java => TaskContainer.java} | 6 +++--- .../org/sonar/batch/bootstrapper/Batch.java | 8 ++++---- .../org/sonar/batch/tasks/InspectionTask.java | 4 ++-- .../test/java/org/sonar/batch/BatchTest.java | 4 ++-- ...leTest.java => BootstrapContainerTest.java} | 10 +++++----- .../{ModuleTest.java => ContainerTest.java} | 18 +++++++++--------- ...eTest.java => InspectionContainerTest.java} | 6 +++--- ...st.java => TaskBootstrapContainerTest.java} | 6 +++--- ...kModuleTest.java => TaskContainerTest.java} | 10 +++++----- 14 files changed, 59 insertions(+), 59 deletions(-) rename sonar-batch/src/main/java/org/sonar/batch/bootstrap/{BootstrapModule.java => BootstrapContainer.java} (90%) rename sonar-batch/src/main/java/org/sonar/batch/bootstrap/{Module.java => Container.java} (84%) rename sonar-batch/src/main/java/org/sonar/batch/bootstrap/{InspectionModule.java => InspectionContainer.java} (97%) rename sonar-batch/src/main/java/org/sonar/batch/bootstrap/{TaskBootstrapModule.java => TaskBootstrapContainer.java} (92%) rename sonar-batch/src/main/java/org/sonar/batch/bootstrap/{TaskModule.java => TaskContainer.java} (98%) rename sonar-batch/src/test/java/org/sonar/batch/bootstrap/{BootstrapModuleTest.java => BootstrapContainerTest.java} (88%) rename sonar-batch/src/test/java/org/sonar/batch/bootstrap/{ModuleTest.java => ContainerTest.java} (88%) rename sonar-batch/src/test/java/org/sonar/batch/bootstrap/{InspectionModuleTest.java => InspectionContainerTest.java} (94%) rename sonar-batch/src/test/java/org/sonar/batch/bootstrap/{TaskBootstrapModuleTest.java => TaskBootstrapContainerTest.java} (91%) rename sonar-batch/src/test/java/org/sonar/batch/bootstrap/{TaskModuleTest.java => TaskContainerTest.java} (88%) diff --git a/sonar-batch/src/main/java/org/sonar/batch/Batch.java b/sonar-batch/src/main/java/org/sonar/batch/Batch.java index 4e56e1f36b6..6ae437afeeb 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/Batch.java +++ b/sonar-batch/src/main/java/org/sonar/batch/Batch.java @@ -22,8 +22,8 @@ package org.sonar.batch; import org.apache.commons.configuration.Configuration; import org.apache.commons.lang.StringUtils; import org.sonar.api.batch.bootstrap.ProjectReactor; -import org.sonar.batch.bootstrap.BootstrapModule; -import org.sonar.batch.bootstrap.Module; +import org.sonar.batch.bootstrap.BootstrapContainer; +import org.sonar.batch.bootstrap.Container; import org.sonar.batch.bootstrapper.Reactor; import java.util.Iterator; @@ -35,10 +35,10 @@ import java.util.Properties; @Deprecated public final class Batch { - private Module bootstrapModule; + private Container bootstrapModule; public Batch(ProjectReactor reactor, Object... bootstrapperComponents) { - this.bootstrapModule = new BootstrapModule(reactor, bootstrapperComponents); + this.bootstrapModule = new BootstrapContainer(reactor, bootstrapperComponents); this.bootstrapModule.init(); } @@ -48,7 +48,7 @@ public final class Batch { @Deprecated public Batch(Configuration configuration, Object... bootstrapperComponents) {//NOSONAR configuration is not needed // because it's already included in ProjectDefinition. - this.bootstrapModule = new BootstrapModule(extractProjectReactor(bootstrapperComponents), bootstrapperComponents); + this.bootstrapModule = new BootstrapContainer(extractProjectReactor(bootstrapperComponents), bootstrapperComponents); this.bootstrapModule.init(); } @@ -97,7 +97,7 @@ public final class Batch { /** * for unit tests */ - Batch(Module bootstrapModule) { + Batch(Container bootstrapModule) { this.bootstrapModule = bootstrapModule; } diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java similarity index 90% rename from sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java rename to sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java index 9e4d54b201f..1c69c721c79 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java @@ -32,7 +32,7 @@ import javax.annotation.Nullable; /** * Level 1 components */ -public class BootstrapModule extends Module { +public class BootstrapContainer extends Container { private Object[] boostrapperComponents; private ProjectReactor reactor; @@ -43,11 +43,11 @@ public class BootstrapModule extends Module { * @deprecated Use {@link #BootstrapModule(GlobalBatchProperties, String, ProjectReactor, Object...)} */ @Deprecated - public BootstrapModule(ProjectReactor reactor, Object... boostrapperComponents) { + public BootstrapContainer(ProjectReactor reactor, Object... boostrapperComponents) { this(new GlobalBatchProperties(), null, reactor, boostrapperComponents); } - public BootstrapModule(GlobalBatchProperties globalProperties, @Nullable String taskCommand, @Nullable ProjectReactor reactor, + public BootstrapContainer(GlobalBatchProperties globalProperties, @Nullable String taskCommand, @Nullable ProjectReactor reactor, Object... boostrapperComponents) { this.globalProperties = globalProperties; this.taskCommand = taskCommand; @@ -98,7 +98,7 @@ public class BootstrapModule extends Module { @Override protected void doStart() { - Module taskBootstrap = installChild(new TaskBootstrapModule(taskCommand)); + Container taskBootstrap = installChild(new TaskBootstrapContainer(taskCommand)); taskBootstrap.start(); } } diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/Module.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/Container.java similarity index 84% rename from sonar-batch/src/main/java/org/sonar/batch/bootstrap/Module.java rename to sonar-batch/src/main/java/org/sonar/batch/bootstrap/Container.java index 39398129bdd..45d72ef4599 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/Module.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/Container.java @@ -22,11 +22,11 @@ package org.sonar.batch.bootstrap; import org.sonar.api.platform.ComponentContainer; /** - * Module describes group of components - {@link #configure()}. - * Several modules can be grouped together - {@link #installChild(Module)}. + * Container describes group of components - {@link #configure()}. + * Several containers can be grouped together - {@link #installChild(Container)}. *

*/ -public abstract class Module { +public abstract class Container { protected ComponentContainer container; @@ -46,11 +46,11 @@ public abstract class Module { } /** - * Installs module into new scope - see http://picocontainer.org/scopes.html + * Installs container into new scope - see http://picocontainer.org/scopes.html * * @return installed module */ - public final Module installChild(Module child) { + public final Container installChild(Container child) { ComponentContainer childContainer = container.createChild(); child.init(childContainer); return child; @@ -63,7 +63,7 @@ public abstract class Module { /** * @return this */ - public final Module start() { + public final Container start() { container.startComponents(); doStart(); return this; @@ -76,7 +76,7 @@ public abstract class Module { /** * @return this */ - public final Module stop() { + public final Container stop() { try { doStop(); container.stopComponents(); diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/InspectionModule.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/InspectionContainer.java similarity index 97% rename from sonar-batch/src/main/java/org/sonar/batch/bootstrap/InspectionModule.java rename to sonar-batch/src/main/java/org/sonar/batch/bootstrap/InspectionContainer.java index bd91ce3d85e..83d16a37fe6 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/InspectionModule.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/InspectionContainer.java @@ -46,11 +46,11 @@ import org.sonar.core.qualitymodel.DefaultModelFinder; import org.sonar.jpa.dao.ProfilesDao; import org.sonar.jpa.dao.RulesDao; -public class InspectionModule extends Module { - private static final Logger LOG = LoggerFactory.getLogger(InspectionModule.class); +public class InspectionContainer extends Container { + private static final Logger LOG = LoggerFactory.getLogger(InspectionContainer.class); private Project project; - public InspectionModule(Project project) { + public InspectionContainer(Project project) { this.project = project; } diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapModule.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapContainer.java similarity index 92% rename from sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapModule.java rename to sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapContainer.java index 5db5fcf3454..6504eeee35d 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapModule.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapContainer.java @@ -31,11 +31,11 @@ import javax.annotation.Nullable; /** * Level-2 components. Collect tasks definitions. */ -public class TaskBootstrapModule extends Module { +public class TaskBootstrapContainer extends Container { private String taskCommand; - public TaskBootstrapModule(@Nullable String taskCommand) { + public TaskBootstrapContainer(@Nullable String taskCommand) { this.taskCommand = taskCommand; } @@ -67,7 +67,7 @@ public class TaskBootstrapModule extends Module { if (ExtensionUtils.requiresProject(taskDefinition.getTask()) && !projectPresent) { throw new SonarException("Task " + taskDefinition.getName() + " requires to be run on a project"); } - Module childModule = new TaskModule(taskDefinition, projectPresent); + Container childModule = new TaskContainer(taskDefinition, projectPresent); try { installChild(childModule); childModule.start(); diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskModule.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java similarity index 98% rename from sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskModule.java rename to sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java index 28d31500a82..3b754d15b34 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskModule.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java @@ -71,14 +71,14 @@ import org.sonar.jpa.session.JpaDatabaseSession; /** * Level-3 components. Task-level components that don't depends on project. */ -public class TaskModule extends Module { +public class TaskContainer extends Container { - private static final Logger LOG = LoggerFactory.getLogger(TaskModule.class); + private static final Logger LOG = LoggerFactory.getLogger(TaskContainer.class); private TaskDefinition taskDefinition; private boolean projectPresent; - public TaskModule(TaskDefinition task, boolean projectPresent) { + public TaskContainer(TaskDefinition task, boolean projectPresent) { this.taskDefinition = task; this.projectPresent = projectPresent; } diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/Batch.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/Batch.java index cbab3ddb416..36283edec49 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/Batch.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/Batch.java @@ -23,9 +23,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.slf4j.LoggerFactory; import org.sonar.api.batch.bootstrap.ProjectReactor; -import org.sonar.batch.bootstrap.BootstrapModule; +import org.sonar.batch.bootstrap.BootstrapContainer; import org.sonar.batch.bootstrap.GlobalBatchProperties; -import org.sonar.batch.bootstrap.Module; +import org.sonar.batch.bootstrap.Container; import org.sonar.core.PicoUtils; import java.util.Collections; @@ -80,9 +80,9 @@ public final class Batch { } private void startBatch() { - Module bootstrapModule = null; + Container bootstrapModule = null; try { - bootstrapModule = new BootstrapModule(new GlobalBatchProperties(globalProperties), taskCommand, + bootstrapModule = new BootstrapContainer(new GlobalBatchProperties(globalProperties), taskCommand, projectReactor, components.toArray(new Object[components.size()])); bootstrapModule.init(); bootstrapModule.start(); diff --git a/sonar-batch/src/main/java/org/sonar/batch/tasks/InspectionTask.java b/sonar-batch/src/main/java/org/sonar/batch/tasks/InspectionTask.java index a98a960a50b..438e55450e8 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/tasks/InspectionTask.java +++ b/sonar-batch/src/main/java/org/sonar/batch/tasks/InspectionTask.java @@ -19,7 +19,7 @@ */ package org.sonar.batch.tasks; -import org.sonar.batch.bootstrap.InspectionModule; +import org.sonar.batch.bootstrap.InspectionContainer; import org.sonar.api.platform.ComponentContainer; import org.sonar.api.resources.Project; @@ -54,7 +54,7 @@ public class InspectionTask implements Task { analyze(subProject); } - InspectionModule projectModule = new InspectionModule(project); + InspectionContainer projectModule = new InspectionContainer(project); try { ComponentContainer childContainer = container.createChild(); projectModule.init(childContainer); diff --git a/sonar-batch/src/test/java/org/sonar/batch/BatchTest.java b/sonar-batch/src/test/java/org/sonar/batch/BatchTest.java index 8931f08e437..bbcd8365b6a 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/BatchTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/BatchTest.java @@ -21,7 +21,7 @@ package org.sonar.batch; import org.apache.commons.configuration.PropertiesConfiguration; import org.junit.Test; -import org.sonar.batch.bootstrap.Module; +import org.sonar.batch.bootstrap.Container; import java.util.Properties; @@ -40,7 +40,7 @@ public class BatchTest { assertThat(module.stopped, is(true)); } - public static class FakeModule extends Module { + public static class FakeModule extends Container { private boolean started=false; private boolean stopped=false; diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapModuleTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapContainerTest.java similarity index 88% rename from sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapModuleTest.java rename to sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapContainerTest.java index 2b57de9bd40..069840eaf86 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapModuleTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BootstrapContainerTest.java @@ -30,13 +30,13 @@ import org.sonar.batch.MavenPluginExecutor; import static org.fest.assertions.Assertions.assertThat; -public class BootstrapModuleTest { +public class BootstrapContainerTest { private ProjectReactor reactor = new ProjectReactor(ProjectDefinition.create()); @Test public void should_register_fake_maven_executor_if_not_maven_env() { - BootstrapModule module = new BootstrapModule(reactor, null, MyMavenPluginExecutor.class); + BootstrapContainer module = new BootstrapContainer(reactor, null, MyMavenPluginExecutor.class); module.init(); assertThat(module.isMavenPluginExecutorRegistered()).isTrue(); @@ -45,7 +45,7 @@ public class BootstrapModuleTest { @Test public void should_use_plugin_executor_provided_by_maven() { - BootstrapModule module = new BootstrapModule(reactor); + BootstrapContainer module = new BootstrapContainer(reactor); module.init(); assertThat(module.isMavenPluginExecutorRegistered()).isFalse(); assertThat(module.container.getComponentByType(MavenPluginExecutor.class)).isInstanceOf(FakeMavenPluginExecutor.class); @@ -53,7 +53,7 @@ public class BootstrapModuleTest { @Test public void should_register_bootstrap_components() { - BootstrapModule module = new BootstrapModule(reactor, new FakeComponent()); + BootstrapContainer module = new BootstrapContainer(reactor, new FakeComponent()); module.init(); assertThat(module.container).isNotNull(); @@ -63,7 +63,7 @@ public class BootstrapModuleTest { @Test public void should_not_fail_if_no_bootstrap_components() { - BootstrapModule module = new BootstrapModule(reactor); + BootstrapContainer module = new BootstrapContainer(reactor); module.init(); assertThat(module.container).isNotNull(); diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ModuleTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ContainerTest.java similarity index 88% rename from sonar-batch/src/test/java/org/sonar/batch/bootstrap/ModuleTest.java rename to sonar-batch/src/test/java/org/sonar/batch/bootstrap/ContainerTest.java index 67b8921f685..d19a17675e0 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ModuleTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ContainerTest.java @@ -28,11 +28,11 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; -public class ModuleTest { +public class ContainerTest { @Test public void shouldInitModule() { - Module module = new FakeModule(FakeService.class); + Container module = new FakeModule(FakeService.class); module.init(); FakeService service = module.container.getComponentByType(FakeService.class); @@ -43,7 +43,7 @@ public class ModuleTest { @Test public void shouldStartAndStopModule() { - Module module = new FakeModule(FakeService.class); + Container module = new FakeModule(FakeService.class); module.init(); module.start(); @@ -56,14 +56,14 @@ public class ModuleTest { @Test(expected = RuntimeException.class) public void shouldNotIgnoreStartFailures() { - Module module = new FakeModule(NonStartableService.class); + Container module = new FakeModule(NonStartableService.class); module.init(); module.start(); } @Test public void shouldIgnoreStopFailures() { - Module module = new FakeModule(NonStoppableService.class); + Container module = new FakeModule(NonStoppableService.class); module.init(); module.start(); module.stop(); // no exception is raised @@ -71,7 +71,7 @@ public class ModuleTest { @Test public void componentsShouldBeSingletons() { - Module module = new FakeModule(FakeService.class); + Container module = new FakeModule(FakeService.class); module.init(); assertThat(module.container.getComponentByType(FakeService.class) == module.container.getComponentByType(FakeService.class), is(true)); @@ -79,11 +79,11 @@ public class ModuleTest { @Test public void shouldInstallChildModule() { - Module parent = new FakeModule(FakeService.class); + Container parent = new FakeModule(FakeService.class); parent.init(); parent.start(); - Module child = parent.installChild(new FakeModule(ChildService.class)); + Container child = parent.installChild(new FakeModule(ChildService.class)); assertThat(parent.container.getComponentByType(ChildService.class), Matchers.nullValue());// child not accessible from parent assertThat(child.container.getComponentByType(FakeService.class), not(nullValue())); @@ -97,7 +97,7 @@ public class ModuleTest { assertThat(child.container.getComponentByType(ChildService.class).started, is(false)); } - public static class FakeModule extends Module { + public static class FakeModule extends Container { private Class[] components; public FakeModule(Class... components) { diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/InspectionModuleTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/InspectionContainerTest.java similarity index 94% rename from sonar-batch/src/test/java/org/sonar/batch/bootstrap/InspectionModuleTest.java rename to sonar-batch/src/test/java/org/sonar/batch/bootstrap/InspectionContainerTest.java index 6b8d3481580..bf10a117242 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/InspectionModuleTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/InspectionContainerTest.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class InspectionModuleTest { +public class InspectionContainerTest { @Test public void should_register_project_extensions() { // components injected in the parent container @@ -48,7 +48,7 @@ public class InspectionModuleTest { when(resourcePersister.getSnapshot(Matchers. any())).thenReturn(new Snapshot()); final ExtensionInstaller extensionInstaller = mock(ExtensionInstaller.class); - Module batchModule = new Module() { + Container batchModule = new Container() { @Override protected void configure() { container.addSingleton(extensionInstaller); @@ -59,7 +59,7 @@ public class InspectionModuleTest { }; batchModule.init(); - InspectionModule projectModule = new InspectionModule(project); + InspectionContainer projectModule = new InspectionContainer(project); batchModule.installChild(projectModule); verify(extensionInstaller).installInspectionExtensions(any(ComponentContainer.class)); diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskBootstrapModuleTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskBootstrapContainerTest.java similarity index 91% rename from sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskBootstrapModuleTest.java rename to sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskBootstrapContainerTest.java index c47f0774a6a..9145caa5436 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskBootstrapModuleTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskBootstrapContainerTest.java @@ -27,7 +27,7 @@ import org.sonar.api.utils.SonarException; import static org.mockito.Mockito.mock; -public class TaskBootstrapModuleTest { +public class TaskBootstrapContainerTest { @Rule public ExpectedException thrown = ExpectedException.none(); @@ -35,7 +35,7 @@ public class TaskBootstrapModuleTest { @Test public void should_throw_when_no_project_and_task_require_project() { final ExtensionInstaller extensionInstaller = mock(ExtensionInstaller.class); - Module bootstrapModule = new Module() { + Container bootstrapModule = new Container() { @Override protected void configure() { // used to install project extensions @@ -44,7 +44,7 @@ public class TaskBootstrapModuleTest { } }; bootstrapModule.init(); - TaskBootstrapModule module = new TaskBootstrapModule("inspect"); + TaskBootstrapContainer module = new TaskBootstrapContainer("inspect"); bootstrapModule.installChild(module); thrown.expect(SonarException.class); diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskModuleTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskContainerTest.java similarity index 88% rename from sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskModuleTest.java rename to sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskContainerTest.java index e5b7f49b035..03944ea0d77 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskModuleTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskContainerTest.java @@ -28,11 +28,11 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class TaskModuleTest { +public class TaskContainerTest { @Test public void should_register_task_extensions_when_project_present() { final ExtensionInstaller extensionInstaller = mock(ExtensionInstaller.class); - Module bootstrapModule = new Module() { + Container bootstrapModule = new Container() { @Override protected void configure() { // used to install project extensions @@ -40,7 +40,7 @@ public class TaskModuleTest { } }; bootstrapModule.init(); - TaskModule module = new TaskModule(TaskDefinition.create(), true); + TaskContainer module = new TaskContainer(TaskDefinition.create(), true); bootstrapModule.installChild(module); verify(extensionInstaller).installTaskExtensions(any(ComponentContainer.class), eq(true)); @@ -49,7 +49,7 @@ public class TaskModuleTest { @Test public void should_register_task_extensions_when_no_project() { final ExtensionInstaller extensionInstaller = mock(ExtensionInstaller.class); - Module bootstrapModule = new Module() { + Container bootstrapModule = new Container() { @Override protected void configure() { // used to install project extensions @@ -57,7 +57,7 @@ public class TaskModuleTest { } }; bootstrapModule.init(); - TaskModule module = new TaskModule(TaskDefinition.create(), false); + TaskContainer module = new TaskContainer(TaskDefinition.create(), false); bootstrapModule.installChild(module); verify(extensionInstaller).installTaskExtensions(any(ComponentContainer.class), eq(false)); -- 2.39.5