Improve unit tests

[gpl/argeo-slc.git] / org.argeo.slc / src / main / config / include / ant / slc-factory-targets.xml

diff --git a/org.argeo.slc/src/main/config/include/ant/slc-factory-targets.xml b/org.argeo.slc/src/main/config/include/ant/slc-factory-targets.xml
index 6df84da2d24fc8941cb106147932f73a5d45d5b1..baa1ef763a009bfef9e1c1eb2eff6ebd1749a975 100644 (file)
--- a/org.argeo.slc/src/main/config/include/ant/slc-factory-targets.xml
+++ b/org.argeo.slc/src/main/config/include/ant/slc-factory-targets.xml
@@ -39,7 +39,7 @@ $LastChangedDate$
                <fileset dir="${main.libdir}">\r
                        <include name="**/*.jar" />\r
                </fileset>\r
-               <pathelement location="${compile.base}/${main.artifact}" />\r
+               <pathelement location="${dist.jar}/${main.artifact}.jar" />\r
        </path>\r
 \r
        <import file="slc-factory-macrodefs.xml" />\r
@@ -117,21 +117,21 @@ $LastChangedDate$
                <compile artifact="${main.artifact}" srcdir="${main.srcdir}" />\r
        </target>\r
 \r
-       <target name="build.test" depends="build.main">\r
+       <target name="jar.main" depends="build.main">\r
+               <createJar artifact="${main.artifact}" srcdir="${main.srcdir}" />\r
+       </target>\r
+\r
+       <target name="build.test" depends="jar.main">\r
                <compile artifact="${test.artifact}"\r
                         srcdir="${test.srcdir}"\r
                         classpathref="cp.test" />\r
        </target>\r
 \r
-       <target name="jar.main" depends="build.test">\r
-               <createJar artifact="${main.artifact}" srcdir="${main.srcdir}" />\r
-       </target>\r
-\r
        <target name="jar.sources" unless="flag.noSources">\r
                <createSourcesJar artifact="${main.artifact}" srcdir="${main.srcdir}" />\r
        </target>\r
 \r
-       <target name="jar.test" depends="jar.main,jar.sources">\r
+       <target name="jar.test" depends="build.test">\r
                <createJar artifact="${test.artifact}" srcdir="${test.srcdir}" />\r
        </target>\r
 \r
@@ -149,6 +149,8 @@ $LastChangedDate$
                                <fileset dir="${test.srcdir}">\r
                                        <include name="**/*Test*.java" />\r
                                        <exclude name="**/Abstract*.java" />\r
+                                       <exclude name="**/*TestDef*.java" />\r
+                                       <exclude name="**/*TestData*.java" />\r
                                </fileset>\r
                        </batchtest>\r
                </junit>\r
@@ -162,7 +164,7 @@ $LastChangedDate$
        </target>\r
 \r
        <target name="package.common"\r
-               depends="dist.unittest,dist.api,dist.apiWithSlc,dist.dependencies,dist.appli">\r
+               depends="dist.unittest,jar.sources,dist.api,dist.apiWithSlc,dist.dependencies,dist.appli">\r
        </target>\r
 \r
        <target name="dist.package" depends="package.common">\r