This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch MNG-7035-maven5 in repository https://gitbox.apache.org/repos/asf/maven.git
commit a3cdab3d863e416f81f4e64471dd327b98e7f47c Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Fri Jan 8 14:00:56 2021 +0100 Remove redundant container setup --- .../AbstractArtifactComponentTestCase.java | 12 --------- .../factory/DefaultArtifactFactoryTest.java | 19 -------------- .../transform/TransformationManagerTest.java | 19 -------------- .../manager/DefaultProfileManagerTest.java | 8 ------ .../project/AbstractMavenProjectTestCase.java | 12 --------- .../apache/maven/project/ProjectClasspathTest.java | 12 --------- .../repository/LegacyRepositorySystemTest.java | 30 ---------------------- .../maven/repository/MirrorProcessorTest.java | 20 --------------- .../repository/legacy/DefaultWagonManagerTest.java | 30 ---------------------- .../legacy/LegacyRepositorySystemTest.java | 29 --------------------- .../resolver/DefaultArtifactCollectorTest.java | 8 ------ .../conflict/AbstractConflictResolverTest.java | 12 --------- .../maven/AbstractCoreMavenComponentTestCase.java | 19 -------------- .../src/test/java/org/apache/maven/MavenTest.java | 9 ------- .../maven/lifecycle/DefaultLifecyclesTest.java | 26 ------------------- .../project/AbstractMavenProjectTestCase.java | 17 ------------ .../apache/maven/project/PomConstructionTest.java | 19 +------------- .../project/artifact/MavenMetadataSourceTest.java | 26 ------------------- .../internal/DefaultRuntimeInformationTest.java | 17 ------------ .../settings/PomConstructionWithSettingsTest.java | 18 ------------- .../internal/AbstractRepositoryTestCase.java | 8 ------ .../java/org/apache/maven/test/PlexusTestCase.java | 7 +++++ 22 files changed, 8 insertions(+), 369 deletions(-) diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java index e099f65..70b81d7 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java @@ -88,24 +88,12 @@ public abstract class AbstractArtifactComponentTestCase @Inject LegacySupport legacySupport; - @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - @Before public void setUp() throws Exception { super.setUp(); - ((DefaultPlexusContainer)getContainer()) - .addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - RepositorySystemSession repoSession = initRepoSession(); MavenSession session = new MavenSession( getContainer(), repoSession, new DefaultMavenExecutionRequest(), new DefaultMavenExecutionResult() ); diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java index 14721cd..3a0aa5b 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java @@ -40,25 +40,6 @@ public class DefaultArtifactFactoryTest @Inject ArtifactFactory factory; - @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - - @Override - public void setUp() - throws Exception - { - super.setUp(); - - ((DefaultPlexusContainer)getContainer()) - .addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - } - @Test public void testPropagationOfSystemScopeRegardlessOfInheritedScope() { diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java index f7072f3..78b9504 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java @@ -41,25 +41,6 @@ public class TransformationManagerTest @Inject ArtifactTransformationManager tm; - @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - - @Override - public void setUp() - throws Exception - { - super.setUp(); - - ((DefaultPlexusContainer)getContainer()) - .addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - } - @Test public void testTransformationManager() { diff --git a/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java b/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java index e5e5410..4999289 100644 --- a/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java +++ b/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java @@ -39,14 +39,6 @@ public class DefaultProfileManagerTest extends PlexusTestCase { - @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - @Test public void testShouldActivateDefaultProfile() throws Exception diff --git a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java index 5694e23..3885380 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java +++ b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java @@ -53,24 +53,12 @@ public abstract class AbstractMavenProjectTestCase protected RepositorySystem repositorySystem; @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - - @Override @Before public void setUp() throws Exception { super.setUp(); - ((DefaultPlexusContainer)getContainer()) - .addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - if ( getContainer().hasComponent( ProjectBuilder.class, "test" ) ) { projectBuilder = lookup( ProjectBuilder.class, "test" ); diff --git a/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java b/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java index 79f7a9a..0db4321 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java +++ b/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java @@ -46,23 +46,11 @@ public class ProjectClasspathTest static final String dir = "projects/scope/"; @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - - @Override public void setUp() throws Exception { super.setUp(); - ((DefaultPlexusContainer)getContainer()) - .addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - ArtifactResolver resolver = lookup( ArtifactResolver.class, "classpath" ); DefaultArtifactDescriptorReader pomReader = (DefaultArtifactDescriptorReader)lookup(ArtifactDescriptorReader.class); pomReader.setArtifactResolver( resolver ); diff --git a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java index 251d116..f1ffbb0 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java @@ -63,36 +63,6 @@ public class LegacyRepositorySystemTest @Inject private ResolutionErrorHandler resolutionErrorHandler; - @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - - @Before - @Override - public void setUp() - throws Exception - { - super.setUp(); - - ((DefaultPlexusContainer)getContainer()) - .addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - } - - @After - @Override - public void tearDown() - throws Exception - { - repositorySystem = null; - resolutionErrorHandler = null; - super.tearDown(); - } - protected List<ArtifactRepository> getRemoteRepositories() throws Exception { diff --git a/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java index 7fc75c3..9d7c7ad 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java @@ -50,14 +50,6 @@ public class MirrorProcessorTest @Inject private ArtifactRepositoryFactory repositorySystem; - @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - @Before public void setUp() throws Exception @@ -67,18 +59,6 @@ public class MirrorProcessorTest repositorySystem = lookup( ArtifactRepositoryFactory.class ); } - @After - @Override - public void tearDown() - throws Exception - { - super.setUp(); - - ((DefaultPlexusContainer)getContainer()) - .addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - } - @Test public void testExternalURL() { diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java index 37aa4e7..a0e9f90 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java @@ -79,36 +79,6 @@ public class DefaultWagonManagerTest @Inject private ArtifactRepositoryFactory artifactRepositoryFactory; - @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - - @Before - @Override - public void setUp() - throws Exception - { - super.setUp(); - - ((DefaultPlexusContainer)getContainer()) - .addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - } - - @After - @Override - public void tearDown() - throws Exception - { - wagonManager = null; - artifactFactory = null; - super.tearDown(); - } - @Test public void testUnnecessaryRepositoryLookup() throws Exception diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java index 0499e80..1f4d69a 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java @@ -47,35 +47,6 @@ public class LegacyRepositorySystemTest @Inject private RepositorySystem repositorySystem; - @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - - @Before - @Override - public void setUp() - throws Exception - { - super.setUp(); - - ((DefaultPlexusContainer)getContainer()) - .addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - } - - @After - @Override - public void tearDown() - throws Exception - { - repositorySystem = null; - super.tearDown(); - } - @Test public void testThatLocalRepositoryWithSpacesIsProperlyHandled() throws Exception diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java index ba84b82..0cad366 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java @@ -77,14 +77,6 @@ public class DefaultArtifactCollectorTest private static final String GROUP_ID = "test"; - @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - @Before @Override public void setUp() diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java index f60773f..1a5eeab 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java @@ -76,14 +76,6 @@ public abstract class AbstractConflictResolverTest // TestCase methods ------------------------------------------------------- - @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - /* * @see junit.framework.TestCase#setUp() */ @@ -94,10 +86,6 @@ public abstract class AbstractConflictResolverTest { super.setUp(); - ((DefaultPlexusContainer)getContainer()) - .addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - conflictResolver = (ConflictResolver) lookup( ConflictResolver.ROLE, roleHint ); a1 = createArtifact( "a", "1.0" ); diff --git a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java index edee9ca..7ee91a3 100644 --- a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java +++ b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java @@ -66,25 +66,6 @@ public abstract class AbstractCoreMavenComponentTestCase @Inject protected org.apache.maven.project.ProjectBuilder projectBuilder; - @Override - @Before - public void setUp() - throws Exception - { - super.setUp(); - getContainer(); - } - - @Override - protected synchronized void setupContainer() - { - super.setupContainer(); - - ( (DefaultPlexusContainer) getContainer() ).addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - } - - abstract protected String getProjectsDirectory(); protected File getProject( String name ) diff --git a/maven-core/src/test/java/org/apache/maven/MavenTest.java b/maven-core/src/test/java/org/apache/maven/MavenTest.java index 79841c9..4023f12 100644 --- a/maven-core/src/test/java/org/apache/maven/MavenTest.java +++ b/maven-core/src/test/java/org/apache/maven/MavenTest.java @@ -32,15 +32,6 @@ public class MavenTest @Inject private ExceptionHandler exceptionHandler; - @Override - protected synchronized void setupContainer() - { - super.setupContainer(); - - ( (DefaultPlexusContainer) getContainer() ).addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - } - protected String getProjectsDirectory() { return "src/test/projects/lifecycle-executor"; diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java index 02ac4dc..c9a2887 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java @@ -45,32 +45,6 @@ public class DefaultLifecyclesTest @Inject private DefaultLifecycles defaultLifeCycles; - @Override - protected void customizeContainerConfiguration( ContainerConfiguration configuration ) - { - super.customizeContainerConfiguration( configuration ); - configuration.setAutoWiring( true ); - configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - - @Override - @Before - public void setUp() - throws Exception - { - super.setUp(); - getContainer(); - } - - @Override - protected synchronized void setupContainer() - { - super.setupContainer(); - - ( (DefaultPlexusContainer) getContainer() ).addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - } - @Test public void testDefaultLifecycles() { diff --git a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java index d93c0f3..b2c1bd0 100644 --- a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java +++ b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java @@ -49,23 +49,6 @@ public abstract class AbstractMavenProjectTestCase @Inject protected RepositorySystem repositorySystem; - @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - - @Override - protected synchronized void setupContainer() - { - super.setupContainer(); - - ( (DefaultPlexusContainer) getContainer() ).addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - } - @Before public void setUp() throws Exception diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java index 0f02d80..09b5be5 100644 --- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -75,28 +75,11 @@ public class PomConstructionTest private File testDirectory; - @Override - protected synchronized void setupContainer() - { - super.setupContainer(); - - ( (DefaultPlexusContainer) getContainer() ).addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - } - - @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - @Before public void setUp() throws Exception { - getContainer(); + super.setUp(); testDirectory = new File( getBasedir(), BASE_POM_DIR ); new File( getBasedir(), BASE_MIXIN_DIR ); } diff --git a/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java b/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java index f79b596..1b92442 100644 --- a/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java @@ -37,32 +37,6 @@ public class MavenMetadataSourceTest @Inject private RepositorySystem repositorySystem; - @Override - protected synchronized void setupContainer() - { - super.setupContainer(); - - ( (DefaultPlexusContainer) getContainer() ).addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - } - - @Override - @Before - public void setUp() - throws Exception - { - super.setUp(); - getContainer(); - } - - @After - public void tearDown() - throws Exception - { - repositorySystem = null; - super.tearDown(); - } - @Test public void testShouldNotCarryExclusionsOverFromDependencyToDependency() throws Exception diff --git a/maven-core/src/test/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformationTest.java b/maven-core/src/test/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformationTest.java index 22dbe89..c86af5c 100644 --- a/maven-core/src/test/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformationTest.java +++ b/maven-core/src/test/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformationTest.java @@ -50,23 +50,6 @@ public class DefaultRuntimeInformationTest configuration.setClassPathScanning(PlexusConstants.SCANNING_INDEX); } - @Override - @Before - public void setUp() throws Exception - { - super.setUp(); - getContainer(); - } - - @Override - protected synchronized void setupContainer() - { - super.setupContainer(); - - ( (DefaultPlexusContainer) getContainer() ).addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - } - @Test public void testGetMavenVersion() { diff --git a/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java b/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java index ae61c63..82fbf93 100644 --- a/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java +++ b/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java @@ -65,29 +65,11 @@ public class PomConstructionWithSettingsTest private File testDirectory; - @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - - @Override - protected synchronized void setupContainer() - { - super.setupContainer(); - - ( (DefaultPlexusContainer) getContainer() ).addPlexusInjector( Collections.emptyList(), - binder -> binder.requestInjection( this ) ); - } - @Before public void setUp() throws Exception { super.setUp(); - getContainer(); testDirectory = new File( getBasedir(), BASE_POM_DIR ); } diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java index d872e16..54f4f4c 100644 --- a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java +++ b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java @@ -41,14 +41,6 @@ public abstract class AbstractRepositoryTestCase protected RepositorySystemSession session; - @Override - protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) - { - super.customizeContainerConfiguration( containerConfiguration ); - containerConfiguration.setAutoWiring( true ); - containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } - @Before @Override public void setUp() diff --git a/maven-test-support/src/main/java/org/apache/maven/test/PlexusTestCase.java b/maven-test-support/src/main/java/org/apache/maven/test/PlexusTestCase.java index 0187ce1..7f53fd1 100644 --- a/maven-test-support/src/main/java/org/apache/maven/test/PlexusTestCase.java +++ b/maven-test-support/src/main/java/org/apache/maven/test/PlexusTestCase.java @@ -37,10 +37,12 @@ package org.apache.maven.test; import java.io.File; import java.io.InputStream; +import java.util.Collections; import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.DefaultContainerConfiguration; import org.codehaus.plexus.DefaultPlexusContainer; +import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.PlexusContainerException; import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; @@ -73,6 +75,9 @@ public abstract class PlexusTestCase throws Exception { basedir = getBasedir(); + + ( (DefaultPlexusContainer) getContainer() ).addPlexusInjector( Collections.emptyList(), + binder -> binder.requestInjection( this ) ); } @SuppressWarnings( "ResultOfMethodCallIgnored" ) @@ -143,6 +148,8 @@ public abstract class PlexusTestCase */ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration ) { + containerConfiguration.setAutoWiring( true ); + containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); } protected void customizeContext( Context context )