Author: markt Date: Mon Apr 18 14:14:52 2016 New Revision: 1739763 URL: http://svn.apache.org/viewvc?rev=1739763&view=rev Log: Fix likely cause of occasional unit test failures. Defensive copy was being taken of wrong location.
Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java Propchange: tomcat/tc8.5.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 18 14:14:52 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726 +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762 Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java?rev=1739763&r1=1739762&r2=1739763&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java Mon Apr 18 14:14:52 2016 @@ -31,7 +31,7 @@ public abstract class AbstractTestFileRe this.readOnly = readOnly; } - protected abstract String getDir1(); + protected abstract File getDir2(); @Override public WebResourceRoot getWebResourceRoot() { @@ -41,22 +41,22 @@ public abstract class AbstractTestFileRe root.setMainResources(webResourceSet); WebResourceSet f1 = new FileResourceSet(root, "/f1.txt", - getDir1() + "/f1.txt", "/"); + "test/webresources/dir1/f1.txt", "/"); f1.setReadOnly(readOnly); root.addPreResources(f1); WebResourceSet f2 = new FileResourceSet(root, "/f2.txt", - getDir1() + "/f2.txt", "/"); + "test/webresources/dir1/f2.txt", "/"); f2.setReadOnly(readOnly); root.addPreResources(f2); WebResourceSet d1f1 = new FileResourceSet(root, "/d1/d1-f1.txt", - getDir1() + "/d1/d1-f1.txt", "/"); + "test/webresources/dir1/d1/d1-f1.txt", "/"); d1f1.setReadOnly(readOnly); root.addPreResources(d1f1); WebResourceSet d2f1 = new FileResourceSet(root, "/d2/d2-f1.txt", - getDir1() + "/d2/d2-f1.txt", "/"); + "test/webresources/dir1/d2/d2-f1.txt", "/"); d2f1.setReadOnly(readOnly); root.addPreResources(d2f1); @@ -70,7 +70,7 @@ public abstract class AbstractTestFileRe @Override public File getBaseDir() { - return new File("test/webresources/dir2"); + return getDir2(); } @Override Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java?rev=1739763&r1=1739762&r2=1739763&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java Mon Apr 18 14:14:52 2016 @@ -31,13 +31,13 @@ import org.apache.catalina.startup.Tomca public class TestFileResourceSet extends AbstractTestFileResourceSet { private static Path tempDir; - private static File dir1; + private static File dir2; @BeforeClass public static void before() throws IOException { tempDir = Files.createTempDirectory("test", new FileAttribute[0]); - dir1 = new File(tempDir.toFile(), "dir1"); - TomcatBaseTest.recursiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath()); + dir2 = new File(tempDir.toFile(), "dir2"); + TomcatBaseTest.recursiveCopy(new File("test/webresources/dir2").toPath(), dir2.toPath()); } @AfterClass @@ -51,8 +51,8 @@ public class TestFileResourceSet extends } @Override - protected String getDir1() { - return dir1.getAbsolutePath(); + protected File getDir2() { + return dir2; } @Override Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java?rev=1739763&r1=1739762&r2=1739763&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java Mon Apr 18 14:14:52 2016 @@ -31,13 +31,13 @@ import org.apache.catalina.startup.Tomca public class TestFileResourceSetReadOnly extends AbstractTestFileResourceSet { private static Path tempDir; - private static File dir1; + private static File dir2; @BeforeClass public static void before() throws IOException { tempDir = Files.createTempDirectory("test", new FileAttribute[0]); - dir1 = new File(tempDir.toFile(), "dir1"); - TomcatBaseTest.recursiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath()); + dir2 = new File(tempDir.toFile(), "dir2"); + TomcatBaseTest.recursiveCopy(new File("test/webresources/dir2").toPath(), dir2.toPath()); } @AfterClass @@ -51,8 +51,8 @@ public class TestFileResourceSetReadOnly } @Override - protected String getDir1() { - return dir1.getAbsolutePath(); + protected File getDir2() { + return dir2; } @Override Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java?rev=1739763&r1=1739762&r2=1739763&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java Mon Apr 18 14:14:52 2016 @@ -30,18 +30,18 @@ import org.apache.catalina.startup.Tomca /** * Mounts file resources in sub directories that do not exist in the main - * resoucres. + * resources. */ public class TestFileResourceSetVirtual extends TestFileResourceSet { private static Path tempDir; - private static File dir1; + private static File dir2; @BeforeClass public static void before() throws IOException { tempDir = Files.createTempDirectory("test", new FileAttribute[0]); - dir1 = new File(tempDir.toFile(), "dir1"); - TomcatBaseTest.recursiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath()); + dir2 = new File(tempDir.toFile(), "dir2"); + TomcatBaseTest.recursiveCopy(new File("test/webresources/dir2").toPath(), dir2.toPath()); } @AfterClass @@ -56,8 +56,8 @@ public class TestFileResourceSetVirtual } @Override - protected String getDir1() { - return dir1.getAbsolutePath(); + protected File getDir2() { + return dir2; } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org