Author: craigmcc
Date: Fri Jun 9 22:40:07 2006
New Revision: 413252
URL: http://svn.apache.org/viewvc?rev=413252&view=rev
Log:
Rearrange the integration test sources to match the pattern specified by
the POM. The application currenty fails on deployment due to XML
parsing errors, most likely due to the fact that xercesImpl-2.2.1.jar
and xml-apis-1.0.b2.jar are getting included in the WEB-INF/lib
directory ... they should only be required to compile the tests, since
the container provides an XML parser.
Also, need to review the heavy baggage that including shale-spring as a
dependency (and transitively the dependencies that Spring defines)
brings to the table.
Added:
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/AbstractTestCase.java
- copied, changed from r413237,
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/systest/org/apache/shale/usecases/systest/AbstractTestCase.java
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/JndiTestCase.java
- copied unchanged from r413237,
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/systest/org/apache/shale/usecases/systest/JndiTestCase.java
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/SubviewTestCase.java
- copied unchanged from r413237,
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/systest/org/apache/shale/usecases/systest/SubviewTestCase.java
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/UseCasesTestCase.java
- copied unchanged from r413237,
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/systest/org/apache/shale/usecases/systest/UseCasesTestCase.java
Removed:
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/systest/org/apache/shale/usecases/systest/AbstractTestCase.java
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/systest/org/apache/shale/usecases/systest/JndiTestCase.java
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/systest/org/apache/shale/usecases/systest/SubviewTestCase.java
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/systest/org/apache/shale/usecases/systest/UseCasesTestCase.java
Modified:
struts/shale/branches/mvn_reorg/shale-apps/pom.xml
Modified: struts/shale/branches/mvn_reorg/shale-apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/pom.xml?rev=413252&r1=413251&r2=413252&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-apps/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-apps/pom.xml Fri Jun 9 22:40:07 2006
@@ -47,8 +47,8 @@
<module>shale-blank</module>
<!--
<module>shale-mailreader</module>
- <module>shale-use-cases</module>
-->
+ <module>shale-usecases</module>
</modules>
<build>
Copied:
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/AbstractTestCase.java
(from r413237,
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/systest/org/apache/shale/usecases/systest/AbstractTestCase.java)
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/AbstractTestCase.java?p2=struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/AbstractTestCase.java&p1=struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/systest/org/apache/shale/usecases/systest/AbstractTestCase.java&r1=413237&r2=413252&rev=413252&view=diff
==============================================================================
---
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/systest/org/apache/shale/usecases/systest/AbstractTestCase.java
(original)
+++
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/test/java/org/apache/shale/usecases/systest/AbstractTestCase.java
Fri Jun 9 22:40:07 2006
@@ -36,10 +36,6 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.commons.httpclient.Cookie;
-import org.apache.commons.httpclient.HttpState;
-
-
/**
* <p>Abstract base class for system integration tests based on HtmlUnit.</p>
@@ -67,12 +63,6 @@
/**
- * <p>The HTTP state information for this test case.</p>
- */
- protected HttpState httpState = null;
-
-
- /**
* <p>The most recently retrieved page from the server.</p>
*/
protected HtmlPage page = null;
@@ -107,7 +97,6 @@
// Initialize HtmlUnit constructs for this test case
webClient = new WebClient();
- httpState = webClient.getWebConnection().getStateForUrl(url("/"));
}
@@ -127,7 +116,6 @@
*/
public void tearDown() {
- httpState = null;
page = null;
// sessionId = null;
url = null;
@@ -185,7 +173,7 @@
*/
protected HtmlForm form(String id) throws Exception {
- Iterator forms = page.getAllForms().iterator();
+ Iterator forms = page.getForms().iterator();
while (forms.hasNext()) {
HtmlForm form = (HtmlForm) forms.next();
if (id.equals(form.getAttributeValue("id"))) {
