svn commit: r371850 - /struts/shale/trunk/test-framework/build.xml

[cr...@apache.org]

Author: craigmcc
Date: Mon Jan 23 23:23:04 2006
New Revision: 371850

URL: http://svn.apache.org/viewcvs?rev=371850&view=rev
Log:
Support a convenience base class for HtmlUnit based system integration tests.
To avoid disruptions, this class is only compiled if the appropriate property
(htmlunit.home) is defined to point at the HtmlUnit 1.6 or later release.

Modified:
    struts/shale/trunk/test-framework/build.xml

Modified: struts/shale/trunk/test-framework/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/build.xml?rev=371850&r1=371849&r2=371850&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/build.xml (original)
+++ struts/shale/trunk/test-framework/build.xml Mon Jan 23 23:23:04 2006
@@ -43,6 +43,9 @@
 
 
   <!-- Conditional Processing Flags -->
+  <available                     property="htmlunit.present"
+                                classname="com.gargoylesoftware.htmlunit.Assert"
+                             classpathref="compile.classpath"/>
   <available                     property="jsfri.present"
                                 classname="com.sun.faces.RIConstants"
                                 classpath="${jsf-impl.jar}"/>
@@ -76,22 +79,15 @@
     <pathelement location="${servlet-api.jar}"/>
     <pathelement location="${shale-core.jar}"/>
     <pathelement location="${build.home}/classes"/>
+    <pathelement location="${junit.jar}"/>
+    <fileset          dir="${htmlunit.home}/lib"
+                 includes="htmlunit*.jar commons-httpclient*.jar"/>
   </path>
 
 
   <!-- Test Classpath -->
   <path id="test.classpath">
-    <pathelement location="${commons-beanutils.jar}"/>
-    <pathelement location="${commons-collections.jar}"/>
-    <pathelement location="${commons-digester.jar}"/>
-    <pathelement location="${commons-logging.jar}"/>
-    <pathelement location="${commons-validator.jar}"/>
-    <pathelement location="${jsf-api.jar}"/>
-    <pathelement location="${jsp-api.jar}"/>
-    <pathelement location="${junit.jar}"/>
-    <pathelement location="${servlet-api.jar}"/>
-    <pathelement location="${shale-core.jar}"/>
-    <pathelement location="${build.home}/classes"/>
+    <path           refid="compile.classpath"/>
     <pathelement location="${build.home}/test-classes"/>
   </path>
 
@@ -112,11 +108,12 @@
     <filter  token="package"  value="${project.package}"/>
     <filter  token="state"    value="${systest.state.saving}"/>
     <filter  token="version"  value="${project.version}"/>
-    <echo  message="jsf-api.jar =    ${jsf-api.jar}"/>
-    <echo  message="jsf-impl.jar =   ${jsf-impl.jar}"/>
-    <echo  message="shale-core.jar = ${shale-core.jar}"/>
-    <echo  message="jsfri.present =  ${jsfri.present}"/>
-    <echo  message="myfaces.present= ${myfaces.present}"/>
+    <echo  message="jsf-api.jar =      ${jsf-api.jar}"/>
+    <echo  message="jsf-impl.jar =     ${jsf-impl.jar}"/>
+    <echo  message="shale-core.jar =   ${shale-core.jar}"/>
+    <echo  message="htmlunit.present = ${htmlunit.present}"/>
+    <echo  message="jsfri.present =    ${jsfri.present}"/>
+    <echo  message="myfaces.present=   ${myfaces.present}"/>
   </target>
 
 
@@ -163,6 +160,8 @@
                 source="${platform.source}"
                 target="${platform.target}">
       <classpath refid="compile.classpath" />
+      <exclude    name="org/apache/shale/test/htmlunit/**"
+                unless="htmlunit.present"/>
     </javac>
 
     <!-- Copy non-Java Sources -->



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org