You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2024/12/06 16:27:34 UTC
(maven-invoker-plugin) 01/01: Make utility class static
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch util
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
commit 0850b21d2c7338c7428a44413290dc2ff120354d
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Fri Dec 6 11:27:26 2024 -0500
Make utility class static
---
.../apache/maven/plugins/invoker/InterpolationTest.java | 16 ++++++++--------
.../apache/maven/plugins/invoker/InvokerMojoTest.java | 4 +++-
.../invoker/{AbstractTestUtil.java => TestUtil.java} | 10 ++++++----
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugins/invoker/InterpolationTest.java b/src/test/java/org/apache/maven/plugins/invoker/InterpolationTest.java
index 8385011..dd45ae7 100644
--- a/src/test/java/org/apache/maven/plugins/invoker/InterpolationTest.java
+++ b/src/test/java/org/apache/maven/plugins/invoker/InterpolationTest.java
@@ -37,14 +37,14 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Olivier Lamy
* @since 22 nov. 07
*/
-class InterpolationTest extends AbstractTestUtil {
+class InterpolationTest {
private MavenProject buildMavenProjectStub() {
MavenProject project = new MavenProject();
project.setVersion("1.0-SNAPSHOT");
project.setArtifactId("foo");
project.setGroupId("bar");
- project.setFile(new File(getBasedir(), "pom.xml"));
+ project.setFile(new File(TestUtil.getBasedir(), "pom.xml"));
Properties properties = new Properties();
properties.put("fooOnProject", "barOnProject");
project.getModel().setProperties(properties);
@@ -72,16 +72,16 @@ class InterpolationTest extends AbstractTestUtil {
void testPomInterpolation() throws Exception {
File interpolatedPomFile;
InvokerMojo invokerMojo = new InvokerMojo();
- setVariableValueToObject(invokerMojo, "project", buildMavenProjectStub());
- setVariableValueToObject(invokerMojo, "settings", new Settings());
+ TestUtil.setVariableValueToObject(invokerMojo, "project", buildMavenProjectStub());
+ TestUtil.setVariableValueToObject(invokerMojo, "settings", new Settings());
Properties properties = new Properties();
properties.put("foo", "bar");
properties.put("version", "2.0-SNAPSHOT");
- setVariableValueToObject(invokerMojo, "filterProperties", properties);
- String dirPath = getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar
- + "resources" + File.separatorChar + "unit" + File.separatorChar + "interpolation";
+ TestUtil.setVariableValueToObject(invokerMojo, "filterProperties", properties);
+ String dirPath = TestUtil.getBasedir() + File.separatorChar + "src" + File.separatorChar + "test"
+ + File.separatorChar + "resources" + File.separatorChar + "unit" + File.separatorChar + "interpolation";
- interpolatedPomFile = new File(getBasedir(), "target/interpolated-pom.xml");
+ interpolatedPomFile = new File(TestUtil.getBasedir(), "target/interpolated-pom.xml");
invokerMojo.buildInterpolatedFile(new File(dirPath, "pom.xml"), interpolatedPomFile);
try (Reader reader = new XmlStreamReader(interpolatedPomFile)) {
String content = IOUtil.toString(reader);
diff --git a/src/test/java/org/apache/maven/plugins/invoker/InvokerMojoTest.java b/src/test/java/org/apache/maven/plugins/invoker/InvokerMojoTest.java
index fd60322..b8b8f33 100644
--- a/src/test/java/org/apache/maven/plugins/invoker/InvokerMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/invoker/InvokerMojoTest.java
@@ -27,13 +27,15 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.junit.jupiter.api.Test;
+import static org.apache.maven.plugins.invoker.TestUtil.getBasedir;
+import static org.apache.maven.plugins.invoker.TestUtil.setVariableValueToObject;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Olivier Lamy
* @since 18 nov. 07
*/
-class InvokerMojoTest extends AbstractTestUtil {
+class InvokerMojoTest {
private static final String DUMMY_PROJECT = "dummy" + File.separator + "pom.xml";
private static final String WITH_POM_DIR_PROJECT = "with-pom-project-dir" + File.separator + "pom.xml";
diff --git a/src/test/java/org/apache/maven/plugins/invoker/AbstractTestUtil.java b/src/test/java/org/apache/maven/plugins/invoker/TestUtil.java
similarity index 80%
rename from src/test/java/org/apache/maven/plugins/invoker/AbstractTestUtil.java
rename to src/test/java/org/apache/maven/plugins/invoker/TestUtil.java
index 2a2f791..452b8ba 100644
--- a/src/test/java/org/apache/maven/plugins/invoker/AbstractTestUtil.java
+++ b/src/test/java/org/apache/maven/plugins/invoker/TestUtil.java
@@ -22,14 +22,16 @@ import java.io.File;
import org.codehaus.plexus.util.ReflectionUtils;
-abstract class AbstractTestUtil {
+class TestUtil {
- protected String getBasedir() {
+ private TestUtil() {}
+
+ static String getBasedir() {
String path = System.getProperty("basedir");
return path != null ? path : new File("").getAbsolutePath();
}
- protected void setVariableValueToObject(Object object, String filed, Object value) throws IllegalAccessException {
- ReflectionUtils.setVariableValueInObject(object, filed, value);
+ static void setVariableValueToObject(Object object, String field, Object value) throws IllegalAccessException {
+ ReflectionUtils.setVariableValueInObject(object, field, value);
}
}