incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1182025 - in /incubator/lcf/branches/CONNECTORS-256: build.xml connectors/wiki/build.xml loadtests/wiki/ loadtests/wiki/src/ loadtests/wiki/src/test/ loadtests/wiki/src/test/java/
Date Tue, 11 Oct 2011 19:06:15 GMT
Author: kwright
Date: Tue Oct 11 19:06:15 2011
New Revision: 1182025

URL: http://svn.apache.org/viewvc?rev=1182025&view=rev
Log:
Add ant build support for wiki tests.

Added:
    incubator/lcf/branches/CONNECTORS-256/loadtests/wiki/
    incubator/lcf/branches/CONNECTORS-256/loadtests/wiki/src/
    incubator/lcf/branches/CONNECTORS-256/loadtests/wiki/src/test/
    incubator/lcf/branches/CONNECTORS-256/loadtests/wiki/src/test/java/
Modified:
    incubator/lcf/branches/CONNECTORS-256/build.xml
    incubator/lcf/branches/CONNECTORS-256/connectors/wiki/build.xml

Modified: incubator/lcf/branches/CONNECTORS-256/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-256/build.xml?rev=1182025&r1=1182024&r2=1182025&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-256/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-256/build.xml Tue Oct 11 19:06:15 2011
@@ -1915,6 +1915,15 @@
       </condition>
     </target>
 
+    <target name="calculate-wiki-tests-condition" depends="calculate-wiki-condition,calculate-nulloutput-condition">
+      <condition property="wiki-tests.include">
+        <and>
+            <isset property="wiki.include"/>
+            <isset property="nulloutput.include"/>
+        </and>
+      </condition>
+    </target>
+
     <target name="compile-filesystem-tests" depends="build-framework,build-filesystem-connector,build-nulloutput-connector,calculate-filesystem-tests-condition,build-tests-filesystem-connector,build-tests-nulloutput-connector"
if="filesystem-tests.include">
         <mkdir dir="build/filesystem-tests/classes"/>
         <javac srcdir="tests/filesystem/src/test/java" destdir="build/filesystem-tests/classes"
target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
@@ -1979,6 +1988,70 @@
         </javac>
     </target>
 
+    <target name="compile-wiki-tests" depends="build-framework,build-wiki-connector,build-nulloutput-connector,calculate-wiki-tests-condition,build-tests-wiki-connector,build-tests-nulloutput-connector"
if="wiki-tests.include">
+        <mkdir dir="build/wiki-tests/classes"/>
+        <javac srcdir="tests/wiki/src/test/java" destdir="build/wiki-tests/classes" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                 <fileset dir="framework/lib"> 
+                    <include name="*.jar"/> 
+                </fileset>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="compile-wiki-loadtests" depends="build-framework,build-filesystem-connector,build-nulloutput-connector,calculate-wiki-tests-condition,build-tests-wiki-connector,build-tests-nulloutput-connector"
if="wiki-tests.include">
+        <mkdir dir="build/wiki-loadtests/classes"/>
+        <javac srcdir="loadtests/wiki/src/test/java" destdir="build/wiki-loadtests/classes"
target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                 <fileset dir="framework/lib"> 
+                    <include name="*.jar"/> 
+                </fileset>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+            </classpath>
+        </javac>
+    </target>
+
     <target name="compile-sharepoint-tests" depends="build-framework,build-sharepoint-connector,build-nulloutput-connector,calculate-sharepoint-tests-condition,build-tests-sharepoint-connector,build-tests-nulloutput-connector"
if="sharepoint-tests.include">
         <mkdir dir="build/sharepoint-tests/classes"/>
         <javac srcdir="tests/sharepoint/src/test/java" destdir="build/sharepoint-tests/classes"
target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
@@ -2177,6 +2250,72 @@
         </junit>
     </target>
 
+    <target name="run-wiki-tests-derby" depends="compile-wiki-tests,calculate-wiki-tests-condition"
if="wiki-tests.include">
+        <mkdir dir="test-output/wiki"/>
+        <junit fork="true" maxmemory="128m" dir="test-output/wiki" outputtoformatters="true"
showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+                <pathelement location="build/wiki-tests/classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <!-- MHL -->
+        </junit>
+    </target>
+
+    <target name="run-wiki-loadtests-derby" depends="compile-wiki-loadtests,calculate-wiki-tests-condition"
if="wiki-tests.include">
+        <mkdir dir="test-output/wiki"/>
+        <junit fork="true" maxmemory="128m" dir="test-output/wiki" outputtoformatters="true"
showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+                <pathelement location="build/wiki-loadtests/classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <!-- MHL -->
+        </junit>
+    </target>
+
     <target name="run-cmis-tests-derby" depends="compile-cmis-tests,calculate-cmis-tests-condition"
if="cmis-tests.include">
         <mkdir dir="test-output/cmis"/>
         <junit fork="true" maxmemory="128m" dir="test-output/cmis" outputtoformatters="true"
showoutput="true" haltonfailure="true">
@@ -2388,6 +2527,73 @@
         </junit>
     </target>
 
+    <target name="run-wiki-tests-postgresql" depends="compile-wiki-tests,calculate-wiki-tests-condition"
if="wiki-tests.include">
+        <mkdir dir="test-postgresql-output/wiki"/>
+        <junit fork="true" maxmemory="128m" dir="test-postgresql-output/wiki" outputtoformatters="true"
showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+                <pathelement location="build/wiki-tests/classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <!-- MHL -->
+        </junit>
+    </target>
+
+    <target name="run-wiki-loadtests-postgresql" depends="compile-wiki-loadtests,calculate-wiki-tests-condition"
if="wiki-tests.include">
+        <mkdir dir="test-postgresql-output/wiki"/>
+        <junit fork="true" maxmemory="128m" dir="test-postgresql-output/wiki" outputtoformatters="true"
showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+                <pathelement location="build/wiki-loadtests/classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <!-- MHL -->
+            
+        </junit>
+    </target>
+
     <target name="run-cmis-tests-postgresql" depends="compile-cmis-tests,calculate-cmis-tests-condition"
if="cmis-tests.include">
         <mkdir dir="test-output/cmis"/>
         <junit fork="true" maxmemory="128m" dir="test-output/cmis" outputtoformatters="true"
showoutput="true" haltonfailure="true">
@@ -2530,6 +2736,72 @@
         </junit>
     </target>
 
+    <target name="run-wiki-tests-HSQLDB" depends="compile-wiki-tests,calculate-wiki-tests-condition"
if="wiki-tests.include">
+        <mkdir dir="test-HSQLDB-output/wiki"/>
+        <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output/wiki" outputtoformatters="true"
showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+                <pathelement location="build/wiki-tests/classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <!-- MHL -->
+        </junit>
+    </target>
+
+    <target name="run-wiki-loadtests-HSQLDB" depends="compile-wiki-loadtests,calculate-wiki-tests-condition"
if="wiki-tests.include">
+        <mkdir dir="test-HSQLDB-output/wiki"/>
+        <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output/wiki" outputtoformatters="true"
showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+                <pathelement location="build/wiki-loadtests/classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <!-- MHL -->
+        </junit>
+    </target>
+
     <target name="run-sharepoint-tests-postgresql" depends="compile-sharepoint-tests,calculate-sharepoint-tests-condition"
if="sharepoint-tests.include">
         <mkdir dir="test-postgresql-output/sharepoint"/>
         <junit fork="true" maxmemory="128m" dir="test-postgresql-output/sharepoint" outputtoformatters="true"
showoutput="true" haltonfailure="true">
@@ -2742,25 +3014,25 @@
     <target name="run-tests-derby-lgpl-connectors" depends="run-tests-derby-jcifs-connector"/>
     <target name="run-tests-derby-proprietary-connectors" depends="run-tests-derby-documentum-connector,run-tests-derby-filenet-connector,run-tests-derby-livelink-connector,run-tests-derby-memex-connector,run-tests-derby-meridio-connector,run-tests-derby-sharepoint-connector"/>
     
-    <target name="end-to-end-tests-derby" depends="run-filesystem-tests-derby,run-cmis-tests-derby,run-sharepoint-tests-derby"/>
+    <target name="end-to-end-tests-derby" depends="run-filesystem-tests-derby,run-wiki-tests-derby,run-cmis-tests-derby,run-sharepoint-tests-derby"/>
 
     <target name="run-tests-postgresql-open-connectors" depends="run-tests-postgresql-activedirectory-connector,run-tests-postgresql-cmis-connector,run-tests-postgresql-filesystem-connector,run-tests-postgresql-nullauthority-connector,run-tests-postgresql-nulloutput-connector,run-tests-postgresql-rss-connector,run-tests-postgresql-solr-connector,run-tests-postgresql-webcrawler-connector,run-tests-postgresql-wiki-connector,run-tests-postgresql-jdbc-connector,run-tests-postgresql-opensearchserver-connector"/>
     <target name="run-tests-postgresql-lgpl-connectors" depends="run-tests-postgresql-jcifs-connector"/>
     <target name="run-tests-postgresql-proprietary-connectors" depends="run-tests-postgresql-documentum-connector,run-tests-postgresql-filenet-connector,run-tests-postgresql-livelink-connector,run-tests-postgresql-memex-connector,run-tests-postgresql-meridio-connector,run-tests-postgresql-sharepoint-connector"/>
     
-    <target name="end-to-end-tests-postgresql" depends="run-filesystem-tests-postgresql,run-cmis-tests-postgresql,run-sharepoint-tests-postgresql"/>
+    <target name="end-to-end-tests-postgresql" depends="run-filesystem-tests-postgresql,run-wiki-tests-postgresql,run-cmis-tests-postgresql,run-sharepoint-tests-postgresql"/>
 
     <target name="run-tests-HSQLDB-open-connectors" depends="run-tests-HSQLDB-activedirectory-connector,run-tests-HSQLDB-cmis-connector,run-tests-HSQLDB-filesystem-connector,run-tests-HSQLDB-nullauthority-connector,run-tests-HSQLDB-nulloutput-connector,run-tests-HSQLDB-rss-connector,run-tests-HSQLDB-solr-connector,run-tests-HSQLDB-webcrawler-connector,run-tests-HSQLDB-wiki-connector,run-tests-HSQLDB-jdbc-connector,run-tests-HSQLDB-opensearchserver-connector"/>
     <target name="run-tests-HSQLDB-lgpl-connectors" depends="run-tests-HSQLDB-jcifs-connector"/>
     <target name="run-tests-HSQLDB-proprietary-connectors" depends="run-tests-HSQLDB-documentum-connector,run-tests-HSQLDB-filenet-connector,run-tests-HSQLDB-livelink-connector,run-tests-HSQLDB-memex-connector,run-tests-HSQLDB-meridio-connector,run-tests-HSQLDB-sharepoint-connector"/>
     
-    <target name="end-to-end-tests-HSQLDB" depends="run-filesystem-tests-HSQLDB,run-cmis-tests-HSQLDB,run-sharepoint-tests-HSQLDB"/>
+    <target name="end-to-end-tests-HSQLDB" depends="run-filesystem-tests-HSQLDB,run-wiki-tests-HSQLDB,run-cmis-tests-HSQLDB,run-sharepoint-tests-HSQLDB"/>
 
-    <target name="end-to-end-loadtests-derby" depends="run-filesystem-loadtests-derby,run-cmis-loadtests-derby,run-sharepoint-loadtests-derby"/>
+    <target name="end-to-end-loadtests-derby" depends="run-filesystem-loadtests-derby,run-wiki-loadtests-derby,run-cmis-loadtests-derby,run-sharepoint-loadtests-derby"/>
 
-    <target name="end-to-end-loadtests-postgresql" depends="run-filesystem-loadtests-postgresql,run-cmis-loadtests-postgresql,run-sharepoint-loadtests-postgresql"/>
+    <target name="end-to-end-loadtests-postgresql" depends="run-filesystem-loadtests-postgresql,run-wiki-loadtests-postgresql,run-cmis-loadtests-postgresql,run-sharepoint-loadtests-postgresql"/>
 
-    <target name="end-to-end-loadtests-HSQLDB" depends="run-filesystem-loadtests-HSQLDB,run-cmis-loadtests-HSQLDB,run-sharepoint-loadtests-HSQLDB"/>
+    <target name="end-to-end-loadtests-HSQLDB" depends="run-filesystem-loadtests-HSQLDB,run-wiki-loadtests-HSQLDB,run-cmis-loadtests-HSQLDB,run-sharepoint-loadtests-HSQLDB"/>
 
 
     <target name="deliver-open-connectors" depends="deliver-nullauthority-connector,deliver-activedirectory-connector,deliver-cmis-connector,deliver-filesystem-connector,deliver-rss-connector,deliver-webcrawler-connector,deliver-wiki-connector,deliver-jdbc-connector"/>

Modified: incubator/lcf/branches/CONNECTORS-256/connectors/wiki/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-256/connectors/wiki/build.xml?rev=1182025&r1=1182024&r2=1182025&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-256/connectors/wiki/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-256/connectors/wiki/build.xml Tue Oct 11 19:06:15 2011
@@ -74,10 +74,52 @@
     
     <target name="build-tests"/>
     
-    <target name="run-tests"/>
-    <target name="run-tests-derby"/>
-    <target name="run-tests-postgresql"/>
-    <target name="run-tests-HSQLDB"/>
+    <target name="run-tests" depends="compile-tests"/>
+    
+    <target name="run-tests-derby" depends="compile-tests">
+        <mkdir dir="test-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="lib">
+                    <include name="*.jar"/>
+                </fileset>
+                <pathelement location="build/connector/classes"/>
+                <pathelement location="build/connector-tests/classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <!-- MHL -->
+        </junit>
+    </target>
+    
+    <target name="run-tests-postgresql" depends="compile-tests">
+        <mkdir dir="test-output-postgresql"/>
+        <junit fork="true" maxmemory="128m" dir="test-output-postgresql" showoutput="true"
haltonfailure="true">
+            <classpath>
+                <fileset dir="lib">
+                    <include name="*.jar"/>
+                </fileset>
+                <pathelement location="build/connector/classes"/>
+                <pathelement location="build/connector-tests/classes"/>
+            </classpath>
+            <!-- MHL -->
+        </junit>
+    </target>
+
+    <target name="run-tests-HSQLDB" depends="compile-tests">
+        <mkdir dir="test-output-HSQLDB"/>
+        <junit fork="true" maxmemory="128m" dir="test-output-HSQLDB" showoutput="true"
haltonfailure="true">
+            <classpath>
+                <fileset dir="lib">
+                    <include name="*.jar"/>
+                </fileset>
+                <pathelement location="build/connector/classes"/>
+                <pathelement location="build/connector-tests/classes"/>
+            </classpath>
+            <!-- MHL -->
+        </junit>
+    </target>
+    
     <target name="all" depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-postgresql,run-tests-HSQLDB"/>
     
 </project>



Mime
View raw message