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:46:37 UTC
svn commit: r1704706 - /tomcat/trunk/test/org/apache/catalina/webresources/
Author: markt
Date: Tue Sep 22 19:46:30 2015
New Revision: 1704706
URL: http://svn.apache.org/viewvc?rev=1704706&view=rev
Log:
Refactoring in preparation for fixing issue with running tests in parallel
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestDirResourceSet.java
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.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/AbstractTestDirResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestDirResourceSet.java?rev=1704706&r1=1704705&r2=1704706&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestDirResourceSet.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestDirResourceSet.java Tue Sep 22 19:46:30 2015
@@ -33,9 +33,9 @@ public abstract class AbstractTestDirRes
@Override
public WebResourceRoot getWebResourceRoot() {
- File f = new File(getBaseDir());
TesterWebResourceRoot root = new TesterWebResourceRoot();
- WebResourceSet webResourceSet = new DirResourceSet(root, "/", f.getAbsolutePath(), "/");
+ WebResourceSet webResourceSet =
+ new DirResourceSet(root, "/", getBaseDir().getAbsolutePath(), "/");
webResourceSet.setReadOnly(readOnly);
root.setMainResources(webResourceSet);
return root;
@@ -47,8 +47,8 @@ public abstract class AbstractTestDirRes
}
@Override
- public String getBaseDir() {
- return "test/webresources/dir1";
+ public File getBaseDir() {
+ return new File("test/webresources/dir1");
}
@Override
Modified: tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java?rev=1704706&r1=1704705&r2=1704706&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java Tue Sep 22 19:46:30 2015
@@ -33,9 +33,8 @@ public abstract class AbstractTestFileRe
@Override
public WebResourceRoot getWebResourceRoot() {
- File f = new File(getBaseDir());
TesterWebResourceRoot root = new TesterWebResourceRoot();
- WebResourceSet webResourceSet = new DirResourceSet(root, "/", f.getAbsolutePath(), "/");
+ WebResourceSet webResourceSet = new DirResourceSet(root, "/", getBaseDir().getAbsolutePath(), "/");
webResourceSet.setReadOnly(readOnly);
root.setMainResources(webResourceSet);
@@ -68,8 +67,8 @@ public abstract class AbstractTestFileRe
}
@Override
- public String getBaseDir() {
- return "test/webresources/dir2";
+ public File getBaseDir() {
+ return new File("test/webresources/dir2");
}
@Override
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=1704706&r1=1704705&r2=1704706&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java Tue Sep 22 19:46:30 2015
@@ -44,7 +44,7 @@ public abstract class AbstractTestResour
return "";
}
- public abstract String getBaseDir();
+ public abstract File getBaseDir();
@Before
public final void setup() throws LifecycleException {
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=1704706&r1=1704705&r2=1704706&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java Tue Sep 22 19:46:30 2015
@@ -25,11 +25,10 @@ public class TestDirResourceSetMount ext
@Override
public WebResourceRoot getWebResourceRoot() {
- File f = new File(getBaseDir());
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
new DirResourceSet(new TesterWebResourceRoot(), getMount(),
- f.getAbsolutePath(), "/");
+ getBaseDir().getAbsolutePath(), "/");
root.setMainResources(webResourceSet);
return root;
}
@@ -40,7 +39,7 @@ public class TestDirResourceSetMount ext
}
@Override
- public String getBaseDir() {
- return "test/webresources/dir1";
+ public File getBaseDir() {
+ return new File("test/webresources/dir1");
}
}
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=1704706&r1=1704705&r2=1704706&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java Tue Sep 22 19:46:30 2015
@@ -25,11 +25,10 @@ public class TestDirResourceSetVirtual e
@Override
public WebResourceRoot getWebResourceRoot() {
- File f = new File(getBaseDir());
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
new DirResourceSet(new TesterWebResourceRoot(), "/",
- f.getAbsolutePath(), "/");
+ getBaseDir().getAbsolutePath(), "/");
root.setMainResources(webResourceSet);
WebResourceSet f1 = new FileResourceSet(root, "/f1.txt",
@@ -57,7 +56,7 @@ public class TestDirResourceSetVirtual e
}
@Override
- public String getBaseDir() {
- return "test/webresources/dir3";
+ public File getBaseDir() {
+ return new File("test/webresources/dir3");
}
}
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=1704706&r1=1704705&r2=1704706&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java Tue Sep 22 19:46:30 2015
@@ -16,6 +16,8 @@
*/
package org.apache.catalina.webresources;
+import java.io.File;
+
/**
* Mounts file resources in sub directories that do not exist in the main
* resoucres.
@@ -23,8 +25,8 @@ package org.apache.catalina.webresources
public class TestFileResourceSetVirtual extends TestFileResourceSet {
@Override
- public String getBaseDir() {
- return "test/webresources/dir3";
+ public File getBaseDir() {
+ return new File("test/webresources/dir3");
}
}
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=1704706&r1=1704705&r2=1704706&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java Tue Sep 22 19:46:30 2015
@@ -41,8 +41,8 @@ public class TestJarResourceSet extends
}
@Override
- public String getBaseDir() {
- return "test/webresources";
+ public File getBaseDir() {
+ return new File("test/webresources");
}
@Override
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=1704706&r1=1704705&r2=1704706&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java Tue Sep 22 19:46:30 2015
@@ -41,8 +41,8 @@ public class TestJarResourceSetInternal
}
@Override
- public String getBaseDir() {
- return "test/webresources";
+ public File getBaseDir() {
+ return new File("test/webresources");
}
@Override
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=1704706&r1=1704705&r2=1704706&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java Tue Sep 22 19:46:30 2015
@@ -39,7 +39,7 @@ public class TestJarResourceSetMount ext
}
@Override
- public String getBaseDir() {
- return "test/webresources";
+ public File getBaseDir() {
+ return new File("test/webresources");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org