Author: markt Date: Mon Apr 18 10:07:02 2016 New Revision: 1739726 URL: http://svn.apache.org/viewvc?rev=1739726&view=rev Log: Use unique file names for each test in an effort to identify where the conflict is that triggers occasional CI failures.
Modified: tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java Modified: tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java?rev=1739726&r1=1739725&r2=1739726&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java (original) +++ tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java Mon Apr 18 10:07:02 2016 @@ -382,17 +382,20 @@ public abstract class AbstractTestResour @Test public final void testMkdirNew() { + String newDirName = getNewDirName(); if (isWriteable()) { - Assert.assertTrue(resourceRoot.mkdir(getMount() + "/new-test")); + Assert.assertTrue(resourceRoot.mkdir(getMount() + "/" + newDirName)); - File file = new File(getBaseDir(), "new-test"); + File file = new File(getBaseDir(), newDirName); Assert.assertTrue(file.isDirectory()); Assert.assertTrue(file.delete()); } else { - Assert.assertFalse(resourceRoot.mkdir(getMount() + "/new-test")); + Assert.assertFalse(resourceRoot.mkdir(getMount() + "/" + newDirName)); } } + protected abstract String getNewDirName(); + //------------------------------------------------------------------ write() @Test(expected = IllegalArgumentException.class) @@ -449,25 +452,30 @@ public abstract class AbstractTestResour } @Test(expected = NullPointerException.class) - public final void testWriteNew() { - resourceRoot.write(getMount() + "/new-test", null, false); + public final void testWriteNull() { + resourceRoot.write(getMount() + "/" + getNewFileNameNull(), null, false); } + protected abstract String getNewFileNameNull(); + @Test public final void testWrite() { + String newFileName = getNewFileName(); InputStream is = new ByteArrayInputStream("test".getBytes()); if (isWriteable()) { Assert.assertTrue(resourceRoot.write( - getMount() + "/new-test", is, false)); - File file = new File(getBaseDir(), "new-test"); + getMount() + "/" + newFileName, is, false)); + File file = new File(getBaseDir(), newFileName); Assert.assertTrue(file.exists()); Assert.assertTrue(file.delete()); } else { Assert.assertFalse(resourceRoot.write( - getMount() + "/new-test", is, false)); + getMount() + "/" + newFileName, is, false)); } } + protected abstract String getNewFileName(); + // ------------------------------------------------------ getCanonicalPath() @Test Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java?rev=1739726&r1=1739725&r2=1739726&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java (original) +++ tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java Mon Apr 18 10:07:02 2016 @@ -75,4 +75,19 @@ public class TestDirResourceSet extends @SuppressWarnings("unused") Object obj = new DirResourceSet(); } + + @Override + protected String getNewDirName() { + return "test-dir-01"; + } + + @Override + protected String getNewFileNameNull() { + return "test-null-01"; + } + + @Override + protected String getNewFileName() { + return "test-file-01"; + } } Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java?rev=1739726&r1=1739725&r2=1739726&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java (original) +++ tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java Mon Apr 18 10:07:02 2016 @@ -71,4 +71,19 @@ public class TestDirResourceSetInternal public void testNoArgConstructor() { // NO-OP. Tested in TestDirResource } + + @Override + protected String getNewDirName() { + return "test-dir-02"; + } + + @Override + protected String getNewFileNameNull() { + return "test-null-02"; + } + + @Override + protected String getNewFileName() { + return "test-file-02"; + } } 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=1739726&r1=1739725&r2=1739726&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java (original) +++ tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java Mon Apr 18 10:07:02 2016 @@ -67,4 +67,19 @@ public class TestDirResourceSetMount ext public File getBaseDir() { return dir1; } + + @Override + protected String getNewDirName() { + return "test-dir-03"; + } + + @Override + protected String getNewFileNameNull() { + return "test-null-03"; + } + + @Override + protected String getNewFileName() { + return "test-file-03"; + } } Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java?rev=1739726&r1=1739725&r2=1739726&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java (original) +++ tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java Mon Apr 18 10:07:02 2016 @@ -47,4 +47,19 @@ public class TestDirResourceSetReadOnly public void testNoArgConstructor() { // NO-OP. Tested in TestDirResource } + + @Override + protected String getNewDirName() { + return "test-dir-04"; + } + + @Override + protected String getNewFileNameNull() { + return "test-null-04"; + } + + @Override + protected String getNewFileName() { + return "test-file-04"; + } } Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java?rev=1739726&r1=1739725&r2=1739726&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java (original) +++ tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java Mon Apr 18 10:07:02 2016 @@ -89,4 +89,19 @@ public class TestDirResourceSetVirtual e public void testNoArgConstructor() { // NO-OP. Tested in TestDirResource } + + @Override + protected String getNewDirName() { + return "test-dir-05"; + } + + @Override + protected String getNewFileNameNull() { + return "test-null-05"; + } + + @Override + protected String getNewFileName() { + return "test-file-05"; + } } Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java?rev=1739726&r1=1739725&r2=1739726&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java (original) +++ tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java Mon Apr 18 10:07:02 2016 @@ -54,4 +54,19 @@ public class TestFileResourceSet extends protected String getDir1() { return dir1.getAbsolutePath(); } + + @Override + protected String getNewDirName() { + return "test-dir-06"; + } + + @Override + protected String getNewFileNameNull() { + return "test-null-06"; + } + + @Override + protected String getNewFileName() { + return "test-file-06"; + } } \ No newline at end of file Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java?rev=1739726&r1=1739725&r2=1739726&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java (original) +++ tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java Mon Apr 18 10:07:02 2016 @@ -54,4 +54,19 @@ public class TestFileResourceSetReadOnly protected String getDir1() { return dir1.getAbsolutePath(); } + + @Override + protected String getNewDirName() { + return "test-dir-07"; + } + + @Override + protected String getNewFileNameNull() { + return "test-null-07"; + } + + @Override + protected String getNewFileName() { + return "test-file-07"; + } } \ No newline at end of file Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java?rev=1739726&r1=1739725&r2=1739726&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java (original) +++ tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java Mon Apr 18 10:07:02 2016 @@ -59,4 +59,19 @@ public class TestFileResourceSetVirtual protected String getDir1() { return dir1.getAbsolutePath(); } + + @Override + protected String getNewDirName() { + return "test-dir-11"; + } + + @Override + protected String getNewFileNameNull() { + return "test-null-11"; + } + + @Override + protected String getNewFileName() { + return "test-file-11"; + } } Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java?rev=1739726&r1=1739725&r2=1739726&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java (original) +++ tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java Mon Apr 18 10:07:02 2016 @@ -51,4 +51,19 @@ public class TestJarResourceSet extends @SuppressWarnings("unused") Object obj = new JarResourceSet(); } + + @Override + protected String getNewDirName() { + return "test-dir-08"; + } + + @Override + protected String getNewFileNameNull() { + return "test-null-08"; + } + + @Override + protected String getNewFileName() { + return "test-file-08"; + } } Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java?rev=1739726&r1=1739725&r2=1739726&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java (original) +++ tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java Mon Apr 18 10:07:02 2016 @@ -51,4 +51,19 @@ public class TestJarResourceSetInternal @SuppressWarnings("unused") Object obj = new JarResourceSet(); } + + @Override + protected String getNewDirName() { + return "test-dir-09"; + } + + @Override + protected String getNewFileNameNull() { + return "test-null-09"; + } + + @Override + protected String getNewFileName() { + return "test-file-09"; + } } Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java?rev=1739726&r1=1739725&r2=1739726&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java (original) +++ tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java Mon Apr 18 10:07:02 2016 @@ -42,4 +42,19 @@ public class TestJarResourceSetMount ext public File getBaseDir() { return new File("test/webresources"); } + + @Override + protected String getNewDirName() { + return "test-dir-10"; + } + + @Override + protected String getNewFileNameNull() { + return "test-null-10"; + } + + @Override + protected String getNewFileName() { + return "test-file-10"; + } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org