svn commit: r1704741 - /tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java

[ma...@apache.org]

Author: markt
Date: Tue Sep 22 22:05:12 2015
New Revision: 1704741

URL: http://svn.apache.org/viewvc?rev=1704741&view=rev
Log:
Switch all the mounted DirResource based tests to use a dedicated temporary directory

Modified:
    tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java

Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java?rev=1704741&r1=1704740&r2=1704741&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java Tue Sep 22 22:05:12 2015
@@ -17,12 +17,37 @@
 package org.apache.catalina.webresources;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileAttribute;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 
 import org.apache.catalina.WebResourceRoot;
 import org.apache.catalina.WebResourceSet;
+import org.apache.catalina.startup.ExpandWar;
+import org.apache.catalina.startup.TomcatBaseTest;
 
 public class TestDirResourceSetMount extends AbstractTestResourceSetMount {
 
+    private static Path tempDir;
+    private static File dir1;
+
+    @BeforeClass
+    public static void before() throws IOException {
+        tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
+        dir1 = new File(tempDir.toFile(), "dir1");
+        TomcatBaseTest.recurrsiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath());
+    }
+
+    @AfterClass
+    public static void after() {
+        ExpandWar.delete(tempDir.toFile());
+    }
+
+
     @Override
     public WebResourceRoot getWebResourceRoot() {
         TesterWebResourceRoot root = new TesterWebResourceRoot();
@@ -40,6 +65,6 @@ public class TestDirResourceSetMount ext
 
     @Override
     public File getBaseDir() {
-        return new File("test/webresources/dir1");
+        return dir1;
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org