You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/09/22 21:27:12 UTC
svn commit: r1704702 - in /tomcat/trunk/test/org/apache/catalina/startup:
TestHostConfigAutomaticDeployment.java TomcatBaseTest.java
Author: markt
Date: Tue Sep 22 19:27:10 2015
New Revision: 1704702
URL: http://svn.apache.org/viewvc?rev=1704702&view=rev
Log:
Refactor to expose useful utility method to other tests
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java?rev=1704702&r1=1704701&r2=1704702&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java Tue Sep 22 19:27:10 2015
@@ -20,11 +20,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import java.nio.file.FileVisitResult;
-import java.nio.file.FileVisitor;
import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
import org.junit.Assert;
import org.junit.Test;
@@ -1755,44 +1751,6 @@ public class TestHostConfigAutomaticDepl
return xml;
}
- private static void recurrsiveCopy(final Path src, final Path dest)
- throws IOException {
-
- Files.walkFileTree(src, new FileVisitor<Path>() {
- @Override
- public FileVisitResult preVisitDirectory(Path dir,
- BasicFileAttributes attrs) throws IOException {
- Files.copy(dir, dest.resolve(src.relativize(dir)));
- return FileVisitResult.CONTINUE;
- }
-
- @Override
- public FileVisitResult visitFile(Path file,
- BasicFileAttributes attrs) throws IOException {
- Path destPath = dest.resolve(src.relativize(file));
- Files.copy(file, destPath);
- // Make sure that HostConfig thinks all newly copied files have
- // been modified.
- destPath.toFile().setLastModified(
- System.currentTimeMillis() - 2 * HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
- return FileVisitResult.CONTINUE;
- }
-
- @Override
- public FileVisitResult visitFileFailed(Path file, IOException ioe)
- throws IOException {
- throw ioe;
- }
-
- @Override
- public FileVisitResult postVisitDirectory(Path dir, IOException ioe)
- throws IOException {
- // NO-OP
- return FileVisitResult.CONTINUE;
- }});
- }
-
-
private static class StateTracker implements LifecycleListener {
private StringBuilder stateHistory = new StringBuilder();
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1704702&r1=1704701&r2=1704702&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Tue Sep 22 19:27:10 2015
@@ -25,6 +25,11 @@ import java.io.PrintWriter;
import java.net.HttpURLConnection;
import java.net.InetAddress;
import java.net.URL;
+import java.nio.file.FileVisitResult;
+import java.nio.file.FileVisitor;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
@@ -819,4 +824,42 @@ public abstract class TomcatBaseTest ext
super.start();
}
}
+
+
+ public static void recurrsiveCopy(final Path src, final Path dest)
+ throws IOException {
+
+ Files.walkFileTree(src, new FileVisitor<Path>() {
+ @Override
+ public FileVisitResult preVisitDirectory(Path dir,
+ BasicFileAttributes attrs) throws IOException {
+ Files.copy(dir, dest.resolve(src.relativize(dir)));
+ return FileVisitResult.CONTINUE;
+ }
+
+ @Override
+ public FileVisitResult visitFile(Path file,
+ BasicFileAttributes attrs) throws IOException {
+ Path destPath = dest.resolve(src.relativize(file));
+ Files.copy(file, destPath);
+ // Make sure that HostConfig thinks all newly copied files have
+ // been modified.
+ destPath.toFile().setLastModified(
+ System.currentTimeMillis() - 2 * HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
+ return FileVisitResult.CONTINUE;
+ }
+
+ @Override
+ public FileVisitResult visitFileFailed(Path file, IOException ioe)
+ throws IOException {
+ throw ioe;
+ }
+
+ @Override
+ public FileVisitResult postVisitDirectory(Path dir, IOException ioe)
+ throws IOException {
+ // NO-OP
+ return FileVisitResult.CONTINUE;
+ }});
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org