Skip to content

Commit c9e488b

Browse files
michael-oslawekjaranowski
michael-o
and
slawekjaranowski
authored
[MDEP-894] Use @Component only - fix tests (#360)
* Use @component only * Fix one test * Fix all Unit Tests * Add todo to remove with next parent --------- Co-authored-by: Slawomir Jaranowski <[email protected]>
1 parent 572cebb commit c9e488b

33 files changed

+162
-72
lines changed

‎pom.xml‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,22 +95,12 @@ under the License.
9595
<project.build.outputTimestamp>2023-10-20T21:21:50Z</project.build.outputTimestamp>
9696
<slf4j.version>1.7.36</slf4j.version>
9797
<plexus-archiver.version>4.9.2</plexus-archiver.version>
98+
<!-- TODO remove with next parent version -->
99+
<version.maven-plugin-tools>3.11.0</version.maven-plugin-tools>
98100
</properties>
99101

100102
<dependencyManagement>
101103
<dependencies>
102-
<!-- TODO check with Maven Api upgrade -->
103-
<!-- the same version as in Maven 3.1.1 -->
104-
<dependency>
105-
<groupId>org.eclipse.sisu</groupId>
106-
<artifactId>org.eclipse.sisu.inject</artifactId>
107-
<version>0.3.0.M1</version>
108-
</dependency>
109-
<dependency>
110-
<groupId>org.eclipse.sisu</groupId>
111-
<artifactId>org.eclipse.sisu.plexus</artifactId>
112-
<version>0.3.0.M1</version>
113-
</dependency>
114104
<!-- override the version from maven-reporting-impl -->
115105
<dependency>
116106
<groupId>org.apache.commons</groupId>
@@ -321,6 +311,12 @@ under the License.
321311
<artifactId>maven-plugin-testing-harness</artifactId>
322312
<version>${pluginTestingVersion}</version>
323313
<scope>test</scope>
314+
<exclusions>
315+
<exclusion>
316+
<groupId>org.codehaus.plexus</groupId>
317+
<artifactId>plexus-container-default</artifactId>
318+
</exclusion>
319+
</exclusions>
324320
</dependency>
325321
<dependency>
326322
<groupId>org.mockito</groupId>
@@ -414,7 +410,7 @@ under the License.
414410
<artifactId>maven-surefire-plugin</artifactId>
415411
<configuration>
416412
<!-- Need more heap space in order to run the unit tests !-->
417-
<argLine>-Xmx384m</argLine>
413+
<argLine>-Xmx512m</argLine>
418414
<systemPropertyVariables>
419415
<maven.home>${maven.home}</maven.home>
420416
</systemPropertyVariables>

‎src/test/java/org/apache/maven/plugins/dependency/TestCollectMojo.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
import java.util.Set;
2323

2424
import org.apache.maven.artifact.Artifact;
25+
import org.apache.maven.execution.MavenSession;
2526
import org.apache.maven.plugin.testing.SilentLog;
2627
import org.apache.maven.plugins.dependency.resolvers.CollectDependenciesMojo;
28+
import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
2729
import org.apache.maven.plugins.dependency.utils.DependencyStatusSets;
2830
import org.apache.maven.project.MavenProject;
2931

@@ -32,6 +34,11 @@ public class TestCollectMojo extends AbstractDependencyMojoTestCase {
3234
protected void setUp() throws Exception {
3335
// required for mojo lookups to work
3436
super.setUp("markers", false);
37+
MavenProject project = new DependencyProjectStub();
38+
getContainer().addComponent(project, MavenProject.class.getName());
39+
40+
MavenSession session = newMavenSession(project);
41+
getContainer().addComponent(session, MavenSession.class.getName());
3542
}
3643

3744
/**

‎src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
import org.apache.maven.execution.MavenSession;
3131
import org.apache.maven.plugin.LegacySupport;
3232
import org.apache.maven.plugin.MojoFailureException;
33-
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
33+
import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
34+
import org.apache.maven.project.MavenProject;
3435
import org.apache.maven.settings.Server;
3536
import org.apache.maven.settings.Settings;
3637
import org.eclipse.jetty.security.ConstraintMapping;
@@ -49,21 +50,25 @@ public class TestGetMojo extends AbstractDependencyMojoTestCase {
4950
protected void setUp() throws Exception {
5051
// required for mojo lookups to work
5152
super.setUp("markers", false);
53+
MavenProject project = new DependencyProjectStub();
54+
getContainer().addComponent(project, MavenProject.class.getName());
55+
56+
MavenSession session = newMavenSession(project);
57+
getContainer().addComponent(session, MavenSession.class.getName());
5258

5359
File testPom = new File(getBasedir(), "target/test-classes/unit/get-test/plugin-config.xml");
5460
mojo = (GetMojo) lookupMojo("get", testPom);
5561

5662
assertNotNull(mojo);
5763

5864
LegacySupport legacySupport = lookup(LegacySupport.class);
59-
MavenSession mavenSession = newMavenSession(new MavenProjectStub());
60-
Settings settings = mavenSession.getSettings();
65+
Settings settings = session.getSettings();
6166
Server server = new Server();
6267
server.setId("myserver");
6368
server.setUsername("foo");
6469
server.setPassword("bar");
6570
settings.addServer(server);
66-
legacySupport.setSession(mavenSession);
71+
legacySupport.setSession(session);
6772

6873
installLocalRepository(legacySupport);
6974

‎src/test/java/org/apache/maven/plugins/dependency/TestListClassesMojo.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
import org.apache.maven.execution.MavenSession;
2828
import org.apache.maven.plugin.LegacySupport;
2929
import org.apache.maven.plugin.logging.Log;
30-
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
30+
import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
31+
import org.apache.maven.project.MavenProject;
3132
import org.apache.maven.settings.Server;
3233
import org.apache.maven.settings.Settings;
3334
import org.junit.Assert;
@@ -39,6 +40,13 @@ public class TestListClassesMojo extends AbstractDependencyMojoTestCase {
3940

4041
protected void setUp() throws Exception {
4142
super.setUp("markers", false);
43+
44+
MavenProject project = new DependencyProjectStub();
45+
getContainer().addComponent(project, MavenProject.class.getName());
46+
47+
MavenSession session = newMavenSession(project);
48+
getContainer().addComponent(session, MavenSession.class.getName());
49+
4250
File testPom = new File(getBasedir(), "target/test-classes/unit/get-test/plugin-config.xml");
4351

4452
assertTrue(testPom.exists());
@@ -47,7 +55,6 @@ protected void setUp() throws Exception {
4755
assertNotNull(mojo);
4856

4957
LegacySupport legacySupport = lookup(LegacySupport.class);
50-
MavenSession session = newMavenSession(new MavenProjectStub());
5158
Settings settings = session.getSettings();
5259
Server server = new Server();
5360
server.setId("myserver");
@@ -57,8 +64,6 @@ protected void setUp() throws Exception {
5764
legacySupport.setSession(session);
5865

5966
installLocalRepository(legacySupport);
60-
61-
setVariableValueToObject(mojo, "session", legacySupport.getSession());
6267
}
6368

6469
public void testListClassesNotTransitive() throws Exception {

‎src/test/java/org/apache/maven/plugins/dependency/TestPropertiesMojo.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,20 @@
2222
import java.util.Set;
2323

2424
import org.apache.maven.artifact.Artifact;
25+
import org.apache.maven.execution.MavenSession;
26+
import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
2527
import org.apache.maven.project.MavenProject;
2628

2729
public class TestPropertiesMojo extends AbstractDependencyMojoTestCase {
2830
protected void setUp() throws Exception {
2931
// required for mojo lookups to work
3032
super.setUp("markers", true);
33+
34+
MavenProject project = new DependencyProjectStub();
35+
getContainer().addComponent(project, MavenProject.class.getName());
36+
37+
MavenSession session = newMavenSession(project);
38+
getContainer().addComponent(session, MavenSession.class.getName());
3139
}
3240

3341
/**

‎src/test/java/org/apache/maven/plugins/dependency/TestSkip.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,29 @@
2020

2121
import java.io.File;
2222

23+
import org.apache.maven.execution.MavenSession;
2324
import org.apache.maven.plugin.Mojo;
2425
import org.apache.maven.plugin.logging.Log;
26+
import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
27+
import org.apache.maven.project.MavenProject;
2528
import org.mockito.ArgumentCaptor;
2629

2730
import static org.mockito.Mockito.atLeastOnce;
2831
import static org.mockito.Mockito.mock;
2932
import static org.mockito.Mockito.verify;
3033

3134
public class TestSkip extends AbstractDependencyMojoTestCase {
35+
36+
@Override
37+
protected void setUp() throws Exception {
38+
super.setUp();
39+
MavenProject project = new DependencyProjectStub();
40+
getContainer().addComponent(project, MavenProject.class.getName());
41+
42+
MavenSession session = newMavenSession(project);
43+
getContainer().addComponent(session, MavenSession.class.getName());
44+
}
45+
3246
public void testSkipAnalyze() throws Exception {
3347
doTest("analyze");
3448
}

‎src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDuplicateMojo.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,25 @@
2222
import java.io.PrintWriter;
2323
import java.io.StringWriter;
2424

25+
import org.apache.maven.execution.MavenSession;
2526
import org.apache.maven.plugin.logging.Log;
2627
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
28+
import org.apache.maven.plugins.dependency.testUtils.stubs.DuplicateDependencies2ProjectStub;
29+
import org.apache.maven.plugins.dependency.testUtils.stubs.DuplicateDependenciesProjectStub;
30+
import org.apache.maven.project.MavenProject;
2731

2832
/**
2933
* @author <a href="mailto:[email protected]">Vincent Siveton</a>
3034
* @version $Id$
3135
*/
3236
public class TestAnalyzeDuplicateMojo extends AbstractDependencyMojoTestCase {
3337
public void testDuplicate() throws Exception {
38+
MavenProject project = new DuplicateDependenciesProjectStub();
39+
getContainer().addComponent(project, MavenProject.class.getName());
40+
41+
MavenSession session = newMavenSession(project);
42+
getContainer().addComponent(session, MavenSession.class.getName());
43+
3444
File testPom = new File(getBasedir(), "target/test-classes/unit/duplicate-dependencies/plugin-config.xml");
3545
AnalyzeDuplicateMojo mojo = (AnalyzeDuplicateMojo) lookupMojo("analyze-duplicate", testPom);
3646
assertNotNull(mojo);
@@ -44,6 +54,12 @@ public void testDuplicate() throws Exception {
4454
}
4555

4656
public void testDuplicate2() throws Exception {
57+
MavenProject project = new DuplicateDependencies2ProjectStub();
58+
getContainer().addComponent(project, MavenProject.class.getName());
59+
60+
MavenSession session = newMavenSession(project);
61+
getContainer().addComponent(session, MavenSession.class.getName());
62+
4763
File testPom = new File(getBasedir(), "target/test-classes/unit/duplicate-dependencies/plugin-config2.xml");
4864
AnalyzeDuplicateMojo mojo = (AnalyzeDuplicateMojo) lookupMojo("analyze-duplicate", testPom);
4965
assertNotNull(mojo);

‎src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.apache.maven.plugin.LegacySupport;
3232
import org.apache.maven.plugin.MojoExecutionException;
3333
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
34+
import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
3435
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
3536
import org.apache.maven.project.MavenProject;
3637

@@ -39,6 +40,11 @@ public class TestCopyMojo extends AbstractDependencyMojoTestCase {
3940

4041
protected void setUp() throws Exception {
4142
super.setUp("copy", false, false);
43+
MavenProject project = new DependencyProjectStub();
44+
getContainer().addComponent(project, MavenProject.class.getName());
45+
46+
MavenSession session = newMavenSession(project);
47+
getContainer().addComponent(session, MavenSession.class.getName());
4248

4349
File testPom = new File(getBasedir(), "target/test-classes/unit/copy-test/plugin-config.xml");
4450
mojo = (CopyMojo) lookupMojo("copy", testPom);
@@ -48,9 +54,6 @@ protected void setUp() throws Exception {
4854
assertNotNull(mojo);
4955
assertNotNull(mojo.getProject());
5056

51-
MavenSession session = newMavenSession(mojo.getProject());
52-
setVariableValueToObject(mojo, "session", session);
53-
5457
LegacySupport legacySupport = lookup(LegacySupport.class);
5558
legacySupport.setSession(session);
5659
installLocalRepository(legacySupport);

‎src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
import org.apache.maven.plugin.LegacySupport;
2929
import org.apache.maven.plugin.MojoExecutionException;
3030
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
31+
import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
3132
import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
33+
import org.apache.maven.project.MavenProject;
3234

3335
public class TestIncludeExcludeUnpackMojo extends AbstractDependencyMojoTestCase {
3436
private final String PACKED_FILE = "test.zip";
@@ -45,6 +47,12 @@ protected void setUp() throws Exception {
4547
// required for mojo lookups to work
4648
super.setUp("unpack", true, false);
4749

50+
MavenProject project = new DependencyProjectStub();
51+
getContainer().addComponent(project, MavenProject.class.getName());
52+
53+
MavenSession session = newMavenSession(project);
54+
getContainer().addComponent(session, MavenSession.class.getName());
55+
4856
File testPom = new File(getBasedir(), "target/test-classes/unit/unpack-test/plugin-config.xml");
4957
mojo = (UnpackMojo) lookupMojo("unpack", testPom);
5058
mojo.setOutputDirectory(new File(this.testDir, "outputDirectory"));
@@ -63,9 +71,6 @@ protected void setUp() throws Exception {
6371
mojo.setMarkersDirectory(new File(this.testDir, "markers"));
6472
mojo.setArtifactItems(list);
6573

66-
MavenSession session = newMavenSession(mojo.getProject());
67-
setVariableValueToObject(mojo, "session", session);
68-
6974
LegacySupport legacySupport = lookup(LegacySupport.class);
7075
legacySupport.setSession(session);
7176
installLocalRepository(legacySupport);

‎src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.apache.maven.plugin.MojoExecutionException;
3535
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
3636
import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
37+
import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
3738
import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
3839
import org.apache.maven.project.MavenProject;
3940
import org.codehaus.plexus.archiver.manager.ArchiverManager;
@@ -45,6 +46,12 @@ public class TestUnpackMojo extends AbstractDependencyMojoTestCase {
4546
protected void setUp() throws Exception {
4647
super.setUp("unpack", true, false);
4748

49+
MavenProject project = new DependencyProjectStub();
50+
getContainer().addComponent(project, MavenProject.class.getName());
51+
52+
MavenSession session = newMavenSession(project);
53+
getContainer().addComponent(session, MavenSession.class.getName());
54+
4855
File testPom = new File(getBasedir(), "target/test-classes/unit/unpack-test/plugin-config.xml");
4956
mojo = (UnpackMojo) lookupMojo("unpack", testPom);
5057
mojo.setOutputDirectory(new File(this.testDir, "outputDirectory"));
@@ -62,9 +69,6 @@ protected void setUp() throws Exception {
6269
stubFactory.setSrcFile(new File(
6370
getBasedir() + File.separatorChar + "target/test-classes/unit/unpack-dependencies-test/test.txt"));
6471

65-
MavenSession session = newMavenSession(mojo.getProject());
66-
setVariableValueToObject(mojo, "session", session);
67-
6872
LegacySupport legacySupport = lookup(LegacySupport.class);
6973

7074
legacySupport.setSession(session);

0 commit comments

Comments
 (0)