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 2016/04/18 12:07:44 UTC
svn commit: r1739727 - in /tomcat/tc8.5.x/trunk: ./
test/org/apache/catalina/webresources/
Author: markt
Date: Mon Apr 18 10:07:44 2016
New Revision: 1739727
URL: http://svn.apache.org/viewvc?rev=1739727&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/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.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
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 10:07:44 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
+/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
Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java?rev=1739727&r1=1739726&r2=1739727&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java Mon Apr 18 10:07:44 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/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java?rev=1739727&r1=1739726&r2=1739727&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java Mon Apr 18 10:07:44 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/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java?rev=1739727&r1=1739726&r2=1739727&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java Mon Apr 18 10:07:44 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/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java?rev=1739727&r1=1739726&r2=1739727&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java Mon Apr 18 10:07:44 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/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java?rev=1739727&r1=1739726&r2=1739727&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java Mon Apr 18 10:07:44 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/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java?rev=1739727&r1=1739726&r2=1739727&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java Mon Apr 18 10:07:44 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/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=1739727&r1=1739726&r2=1739727&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 10:07:44 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/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=1739727&r1=1739726&r2=1739727&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 10:07:44 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/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=1739727&r1=1739726&r2=1739727&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 10:07:44 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/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java?rev=1739727&r1=1739726&r2=1739727&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java Mon Apr 18 10:07:44 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/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java?rev=1739727&r1=1739726&r2=1739727&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java Mon Apr 18 10:07:44 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/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java?rev=1739727&r1=1739726&r2=1739727&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java Mon Apr 18 10:07:44 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org