Author: craigmcc
Date: Fri Jun 30 17:54:16 2006
New Revision: 418429
URL: http://svn.apache.org/viewvc?rev=418429&view=rev
Log:
Use CargoTestSetup in the integration tests, so that they will automatically
start up and deploy to the configured Cargo container (default=tomcat5x).
Modified:
struts/shale/trunk/shale-apps/shale-usecases/pom.xml
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/JndiTestCase.java
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/SubviewTestCase.java
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/TokenTestCase.java
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/UseCasesTestCase.java
Modified: struts/shale/trunk/shale-apps/shale-usecases/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-apps/shale-usecases/pom.xml?rev=418429&r1=418428&r2=418429&view=diff
==============================================================================
--- struts/shale/trunk/shale-apps/shale-usecases/pom.xml (original)
+++ struts/shale/trunk/shale-apps/shale-usecases/pom.xml Fri Jun 30 17:54:16
2006
@@ -159,8 +159,20 @@
<value>http://localhost:8080/${artifactId}</value>
</property>
<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.container.output</name>
+
<value>${basedir}/target/container.output</value>
+ </property>
+ <property>
+ <name>cargo.container.log</name>
+
<value>${basedir}/target/container.log</value>
+ </property>
+ <property>
+ <name>cargo.deployable</name>
+
<value>${basedir}/target/${artifactId}.war</value>
</property>
</systemProperties>
</configuration>
Modified:
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/JndiTestCase.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/JndiTestCase.java?rev=418429&r1=418428&r2=418429&view=diff
==============================================================================
---
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/JndiTestCase.java
(original)
+++
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/JndiTestCase.java
Fri Jun 30 17:54:16 2006
@@ -22,6 +22,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.shale.test.cargo.CargoTestSetup;
/**
* <p>Validate the "JNDI access" path through the application</p>
@@ -66,7 +67,7 @@
*/
public static Test suite() {
- return (new TestSuite(JndiTestCase.class));
+ return new CargoTestSetup(new TestSuite(JndiTestCase.class));
}
Modified:
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/SubviewTestCase.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/SubviewTestCase.java?rev=418429&r1=418428&r2=418429&view=diff
==============================================================================
---
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/SubviewTestCase.java
(original)
+++
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/SubviewTestCase.java
Fri Jun 30 17:54:16 2006
@@ -22,6 +22,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.shale.test.cargo.CargoTestSetup;
/**
* <p>Validate the "Subview Processing" path through the application</p>
@@ -66,7 +67,7 @@
*/
public static Test suite() {
- return (new TestSuite(SubviewTestCase.class));
+ return new CargoTestSetup(new TestSuite(SubviewTestCase.class));
}
Modified:
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/TokenTestCase.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/TokenTestCase.java?rev=418429&r1=418428&r2=418429&view=diff
==============================================================================
---
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/TokenTestCase.java
(original)
+++
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/TokenTestCase.java
Fri Jun 30 17:54:16 2006
@@ -28,6 +28,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.shale.test.cargo.CargoTestSetup;
/**
* <p>Test case for the [EMAIL PROTECTED] Token} ViewController
implementation.</p>
@@ -58,7 +59,7 @@
// Return the tests included in this test case.
public static Test suite() {
- return (new TestSuite(TokenTestCase.class));
+ return new CargoTestSetup(new TestSuite(TokenTestCase.class));
}
Modified:
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/UseCasesTestCase.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/UseCasesTestCase.java?rev=418429&r1=418428&r2=418429&view=diff
==============================================================================
---
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/UseCasesTestCase.java
(original)
+++
struts/shale/trunk/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/UseCasesTestCase.java
Fri Jun 30 17:54:16 2006
@@ -20,6 +20,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlForm;
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.shale.test.cargo.CargoTestSetup;
/**
* <p>Simple integration test to validate access to the main menu.</p>
@@ -64,7 +65,7 @@
*/
public static Test suite() {
- return (new TestSuite(UseCasesTestCase.class));
+ return new CargoTestSetup(new TestSuite(UseCasesTestCase.class));
}
