Author: craigmcc
Date: Fri Jun 30 17:46:58 2006
New Revision: 418428
URL: http://svn.apache.org/viewvc?rev=418428&view=rev
Log:
Refine the use of CargoTestSetup so that it does not presume that the
container to be used is always tomcat5x. This requires setting a
"cargo.container.home" property pointing at the base directory of your
container, either in ~/.m2/settints.xml or as a command line -D option.
To run both unit and integration tests, execute:
mvn -Pitest clean install
Removed:
struts/shale/trunk/shale-apps/shale-blank/src/test/java/org/apache/shale/blank/systest/Tomcat5xWelcomeTestCase.java
Modified:
struts/shale/trunk/shale-apps/shale-blank/pom.xml
struts/shale/trunk/shale-apps/shale-blank/src/test/java/org/apache/shale/blank/systest/WelcomeTestCase.java
Modified: struts/shale/trunk/shale-apps/shale-blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-apps/shale-blank/pom.xml?rev=418428&r1=418427&r2=418428&view=diff
==============================================================================
--- struts/shale/trunk/shale-apps/shale-blank/pom.xml (original)
+++ struts/shale/trunk/shale-apps/shale-blank/pom.xml Fri Jun 30 17:46:58 2006
@@ -138,25 +138,25 @@
<include>**/systest/**</include>
</includes>
<excludes>
-
<exclude>**/WelcomeTestCase.java</exclude>
+ <exclude>**/Tomcat5x**</exclude>
</excludes>
<systemProperties>
<property>
<name>url</name>
<value>http://localhost:8080/${artifactId}</value>
</property>
- <!-- Define cargo.tomcat5x.home
~/.m2/settings.xml or with -D on the command line -->
+ <!-- Define cargo.container.home
~/.m2/settings.xml or with -D on the command line -->
<property>
- <name>cargo.tomcat5x.home</name>
-
<value>${cargo.tomcat5x.home}</value>
+ <name>cargo.container.home</name>
+
<value>${cargo.container.home}</value>
</property>
<property>
- <name>cargo.tomcat5x.output</name>
-
<value>${basedir}/target/tomcat5x.out</value>
+ <name>cargo.container.output</name>
+
<value>${basedir}/target/container.output</value>
</property>
<property>
- <name>cargo.tomcat5x.log</name>
-
<value>${basedir}/target/tomcat5x.log</value>
+ <name>cargo.container.log</name>
+
<value>${basedir}/target/container.log</value>
</property>
<property>
<name>cargo.deployable</name>
Modified:
struts/shale/trunk/shale-apps/shale-blank/src/test/java/org/apache/shale/blank/systest/WelcomeTestCase.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-apps/shale-blank/src/test/java/org/apache/shale/blank/systest/WelcomeTestCase.java?rev=418428&r1=418427&r2=418428&view=diff
==============================================================================
---
struts/shale/trunk/shale-apps/shale-blank/src/test/java/org/apache/shale/blank/systest/WelcomeTestCase.java
(original)
+++
struts/shale/trunk/shale-apps/shale-blank/src/test/java/org/apache/shale/blank/systest/WelcomeTestCase.java
Fri Jun 30 17:46:58 2006
@@ -21,6 +21,7 @@
import java.util.ResourceBundle;
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.shale.test.cargo.CargoTestSetup;
import org.apache.shale.test.htmlunit.AbstractHtmlUnitTestCase;
/**
@@ -70,7 +71,7 @@
*/
public static Test suite() {
- return (new TestSuite(WelcomeTestCase.class));
+ return new CargoTestSetup(new TestSuite(WelcomeTestCase.class));
}
