[MCLEAN-122] Cleanup declared dependencies, simplify unit test

apache · Jun 16, 2024 · 0da13b2 · 0da13b2
1 parent 567be96
commit 0da13b2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 56 deletions.
diff --git a/pom.xml b/pom.xml
@@ -114,29 +114,11 @@ under the License.
       <version>1.3.0</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.sisu</groupId>
-      <artifactId>org.eclipse.sisu.plexus</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <version>4.2.3</version>
-      <classifier>no_aop</classifier>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-xml</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-resolver-provider</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <profiles>

diff --git a/src/test/java/org/apache/maven/plugins/clean/CleanMojoTest.java b/src/test/java/org/apache/maven/plugins/clean/CleanMojoTest.java
@@ -29,20 +29,10 @@
 import java.nio.file.Paths;
 import java.util.Collections;
 
-import com.google.inject.Provides;
-import com.google.inject.Singleton;
-import org.apache.maven.execution.DefaultMavenExecutionRequest;
-import org.apache.maven.execution.DefaultMavenExecutionResult;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionResult;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.logging.SystemStreamLog;
 import org.apache.maven.plugin.testing.junit5.InjectMojo;
 import org.apache.maven.plugin.testing.junit5.MojoTest;
-import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
-import org.codehaus.plexus.PlexusContainer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.EnabledOnOs;
@@ -63,15 +53,15 @@
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  */
 @MojoTest
-public class CleanMojoTest {
+class CleanMojoTest {
     /**
      * Tests the simple removal of directories
      *
      * @throws Exception in case of an error.
      */
     @Test
     @InjectMojo(goal = "clean", pom = "classpath:/unit/basic-clean-test/plugin-pom.xml")
-    public void testBasicClean(CleanMojo mojo) throws Exception {
+    void testBasicClean(CleanMojo mojo) throws Exception {
         mojo.execute();
 
         assertFalse(
@@ -92,7 +82,7 @@ public void testBasicClean(CleanMojo mojo) throws Exception {
      */
     @Test
     @InjectMojo(goal = "clean", pom = "classpath:/unit/nested-clean-test/plugin-pom.xml")
-    public void testCleanNestedStructure(CleanMojo mojo) throws Exception {
+    void testCleanNestedStructure(CleanMojo mojo) throws Exception {
         mojo.execute();
 
         assertFalse(checkExists(getBasedir() + "/target/test-classes/unit/nested-clean-test/target"));
@@ -108,7 +98,7 @@ public void testCleanNestedStructure(CleanMojo mojo) throws Exception {
      */
     @Test
     @InjectMojo(goal = "clean", pom = "classpath:/unit/empty-clean-test/plugin-pom.xml")
-    public void testCleanEmptyDirectories(CleanMojo mojo) throws Exception {
+    void testCleanEmptyDirectories(CleanMojo mojo) throws Exception {
         mojo.execute();
 
         assertTrue(checkExists(getBasedir() + "/target/test-classes/unit/empty-clean-test/testDirectoryStructure"));
@@ -127,7 +117,7 @@ public void testCleanEmptyDirectories(CleanMojo mojo) throws Exception {
      */
     @Test
     @InjectMojo(goal = "clean", pom = "classpath:/unit/fileset-clean-test/plugin-pom.xml")
-    public void testFilesetsClean(CleanMojo mojo) throws Exception {
+    void testFilesetsClean(CleanMojo mojo) throws Exception {
         mojo.execute();
 
         // fileset 1
@@ -154,7 +144,7 @@ public void testFilesetsClean(CleanMojo mojo) throws Exception {
      */
     @Test
     @InjectMojo(goal = "clean", pom = "classpath:/unit/invalid-directory-test/plugin-pom.xml")
-    public void testCleanInvalidDirectory(CleanMojo mojo) throws Exception {
+    void testCleanInvalidDirectory(CleanMojo mojo) throws Exception {
         assertThrows(MojoExecutionException.class, mojo::execute);
     }
 
@@ -165,7 +155,7 @@ public void testCleanInvalidDirectory(CleanMojo mojo) throws Exception {
      */
     @Test
     @InjectMojo(goal = "clean", pom = "classpath:/unit/missing-directory-test/plugin-pom.xml")
-    public void testMissingDirectory(CleanMojo mojo) throws Exception {
+    void testMissingDirectory(CleanMojo mojo) throws Exception {
         mojo.execute();
 
         assertFalse(checkExists(getBasedir() + "/target/test-classes/unit/missing-directory-test/does-not-exist"));
@@ -182,7 +172,7 @@ public void testMissingDirectory(CleanMojo mojo) throws Exception {
     @Test
     @EnabledOnOs(OS.WINDOWS)
     @InjectMojo(goal = "clean", pom = "classpath:/unit/locked-file-test/plugin-pom.xml")
-    public void testCleanLockedFile(CleanMojo mojo) throws Exception {
+    void testCleanLockedFile(CleanMojo mojo) throws Exception {
         File f = new File(getBasedir(), "target/test-classes/unit/locked-file-test/buildDirectory/file.txt");
         try (FileChannel channel = new RandomAccessFile(f, "rw").getChannel();
                 FileLock ignored = channel.lock()) {
@@ -204,7 +194,7 @@ public void testCleanLockedFile(CleanMojo mojo) throws Exception {
     @Test
     @EnabledOnOs(OS.WINDOWS)
     @InjectMojo(goal = "clean", pom = "classpath:/unit/locked-file-test/plugin-pom.xml")
-    public void testCleanLockedFileWithNoError(CleanMojo mojo) throws Exception {
+    void testCleanLockedFileWithNoError(CleanMojo mojo) throws Exception {
         setVariableValueToObject(mojo, "failOnError", Boolean.FALSE);
         assertNotNull(mojo);
 
@@ -225,7 +215,7 @@ public void testCleanLockedFileWithNoError(CleanMojo mojo) throws Exception {
      */
     @Test
     @EnabledOnOs(OS.WINDOWS)
-    public void testFollowLinksWithWindowsJunction() throws Exception {
+    void testFollowLinksWithWindowsJunction() throws Exception {
         testSymlink((link, target) -> {
             Process process = new ProcessBuilder()
                     .directory(link.getParent().toFile())
@@ -248,7 +238,7 @@ public void testFollowLinksWithWindowsJunction() throws Exception {
      */
     @Test
     @DisabledOnOs(OS.WINDOWS)
-    public void testFollowLinksWithSymLinkOnPosix() throws Exception {
+    void testFollowLinksWithSymLinkOnPosix() throws Exception {
         testSymlink((link, target) -> {
             try {
                 Files.createSymbolicLink(link, target);
@@ -294,23 +284,6 @@ private void testSymlink(LinkCreator linkCreator) throws Exception {
         assertFalse(Files.exists(dirWithLnk));
     }
 
-    @Provides
-    @Singleton
-    @SuppressWarnings("unused")
-    private MavenSession createSession(PlexusContainer container) {
-        MavenExecutionRequest request = new DefaultMavenExecutionRequest();
-        MavenExecutionResult result = new DefaultMavenExecutionResult();
-        MavenSession session = new MavenSession(container, MavenRepositorySystemUtils.newSession(), request, result);
-        return session;
-    }
-
-    @Provides
-    @Singleton
-    @SuppressWarnings("unused")
-    private MojoExecution createMojoExecution() {
-        return new MojoExecution(null);
-    }
-
     /**
      * @param dir a dir or a file
      * @return true if a file/dir exists, false otherwise