incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1146775 - in /incubator/lcf/branches/CONNECTORS-223/connectors: activedirectory/connector/src/test/ activedirectory/connector/src/test/java/ activedirectory/tests/ documentum/connector/src/test/ documentum/connector/src/test/java/ filenet/...
Date Thu, 14 Jul 2011 16:11:15 GMT
Author: kwright
Date: Thu Jul 14 16:11:13 2011
New Revision: 1146775

URL: http://svn.apache.org/viewvc?rev=1146775&view=rev
Log:
Move tests into maven-compatible places

Added:
    incubator/lcf/branches/CONNECTORS-223/connectors/activedirectory/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/activedirectory/connector/src/test/java/
    incubator/lcf/branches/CONNECTORS-223/connectors/documentum/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/documentum/connector/src/test/java/
    incubator/lcf/branches/CONNECTORS-223/connectors/filenet/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/filenet/connector/src/test/java/
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/java/
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/java/org/
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/java/org/apache/
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/Sanity.java
      - copied unchanged from r1146688, incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/tests/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/Sanity.java
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityHSQLDB.java
      - copied unchanged from r1146688, incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/tests/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityHSQLDB.java
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityPostgresql.java
      - copied unchanged from r1146688, incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/tests/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityPostgresql.java
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/TestBase.java
      - copied unchanged from r1146688, incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/tests/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/TestBase.java
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/TestBaseHSQLDB.java
      - copied unchanged from r1146688, incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/tests/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/TestBaseHSQLDB.java
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/TestBasePostgresql.java
      - copied unchanged from r1146688, incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/tests/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/TestBasePostgresql.java
    incubator/lcf/branches/CONNECTORS-223/connectors/gts/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/gts/connector/src/test/java/
    incubator/lcf/branches/CONNECTORS-223/connectors/jcifs/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/jcifs/connector/src/test/java/
    incubator/lcf/branches/CONNECTORS-223/connectors/jdbc/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/jdbc/connector/src/test/java/
    incubator/lcf/branches/CONNECTORS-223/connectors/livelink/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/livelink/connector/src/test/java/
    incubator/lcf/branches/CONNECTORS-223/connectors/meridio/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/meridio/connector/src/test/java/
    incubator/lcf/branches/CONNECTORS-223/connectors/nullauthority/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/nullauthority/connector/src/test/java/
    incubator/lcf/branches/CONNECTORS-223/connectors/nulloutput/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/nulloutput/connector/src/test/java/
    incubator/lcf/branches/CONNECTORS-223/connectors/rss/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/rss/connector/src/test/java/
    incubator/lcf/branches/CONNECTORS-223/connectors/sharepoint/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/sharepoint/connector/src/test/java/
    incubator/lcf/branches/CONNECTORS-223/connectors/solr/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/solr/connector/src/test/java/
    incubator/lcf/branches/CONNECTORS-223/connectors/webcrawler/connector/src/test/
    incubator/lcf/branches/CONNECTORS-223/connectors/webcrawler/connector/src/test/java/
Removed:
    incubator/lcf/branches/CONNECTORS-223/connectors/activedirectory/tests/
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/tests/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/Sanity.java
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/tests/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityHSQLDB.java
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/tests/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityPostgresql.java
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/tests/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/TestBase.java
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/tests/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/TestBaseHSQLDB.java
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/tests/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/TestBasePostgresql.java
Modified:
    incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/build.xml

Modified: incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/build.xml?rev=1146775&r1=1146774&r2=1146775&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-223/connectors/filesystem/build.xml Thu Jul 14 16:11:13
2011
@@ -54,9 +54,9 @@
         <copy todir="dist/lib" file="build/jar/mcf-filesystem-connector.jar"/>
     </target>
 
-    <target name="compile-tests" depends="compile-connector">
-        <mkdir dir="build/tests/classes"/>
-        <javac srcdir="tests/src/main/java" destdir="build/tests/classes" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
+    <target name="compile-connector-tests" depends="compile-connector">
+        <mkdir dir="build/connector-tests/classes"/>
+        <javac srcdir="connector/src/test/java" destdir="build/connector-tests/classes"
target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
             <classpath>
                  <fileset dir="lib"> 
                     <include name="*.jar"/> 
@@ -66,11 +66,15 @@
         </javac>
     </target>
     
-    <target name="jar-tests" depends="compile-tests">
+    <target name="compile-tests" depends="compile-connector-tests"/>
+    
+    <target name="jar-connector-tests" depends="compile-connector-tests">
         <mkdir dir="build/test-jar"/>
-        <jar destfile="build/test-jar/mcf-filesystem-connector-tests.jar" basedir="build/tests/classes"/>
+        <jar destfile="build/test-jar/mcf-filesystem-connector-tests.jar" basedir="build/connector-tests/classes"/>
     </target>
 
+    <target name="jar-tests" depends="jar-connector-tests"/>
+    
     <target name="run-tests" depends="compile-tests">
         <mkdir dir="test-output"/>
         <junit fork="true" maxmemory="128m" dir="test-output" showoutput="true" haltonfailure="true">
@@ -79,7 +83,7 @@
                     <include name="*.jar"/>
                 </fileset>
                 <pathelement location="build/connector/classes"/>
-                <pathelement location="build/tests/classes"/>
+                <pathelement location="build/connector-tests/classes"/>
             </classpath>
             <test name="org.apache.manifoldcf.crawler.connectors.filesystem.tests.Sanity"
todir="test-output"/>
             <!-- MHL -->
@@ -94,7 +98,7 @@
                     <include name="*.jar"/>
                 </fileset>
                 <pathelement location="build/connector/classes"/>
-                <pathelement location="build/tests/classes"/>
+                <pathelement location="build/connector-tests/classes"/>
             </classpath>
             <test name="org.apache.manifoldcf.crawler.connectors.filesystem.tests.SanityPostgresql"
todir="test-output-postgresql"/>
             <!-- MHL -->
@@ -109,7 +113,7 @@
                     <include name="*.jar"/>
                 </fileset>
                 <pathelement location="build/connector/classes"/>
-                <pathelement location="build/tests/classes"/>
+                <pathelement location="build/connector-tests/classes"/>
             </classpath>
             <test name="org.apache.manifoldcf.crawler.connectors.filesystem.tests.SanityHSQLDB"
todir="test-output-HSQLDB"/>
             <!-- MHL -->



Mime
View raw message