[Commits] (bcm) remove test stuff from web subproject altogether. there are significant issues

commits at osafoundation.org commits at osafoundation.org
Thu Apr 14 15:33:50 PDT 2005


Commit by: bcm
Modified files:
server/docs/TODO.txt 1.56 1.57
server/web/build.xml 1.6 1.7

Log message:
remove test stuff from web subproject altogether. there are significant issues
getting strutstestcase working in the current environment, and i'm not ready
to do the work to set up cactus (nor am i convinced that we want a test suite
running against a live servlet container)


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/docs/TODO.txt.diff?r1=text&tr1=1.56&r2=text&tr2=1.57
http://cvs.osafoundation.org/index.cgi/server/web/build.xml.diff?r1=text&tr1=1.6&r2=text&tr2=1.7

Index: server/docs/TODO.txt
diff -u server/docs/TODO.txt:1.56 server/docs/TODO.txt:1.57
--- server/docs/TODO.txt:1.56	Thu Apr 14 11:30:11 2005
+++ server/docs/TODO.txt	Thu Apr 14 15:33:49 2005
@@ -6,8 +6,6 @@
 
 web:
 
- * get tests running again
-
 docs:
 
  * rewrite all existing docs

Index: server/web/build.xml
diff -u server/web/build.xml:1.6 server/web/build.xml:1.7
--- server/web/build.xml:1.6	Tue Apr 12 19:31:52 2005
+++ server/web/build.xml	Thu Apr 14 15:33:49 2005
@@ -23,7 +23,6 @@
     <pathelement location="${servletapi.jar}"/>
     <pathelement location="${spring.jar}"/>
     <pathelement location="${struts.jar}"/>
-    <pathelement location="${strutstest.jar}"/>
   </path>
 
   <!-- BUILD TARGETS -->
@@ -111,7 +110,7 @@
   <target name="all" depends="compile,pack"
           description="build and pack the source"/>
 
-  <target name="clean" depends="test-clean"
+  <target name="clean"
           description="clean out the source">
     <delete dir="${web.build}"/>
     <delete>
@@ -121,81 +120,4 @@
     </delete>
   </target>
 
-  <!-- TEST TARGETS -->
-
-  <target name="test-prepare" description="set up the test environment">
-    <mkdir dir="${web.build}/testclasses"/>
-    <mkdir dir="${web.test}/data"/>
-  </target>
-
-  <target name="test-compile" depends="test-prepare"
-          description="build the test source">
-    <javac srcdir="${web.test}"
-           destdir="${web.build}/testclasses"
-           debug="${compile.debug}"
-           optimize="${compile.optimize}"
-           deprecation="${compile.deprecation}"
-           target="${compile.target}">
-      <classpath>
-        <path refid="ext.classpath"/>
-        <path location="${web.build}/classes"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <target name="test" depends="all,test-compile"
-          description="run JUnit tests">
-    <copy todir="${web.build}/testclasses">
-      <fileset dir="${web.test}/etc">
-        <include name="log4j.xml"/>
-      </fileset>
-      <fileset dir="${core.etc}">
-        <include name="applicationContext-base.xml"/>
-        <include name="applicationContext-hibernate.xml"/>
-        <include name="applicationContext-jcr-client.xml"/>
-        <include name="applicationContext-manager.xml"/>
-        <include name="applicationContext-security.xml"/>
-        <include name="ehcache.xml"/>
-      </fileset>
-      <fileset dir="${cosmo.test}">
-        <include name="hibernate.cfg.xml"/>
-      </fileset>
-    </copy>
-    <junit printsummary="no" fork="true"
-           errorProperty="test.failed" failureProperty="test.failed">
-      <classpath>
-        <path refid="ext.classpath"/>
-        <fileset dir="${core.build}" includes="*.jar"/>
-        <fileset dir="${web.build}" includes="*.jar"/>
-        <path location="${web.build}/testclasses"/>
-        <path location="${web.web}"/>
-        <fileset dir="${web.web}/WEB-INF/lib" includes="*.jar"/>
-        <pathelement location="${cosmo.test.userdb.jar}"/>
-      </classpath>
-      <formatter type="xml"/>
-      <formatter type="brief" usefile="false"/>
-      <batchtest todir="${web.test}/data" if="testcase">
-        <fileset dir="${web.build}/testclasses">
-          <include name="**/*${testcase}*"/>
-          <exclude name="**/*TestCase.class"/>
-          <exclude name="**/*$*.class"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${web.test}/data" unless="testcase">
-        <fileset dir="${web.build}/testclasses">
-          <include name="**/*Test.class*"/>
-        </fileset>
-      </batchtest>
-    </junit>
-    <fail if="test.failed">
-      Unit tests failed. For error messages, check the log files in
-      ${web.test}/data.
-    </fail>
-  </target>
-
-  <target name="test-clean" description="clean out the test source">
-    <delete dir="${web.build}/testclasses"/>
-    <delete dir="${web.test}/data"/>
-  </target>
-
 </project>



More information about the Commits mailing list