This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new fdbcfb4e Clean up test teardown and temp directories (#518)
fdbcfb4e is described below
commit fdbcfb4e8d1aa91ab7310a52323043576a43311a
Author: Elliotte Rusty Harold <elh...@users.noreply.github.com>
AuthorDate: Fri Apr 18 21:05:40 2025 +0000
Clean up test teardown and temp directories (#518)
* Clean up test teardown and temp directories
* assertNotEquals
* avoid gc
---
.../dependency/AbstractDependencyMojoTestCase.java | 18 +++++++-----------
.../TestIncludeExcludeUnpackMojo.java | 9 +--------
.../TestIncludeExcludeUnpackDependenciesMojo.java | 9 +--------
.../fromDependencies/TestUnpackDependenciesMojo.java | 7 -------
.../fromDependencies/TestUnpackDependenciesMojo2.java | 17 +++++------------
5 files changed, 14 insertions(+), 46 deletions(-)
diff --git
a/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java
b/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java
index 6ac6ff22..9681f242 100644
---
a/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java
+++
b/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java
@@ -43,31 +43,27 @@ public abstract class AbstractDependencyMojoTestCase
extends AbstractMojoTestCas
protected DependencyArtifactStubFactory stubFactory;
- protected void setUp(String testDirStr, boolean createFiles) throws
Exception {
- setUp(testDirStr, createFiles, true);
+ protected void setUp(String testDirectoryName, boolean createFiles) throws
Exception {
+ setUp(testDirectoryName, createFiles, true);
}
- protected void setUp(String testDirStr, boolean createFiles, boolean
flattenedPath) throws Exception {
+ protected void setUp(String testDirectoryName, boolean createFiles,
boolean flattenedPath) throws Exception {
// required for mojo lookups to work
super.setUp();
- testDir = Files.createTempDirectory("testDirStr").toFile();
+ testDir = Files.createTempDirectory(testDirectoryName).toFile();
testDir.deleteOnExit();
stubFactory = new DependencyArtifactStubFactory(this.testDir,
createFiles, flattenedPath);
}
@Override
- protected void tearDown() {
+ protected void tearDown() throws Exception {
if (testDir != null) {
- try {
- FileUtils.deleteDirectory(testDir);
- } catch (IOException e) {
- e.printStackTrace();
- fail("Trying to remove directory: " + testDir +
System.lineSeparator() + e);
- }
+ FileUtils.deleteDirectory(testDir);
assertFalse(testDir.exists());
}
+ super.tearDown();
}
protected void copyArtifactFile(Artifact sourceArtifact, File destFile)
throws MojoExecutionException, IOException {
diff --git
a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
index c930cda2..e72e30a1 100644
---
a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
+++
b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
@@ -57,7 +57,7 @@ public class TestIncludeExcludeUnpackMojo extends
AbstractDependencyMojoTestCase
mojo = (UnpackMojo) lookupMojo("unpack", testPom);
mojo.setOutputDirectory(new File(this.testDir, "outputDirectory"));
- // i'm using one file repeatedly to archive so I can test the name
+ // I'm using one file repeatedly to archive so I can test the name
// programmatically.
stubFactory.setSrcFile(new File(getBasedir() + File.separatorChar +
PACKED_FILE_PATH));
Artifact artifact = stubFactory.createArtifact("test", "test", "1.0",
Artifact.SCOPE_COMPILE, "jar", null);
@@ -75,13 +75,6 @@ public class TestIncludeExcludeUnpackMojo extends
AbstractDependencyMojoTestCase
installLocalRepository(legacySupport);
}
- protected void tearDown() {
- super.tearDown();
-
- mojo = null;
- System.gc();
- }
-
public void assertMarkerFiles(Collection<ArtifactItem> items, boolean
exist) {
for (ArtifactItem item : items) {
assertMarkerFile(exist, item);
diff --git
a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestIncludeExcludeUnpackDependenciesMojo.java
b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestIncludeExcludeUnpackDependenciesMojo.java
index e59b042e..675e48e3 100644
---
a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestIncludeExcludeUnpackDependenciesMojo.java
+++
b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestIncludeExcludeUnpackDependenciesMojo.java
@@ -54,7 +54,7 @@ public class TestIncludeExcludeUnpackDependenciesMojo extends
AbstractDependency
// it needs to get the archivermanager
// stubFactory.setUnpackableFile( mojo.getArchiverManager() );
- // i'm using one file repeatedly to archive so I can test the name
+ // I'm using one file repeatedly to archive so I can test the name
// programmatically.
stubFactory.setSrcFile(new File(getBasedir() + File.separatorChar +
PACKED_FILE_PATH));
@@ -70,13 +70,6 @@ public class TestIncludeExcludeUnpackDependenciesMojo
extends AbstractDependency
mojo.markersDirectory = new File(this.testDir, "markers");
}
- protected void tearDown() {
- super.tearDown();
-
- mojo = null;
- System.gc();
- }
-
private void assertUnpacked(boolean unpacked, String fileName) {
File destFile = new File(mojo.getOutputDirectory().getAbsolutePath(),
fileName);
assertEquals(unpacked, destFile.exists());
diff --git
a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
index 1ad120f4..4f66e6d6 100644
---
a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
+++
b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
@@ -92,13 +92,6 @@ public class TestUnpackDependenciesMojo extends
AbstractDependencyMojoTestCase {
setVariableValueToObject(mojo, "artifactHandlerManager", manager);
}
- protected void tearDown() {
- super.tearDown();
-
- mojo = null;
- System.gc();
- }
-
public void assertUnpacked(Artifact artifact) {
assertUnpacked(true, artifact);
}
diff --git
a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java
b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java
index 85d85e11..8f576da4 100644
---
a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java
+++
b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java
@@ -34,6 +34,8 @@ import
org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
+import static org.junit.Assert.assertNotEquals;
+
public class TestUnpackDependenciesMojo2 extends
AbstractDependencyMojoTestCase {
private static final String UNPACKABLE_FILE = "test.txt";
@@ -74,13 +76,6 @@ public class TestUnpackDependenciesMojo2 extends
AbstractDependencyMojoTestCase
mojo.markersDirectory = new File(this.testDir, "markers");
}
- protected void tearDown() {
- super.tearDown();
-
- mojo = null;
- System.gc();
- }
-
public File getUnpackedFile(Artifact artifact) {
File destDir = DependencyUtil.getFormattedOutputDirectory(
mojo.isUseSubDirectoryPerScope(),
@@ -204,7 +199,7 @@ public class TestUnpackDependenciesMojo2 extends
AbstractDependencyMojoTestCase
assertEquals(time, unpackedFile.lastModified());
mojo.execute();
- System.gc();
+
// make sure it didn't overwrite
assertEquals(time, unpackedFile.lastModified());
@@ -212,9 +207,7 @@ public class TestUnpackDependenciesMojo2 extends
AbstractDependencyMojoTestCase
mojo.execute();
- assertTrue(time != unpackedFile.lastModified());
-
- System.gc();
+ assertNotEquals(time, unpackedFile.lastModified());
}
public void assertUnpacked(Artifact artifact, boolean overWrite)
@@ -234,7 +227,7 @@ public class TestUnpackDependenciesMojo2 extends
AbstractDependencyMojoTestCase
mojo.execute();
if (overWrite) {
- assertTrue(time != unpackedFile.lastModified());
+ assertNotEquals(time, unpackedFile.lastModified());
} else {
assertEquals(time, unpackedFile.lastModified());
}
