From 1a8edec8a9d253a90fd83663a688c53fc624229c Mon Sep 17 00:00:00 2001 From: Andrzej Jarmoniuk Date: Sun, 28 Aug 2022 08:31:24 +0200 Subject: [PATCH] Making createMojo generic (was previously restricted to SetMojo) --- .../codehaus/mojo/versions/utils/BaseMojoTestCase.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/codehaus/mojo/versions/utils/BaseMojoTestCase.java b/src/test/java/org/codehaus/mojo/versions/utils/BaseMojoTestCase.java index 5900ff12c0..c9ed9c714f 100644 --- a/src/test/java/org/codehaus/mojo/versions/utils/BaseMojoTestCase.java +++ b/src/test/java/org/codehaus/mojo/versions/utils/BaseMojoTestCase.java @@ -7,9 +7,9 @@ import org.apache.maven.model.Build; import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; +import org.apache.maven.plugin.Mojo; import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.apache.maven.plugin.testing.stubs.MavenProjectStub; -import org.codehaus.mojo.versions.SetMojo; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -58,11 +58,11 @@ public abstract class BaseMojoTestCase extends AbstractMojoTestCase * @return a Mojo instance * @throws Exception thrown if mojo lookup fails */ - protected SetMojo createMojo( String goal, String pomFilePath ) throws Exception + protected T createMojo( String goal, String pomFilePath ) throws Exception { File pomFile = new File( pomFilePath ); - SetMojo mojo = (SetMojo) lookupMojo( goal, pomFile ); - mojo.setProject( new TestProjectStub( pomFile ) ); + T mojo = (T) lookupMojo( goal, pomFile ); + setVariableValueToObject( mojo, "project", new TestProjectStub( pomFile ) ); return mojo; }