Author: kkolinko
Date: Wed Apr 28 18:49:11 2010
New Revision: 939050
URL: http://svn.apache.org/viewvc?rev=939050&view=rev
Log:
Implement support for running the tests when the build output directory
non-default value.
Modified:
tomcat/trunk/build.xml
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=939050&r1=939049&r2=939050&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Apr 28 18:49:11 2010
@@ -73,6 +73,7 @@
<property name="tomcat.release" value="${tomcat.output}/release"/>
<property name="tomcat.src.jars" value="${tomcat.output}/src-jars"/>
<property name="test.classes" value="${tomcat.output}/testclasses"/>
+ <property name="test.temp" value="${tomcat.output}/test-tmp"/>
<!-- Servlet 3.0 spec requires 1.6+ -->
<property name="compile.source" value="1.6"/>
@@ -915,6 +916,9 @@
<junit printsummary="yes" fork="yes" dir="." showoutput="yes">
<classpath refid="tomcat.test.classpath" />
+ <sysproperty key="tomcat.test.temp" value="${test.temp}" />
+ <sysproperty key="tomcat.test.tomcatbuild" value="${tomcat.build}" />
+
<formatter type="plain" usefile="true" />
<!-- If test.entry is defined, run a single test, otherwise run all
valid tests -->
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=939050&r1=939049&r2=939050&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Wed Apr 28
18:49:11 2010
@@ -185,8 +185,7 @@ public class TestTomcat extends TomcatBa
public void testSingleWebapp() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("output/build/webapps/examples");
+ File appDir = new File(getBuildDirectory(), "webapps/examples");
// app dir is relative to server home
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
@@ -200,8 +199,7 @@ public class TestTomcat extends TomcatBa
public void testJsps() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("output/build/webapps/examples");
+ File appDir = new File(getBuildDirectory(), "webapps/examples");
// app dir is relative to server home
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
@@ -296,7 +294,7 @@ public class TestTomcat extends TomcatBa
String contextPath = "/examples";
- File appDir = new File("output/build/webapps" + contextPath);
+ File appDir = new File(getBuildDirectory(), "webapps" + contextPath);
// app dir is relative to server home
org.apache.catalina.Context ctx =
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java?rev=939050&r1=939049&r2=939050&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java Wed Apr 28
18:49:11 2010
@@ -70,9 +70,11 @@ public class TestTomcatSSL extends Tomca
tomcat.getConnector().setProperty("SSLEnabled", "true");
tomcat.getConnector().setProperty("sslProtocol",
"tls");
- // test runs in output/tmp
- tomcat.getConnector().setAttribute("keystoreFile",
- "../../test/org/apache/catalina/startup/test.keystore");
+
+ File keystoreFile = new File(
+ "test/org/apache/catalina/startup/test.keystore");
+ tomcat.getConnector().setAttribute("keystoreFile",
+ keystoreFile.getAbsolutePath());
}
public void testSimpleSsl() throws Exception {
@@ -98,8 +100,7 @@ public class TestTomcatSSL extends Tomca
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("output/build/webapps/examples");
+ File appDir = new File(getBuildDirectory(), "webapps/examples");
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
initSsl(tomcat, nio);
@@ -119,8 +120,7 @@ public class TestTomcatSSL extends Tomca
public void renegotiateFail(boolean nio) throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("output/build/webapps/examples");
+ File appDir = new File(getBuildDirectory(), "webapps/examples");
// app dir is relative to server home
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
@@ -198,8 +198,7 @@ public class TestTomcatSSL extends Tomca
public void renegotiateWorks(boolean nio) throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("output/build/webapps/examples");
+ File appDir = new File(getBuildDirectory(), "webapps/examples");
// app dir is relative to server home
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
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=939050&r1=939049&r2=939050&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Wed Apr
28 18:49:11 2010
@@ -67,7 +67,17 @@ public abstract class TomcatBaseTest ext
port++;
return getPort();
}
-
+
+ /**
+ * Helper method that returns the directory where Tomcat build resides. It
+ * is used to access resources that are part of default Tomcat deployment.
+ * E.g. the examples webapp.
+ */
+ public File getBuildDirectory() {
+ return new File(System.getProperty("tomcat.test.tomcatbuild",
+ "output/build"));
+ }
+
@Override
public void setUp() throws Exception {
// Need to use JULI and to configure a ConsoleHandler so log messages
@@ -77,7 +87,7 @@ public abstract class TomcatBaseTest ext
LogManager.getLogManager().getLogger("").addHandler(
new ConsoleHandler());
- tempDir = new File("output/tmp");
+ tempDir = new File(System.getProperty("tomcat.test.temp",
"output/tmp"));
tempDir.mkdir();
File appBase = new File(tempDir, "webapps");
appBase.mkdir();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
