From 856465a8e6ecd0963933dd8a220b3370d12bbe0a Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 28 Jul 2024 08:06:59 -0400 Subject: [PATCH 1/2] More modern temporary file handling --- .../deploy/AbstractSiteDeployWebDavTest.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java b/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java index 3e952413..3fca3e6f 100644 --- a/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java +++ b/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java @@ -40,7 +40,9 @@ import org.apache.maven.settings.Settings; import org.codehaus.plexus.util.ReflectionUtils; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -51,15 +53,18 @@ @RunWith(JUnit4.class) public abstract class AbstractSiteDeployWebDavTest extends AbstractMojoTestCase { - File siteTargetPath = new File(getBasedir() + File.separator + "target" + File.separator + "siteTargetDeploy"); + @Rule + public TemporaryFolder folder = new TemporaryFolder(); + + private File siteTargetPath; @Override @Before public void setUp() throws Exception { super.setUp(); + siteTargetPath = new File(new File(folder.newFolder(), "target"), "siteTargetDeploy"); if (!siteTargetPath.exists()) { siteTargetPath.mkdirs(); - FileUtils.cleanDirectory(siteTargetPath); } } @@ -69,7 +74,6 @@ public void setUp() throws Exception { @Test public void noAuthzDavDeploy() throws Exception { - FileUtils.cleanDirectory(siteTargetPath); SimpleDavServerHandler simpleDavServerHandler = new SimpleDavServerHandler(siteTargetPath); try { @@ -104,8 +108,6 @@ public void noAuthzDavDeploy() throws Exception { @Test public void davDeployThruProxyWithoutAuthzInProxy() throws Exception { - - FileUtils.cleanDirectory(siteTargetPath); SimpleDavServerHandler simpleDavServerHandler = new SimpleDavServerHandler(siteTargetPath); try { File pluginXmlFile = getTestFile("src/test/resources/unit/deploy-dav/pom.xml"); @@ -151,10 +153,6 @@ public void davDeployThruProxyWithoutAuthzInProxy() throws Exception { @Test public void davDeployThruProxyWitAuthzInProxy() throws Exception { - - FileUtils.cleanDirectory(siteTargetPath); - // SimpleDavServerHandler simpleDavServerHandler = new SimpleDavServerHandler( siteTargetPath ); - Map authentications = new HashMap<>(); authentications.put("foo", "titi"); @@ -226,8 +224,8 @@ private void assertContentInFiles() throws Exception { File cssFile = new File(siteTargetPath, "site" + File.separator + "css" + File.separator + "maven-base.css"); assertTrue(cssFile.exists()); - fileContent = FileUtils.readFileToString(cssFile, StandardCharsets.UTF_8); - assertTrue(fileContent.contains("background-image: url(../images/collapsed.gif);")); + String cssContent = FileUtils.readFileToString(cssFile, StandardCharsets.UTF_8); + assertTrue(cssContent.contains("background-image: url(../images/collapsed.gif);")); } /** From bb2d6eb6c54f0987fe34eef6f6085cca43cbccae Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 28 Jul 2024 16:18:21 -0400 Subject: [PATCH 2/2] review --- .../plugins/site/deploy/AbstractSiteDeployWebDavTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java b/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java index 3fca3e6f..a245f79d 100644 --- a/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java +++ b/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java @@ -53,8 +53,9 @@ @RunWith(JUnit4.class) public abstract class AbstractSiteDeployWebDavTest extends AbstractMojoTestCase { + // Can use @TempDir with JUnit 5 @Rule - public TemporaryFolder folder = new TemporaryFolder(); + public TemporaryFolder directory = new TemporaryFolder(); private File siteTargetPath; @@ -62,7 +63,7 @@ public abstract class AbstractSiteDeployWebDavTest extends AbstractMojoTestCase @Before public void setUp() throws Exception { super.setUp(); - siteTargetPath = new File(new File(folder.newFolder(), "target"), "siteTargetDeploy"); + siteTargetPath = new File(directory.newFolder(), "target"); if (!siteTargetPath.exists()) { siteTargetPath.mkdirs(); }