incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1231802 - in /incubator/lcf/trunk: build.xml tests/gts/ tests/gts/build.xml tests/ifs-test-build.xml tests/rss/ tests/rss/build.xml
Date Mon, 16 Jan 2012 00:13:19 GMT
Author: kwright
Date: Mon Jan 16 00:13:18 2012
New Revision: 1231802

URL: http://svn.apache.org/viewvc?rev=1231802&view=rev
Log:
Convert over rss and gts tests.  Part of CONNECTORS-384.

Modified:
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/tests/gts/   (props changed)
    incubator/lcf/trunk/tests/gts/build.xml
    incubator/lcf/trunk/tests/ifs-test-build.xml
    incubator/lcf/trunk/tests/rss/   (props changed)
    incubator/lcf/trunk/tests/rss/build.xml

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1231802&r1=1231801&r2=1231802&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Mon Jan 16 00:13:18 2012
@@ -78,6 +78,7 @@
         <ant dir="tests/alfresco" target="clean"/>
         <ant dir="tests/cmis" target="clean"/>
         <ant dir="tests/filesystem" target="clean"/>
+        <ant dir="tests/gts" target="clean"/>
         
     </target>
 
@@ -2142,64 +2143,6 @@
         </javac>
     </target>
 
-    <target name="compile-gts-tests" depends="build-framework,build-filesystem-connector,build-gts-connector,calculate-gts-tests-condition,build-tests-filesystem-connector,build-tests-gts-connector"
if="gts-tests.include">
-        <mkdir dir="build/gts-tests/classes"/>
-        <javac srcdir="tests/gts/src/test/java" destdir="build/gts-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/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/filesystem/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/filesystem/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/gts/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/gts/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-            </classpath>
-        </javac>
-    </target>
-
-    <target name="compile-rss-tests" depends="build-framework,build-rss-connector,build-nulloutput-connector,calculate-rss-tests-condition,build-tests-rss-connector,build-tests-nulloutput-connector"
if="rss-tests.include">
-        <mkdir dir="build/rss-tests/classes"/>
-        <javac srcdir="tests/rss/src/test/java" destdir="build/rss-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/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/rss/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/rss/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-            </classpath>
-        </javac>
-    </target>
-
     <target name="compile-webcrawler-tests" depends="build-framework,build-webcrawler-connector,build-nulloutput-connector,calculate-webcrawler-tests-condition,build-tests-webcrawler-connector,build-tests-nulloutput-connector"
if="webcrawler-tests.include">
         <mkdir dir="build/webcrawler-tests/classes"/>
         <javac srcdir="tests/webcrawler/src/test/java" destdir="build/webcrawler-tests/classes"
target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
@@ -2405,212 +2348,28 @@
         </junit>
     </target>
 
-    <target name="run-gts-UI-tests-derby" depends="compile-gts-tests,calculate-gts-tests-condition"
if="gts-tests.include">
-        <mkdir dir="test-derby-output/gts"/>
-        <junit fork="true" maxmemory="128m" dir="test-derby-output/gts" 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/filesystem/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/filesystem/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/gts/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/gts/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/gts-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-
-            <test name="org.apache.manifoldcf.gts_tests.NavigationDerbyUI" todir="test-derby-output/gts"/>
-            <!-- MHL -->
-        </junit>
+    <target name="run-gts-UI-tests-derby" depends="build-tests-framework,build-tests-filesystem-connector,build-tests-gts-connector,calculate-gts-tests-condition"
if="gts-tests.include">
+        <ant dir="tests/gts" target="run-UI-derby"/>
     </target>
 
-    <target name="run-rss-UI-tests-derby" depends="compile-rss-tests,calculate-rss-tests-condition"
if="rss-tests.include">
-        <mkdir dir="test-derby-output/rss"/>
-        <junit fork="true" maxmemory="128m" dir="test-derby-output/rss" 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/rss/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/rss/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/rss-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-
-            <test name="org.apache.manifoldcf.rss_tests.NavigationDerbyUI" todir="test-derby-output/rss"/>
-            <!-- MHL -->
-        </junit>
+    <target name="run-rss-UI-tests-derby" depends="build-tests-framework,build-tests-rss-connector,build-tests-nulloutput-connector,calculate-rss-tests-condition"
if="rss-tests.include">
+        <ant dir="tests/rss" target="run-UI-derby"/>
     </target>
 
-    <target name="run-rss-loadtests-derby" depends="compile-rss-tests,calculate-rss-tests-condition"
if="rss-tests.include">
-        <mkdir dir="test-derby-output/rss"/>
-        <junit fork="true" maxmemory="384m" dir="test-derby-output/rss" 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/rss/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/rss/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/rss-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-
-            <test name="org.apache.manifoldcf.rss_tests.BigCrawlDerbyLT" todir="test-derby-output/rss"/>
-
-            <!-- MHL -->
-        </junit>
+    <target name="run-rss-loadtests-derby" depends="build-tests-framework,build-tests-rss-connector,build-tests-nulloutput-connector,calculate-rss-tests-condition"
if="rss-tests.include">
+        <ant dir="tests/rss" target="run-load-derby"/>
     </target>
 
-    <target name="run-rss-loadtests-postgresql" depends="compile-rss-tests,calculate-rss-tests-condition"
if="rss-tests.include">
-        <mkdir dir="test-postgresql-output/rss"/>
-        <junit fork="true" maxmemory="384m" dir="test-postgresql-output/rss" 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/rss/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/rss/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/rss-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-
-            <test name="org.apache.manifoldcf.rss_tests.BigCrawlPostgresqlLT" todir="test-postgresql-output/rss"/>
-
-            <!-- MHL -->
-        </junit>
+    <target name="run-rss-loadtests-postgresql" depends="build-tests-framework,build-tests-rss-connector,build-tests-nulloutput-connector,calculate-rss-tests-condition"
if="rss-tests.include">
+        <ant dir="tests/rss" target="run-load-postgresql"/>
     </target>
 
-    <target name="run-rss-loadtests-mysql" depends="compile-rss-tests,calculate-rss-tests-condition"
if="rss-tests.include">
-        <mkdir dir="test-mysql-output/rss"/>
-        <junit fork="true" maxmemory="384m" dir="test-mysql-output/rss" 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/rss/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/rss/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/rss-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-
-            <test name="org.apache.manifoldcf.rss_tests.BigCrawlMySQLLT" todir="test-mysql-output/rss"/>
-
-            <!-- MHL -->
-        </junit>
+    <target name="run-rss-loadtests-mysql" depends="build-tests-framework,build-tests-rss-connector,build-tests-nulloutput-connector,calculate-rss-tests-condition"
if="rss-tests.include">
+        <ant dir="tests/rss" target="run-load-mysql"/>
     </target>
 
-    <target name="run-rss-loadtests-HSQLDB" depends="compile-rss-tests,calculate-rss-tests-condition"
if="rss-tests.include">
-        <mkdir dir="test-HSQLDB-output/rss"/>
-        <junit fork="true" maxmemory="384m" dir="test-HSQLDB-output/rss" 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/rss/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/rss/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/rss-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-
-            <test name="org.apache.manifoldcf.rss_tests.BigCrawlHSQLDBLT" todir="test-HSQLDB-output/rss"/>
-
-            <!-- MHL -->
-        </junit>
+    <target name="run-rss-loadtests-HSQLDB" depends="build-tests-framework,build-tests-rss-connector,build-tests-nulloutput-connector,calculate-rss-tests-condition"
if="rss-tests.include">
+        <ant dir="tests/rss" target="run-load-HSQLDB"/>
     </target>
 
     <target name="run-webcrawler-UI-tests-derby" depends="compile-webcrawler-tests,calculate-webcrawler-tests-condition"
if="webcrawler-tests.include">

Propchange: incubator/lcf/trunk/tests/gts/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 16 00:13:18 2012
@@ -0,0 +1,7 @@
+target
+build
+test-derby-output
+test-HSQLDB-output
+test-HSQLDBext-output
+test-postgresql-output
+test-mysql-output

Modified: incubator/lcf/trunk/tests/gts/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/gts/build.xml?rev=1231802&r1=1231801&r2=1231802&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/gts/build.xml (original)
+++ incubator/lcf/trunk/tests/gts/build.xml Mon Jan 16 00:13:18 2012
@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 
-<project name="gts-connector" default="all">
+<project name="gts" default="all">
 
     <import file="../ifs-test-build.xml"/>
     

Modified: incubator/lcf/trunk/tests/ifs-test-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/ifs-test-build.xml?rev=1231802&r1=1231801&r2=1231802&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/ifs-test-build.xml (original)
+++ incubator/lcf/trunk/tests/ifs-test-build.xml Mon Jan 16 00:13:18 2012
@@ -19,5 +19,37 @@
 <project name="mcf-ifs-test-build">
 
     <import file="test-build.xml"/>
+
+    <path id="mcf-ifs-test-build.test-classpath">
+        <path refid="mcf-test-build.test-classpath"/>
+        <fileset dir="../../connectors/filesystem/dist/lib">
+            <include name="*.jar"/>
+        </fileset>
+        <fileset dir="../../connectors/filesystem/build/test-jar">
+            <include name="*.jar"/>
+        </fileset>
+    </path>
+
+    <path id="test-classpath">
+        <path refid="mcf-ifs-test-build.test-classpath"/>
+    </path>
+
+    <target name="run-derby" depends="mcf-test-build.run-derby"/>
+    <target name="run-postgresql" depends="mcf-test-build.run-postgresql"/>
+    <target name="run-HSQLDB" depends="mcf-test-build.run-HSQLDB"/>
+    <target name="run-HSQLDBext" depends="mcf-test-build.run-HSQLDBext"/>
+    <target name="run-mysql" depends="mcf-test-build.run-mysql"/>
+    
+    <target name="run-load-derby" depends="mcf-test-build.run-load-derby"/>
+    <target name="run-load-postgresql" depends="mcf-test-build.run-load-postgresql"/>
+    <target name="run-load-HSQLDB" depends="mcf-test-build.run-load-HSQLDB"/>
+    <target name="run-load-HSQLDBext" depends="mcf-test-build.run-load-HSQLDBext"/>
+    <target name="run-load-mysql" depends="mcf-test-build.run-load-mysql"/>
+    
+    <target name="run-UI-derby" depends="mcf-test-build.run-UI-derby"/>
+    <target name="run-UI-postgresql" depends="mcf-test-build.run-UI-postgresql"/>
+    <target name="run-UI-HSQLDB" depends="mcf-test-build.run-UI-HSQLDB"/>
+    <target name="run-UI-HSQLDBext" depends="mcf-test-build.run-UI-HSQLDBext"/>
+    <target name="run-UI-mysql" depends="mcf-test-build.run-UI-mysql"/>
     
 </project>

Propchange: incubator/lcf/trunk/tests/rss/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 16 00:13:18 2012
@@ -1 +1,7 @@
 target
+build
+test-derby-output
+test-HSQLDB-output
+test-HSQLDBext-output
+test-postgresql-output
+test-mysql-output

Modified: incubator/lcf/trunk/tests/rss/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/build.xml?rev=1231802&r1=1231801&r2=1231802&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/rss/build.xml (original)
+++ incubator/lcf/trunk/tests/rss/build.xml Mon Jan 16 00:13:18 2012
@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 
-<project name="rss-connector" default="all">
+<project name="rss" default="all">
 
     <import file="../ino-test-build.xml"/>
     



Mime
View raw message