Changeset 1292

Timestamp:

02/15/07 16:55:03

Author:

douglm

Message:

New testsuite project

Files:

• trunk (modified) (1 prop)
• trunk/build.xml (modified) (9 diffs)
• trunk/build/libjars.properties (modified) (1 diff)
• trunk/config/configs/democal.properties (modified) (2 diffs)
• trunk/deployment/testsuite (added)
• trunk/deployment/testsuite/shellscr (added)
• trunk/deployment/testsuite/shellscr/build.xml (added)
• trunk/deployment/testsuite/shellscr/resources (added)
• trunk/deployment/testsuite/shellscr/resources/bwruntest.bat (added)
• trunk/deployment/testsuite/shellscr/resources/bwruntest.sh (added)
• trunk/deployment/testsuite/shellscr/resources/log4j.xml (added)

trunk/build.xml

@@ -46 +46 @@
-  <property name="org.bedework.project.synchml"
-            location="${org.bedework.projects}/synchml" />
+
+  <property name="org.bedework.project.testsuite"
+            location="${org.bedework.projects}/testsuite" />
-
-  <property name="org.bedework.project.webapps"
@@ -213 +216 @@
-                                build.webdav,build.caldav,build.caldavTest,
-                                build.freebusy,build.bwtools,build.webapps,
-
+testsuite,build.
-          description="builds the project"/>
-
@@ -219 +222 @@
-                                clean.calendarapi,clean.dumprestore,clean.synchml,
-                                clean.webdav,clean.caldav,clean.caldavTest,
-
+
+
-          description="Remove all generated files.">
-    <delete dir="${dist.home}" />
@@ -228 +232 @@
-                                           clean.calendarapi,clean.dumprestore,clean.synchml,
-                                           clean.webdav,clean.caldav,clean.caldavTest,
-
+
+
-          description="partial clean up for quickstart.">
-    <delete dir="${bin.home}" />
@@ -375 +380 @@
-      <property name="destdir"
-                location="${org.bedework.projectdocs.home}/webapps/api" />
+    </ant>
+
+    <ant antfile="${org.bedework.project.testsuite}/build.xml" inheritall="false"
+         target="javadoc" >
+      <property name="destdir"
+                location="${org.bedework.projectdocs.home}/testsuite/api" />
-    </ant>
-  </target>
@@ -404 +415 @@
-    <copy-to-dependent this="${org.bedework.project.access}"
-                       target="${org.bedework.project.webdav}" />
+    <copy-to-dependent this="${org.bedework.project.access}"
+                       target="${org.bedework.project.testsuite}" />
-
-    <copy-to-bin this="${org.bedework.project.access}"/>
@@ -521 +534 @@
-    <copy-to-dependent this="${org.bedework.project.calendarapi}"
-                       target="${org.bedework.project.webapps}" />
+    <copy-to-dependent this="${org.bedework.project.calendarapi}"
+                       target="${org.bedework.project.testsuite}" />
-
-    <copy-to-bin this="${org.bedework.project.calendarapi}"/>
@@ -641 +656 @@
-    <copy-to-dependent this="${org.bedework.project.rpiutil}"
-                       target="${org.bedework.project.webdav}" />
+    <copy-to-dependent this="${org.bedework.project.rpiutil}"
+                       target="${org.bedework.project.testsuite}" />
-
-    <copy-to-bin this="${org.bedework.project.rpiutil}"/>
@@ -683 +700 @@
-  <target name="clean.build.synchml" depends="clean.synchml,clean.synchml"
-          description="builds the synchml project"/>
+
+  <!-- .................................................................
+                          testsuite
+       .................................................................. -->
+  <target name="build.testsuite" depends="init"
+          description="builds the testsuite project">
+    <ant antfile="${org.bedework.project.testsuite}/build.xml" inheritall="false"
+         target="build-all" />
+
+    <copy-to-bin this="${org.bedework.project.testsuite}"/>
+  </target>
+
+  <target name="clean.testsuite" depends="init"
+          description="clean the testsuite project">
+    <ant antfile="${org.bedework.project.testsuite}/build.xml" inheritall="false"
+         target="deep-clean" />
+  </target>
+
+  <target name="clean.build.testsuite" depends="clean.testsuite,clean.testsuite"
+          description="builds the testsuite project"/>
-
-  <!-- .................................................................

trunk/build/libjars.properties

@@ -134 +134 @@
-jtidy.jar=${org.bedework.default.lib}/jtidy.jar
-
-
+
+
+
+
+
-
-httpunit.jar=${org.bedework.default.lib}/httpunit.jar

trunk/config/configs/democal.properties

@@ -20 +20 @@
-
-# Define the names of the applications we want to build
-
+test,
-
-#
@@ -332 +332 @@
-# --------------------------------------------------------------------
-#
+# Testsuite
+#
+
+org.bedework.app.test.project=testsuite
+org.bedework.app.test.type=testsuite
+org.bedework.app.test.sou.dir=
+org.bedework.app.test.shellscr.name=bwruntest
+org.bedework.app.test.batscr.name=bwruntest.bat
+org.bedework.app.test.zip.name=testsuite
+org.bedework.app.test.description=Bedework test suite
+org.bedework.app.test.schema.delimiter=;
+org.bedework.app.test.hibernate.dialect=org.hibernate.dialect.HSQLDialect
+org.bedework.app.test.jdbcdriver=org.hsqldb.jdbcDriver
+org.bedework.app.test.jdbcurl=jdbc:hsqldb:hsql://localhost:8887
+org.bedework.app.test.jdbcid=sa
+org.bedework.app.test.jdbcpw=
+
+#
+# --------------------------------------------------------------------
+#
-# Dumprestore
-#