|
|
@ -392,6 +392,11 @@ is divided into following sections: |
|
|
|
</and> |
|
|
|
</and> |
|
|
|
</condition> |
|
|
|
</condition> |
|
|
|
</target> |
|
|
|
</target> |
|
|
|
|
|
|
|
<target name="-init-test-properties"> |
|
|
|
|
|
|
|
<property name="test.binaryincludes" value="<nothing>"/> |
|
|
|
|
|
|
|
<property name="test.binarytestincludes" value=""/> |
|
|
|
|
|
|
|
<property name="test.binaryexcludes" value=""/> |
|
|
|
|
|
|
|
</target> |
|
|
|
<target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}"> |
|
|
|
<target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}"> |
|
|
|
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3"> |
|
|
|
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3"> |
|
|
|
<attribute default="${includes}" name="includes"/> |
|
|
|
<attribute default="${includes}" name="includes"/> |
|
|
@ -415,7 +420,7 @@ is divided into following sections: |
|
|
|
</sequential> |
|
|
|
</sequential> |
|
|
|
</macrodef> |
|
|
|
</macrodef> |
|
|
|
</target> |
|
|
|
</target> |
|
|
|
<target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}"> |
|
|
|
<target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}"> |
|
|
|
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3"> |
|
|
|
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3"> |
|
|
|
<attribute default="${includes}" name="includes"/> |
|
|
|
<attribute default="${includes}" name="includes"/> |
|
|
|
<attribute default="${excludes}" name="excludes"/> |
|
|
|
<attribute default="${excludes}" name="excludes"/> |
|
|
@ -425,7 +430,11 @@ is divided into following sections: |
|
|
|
<sequential> |
|
|
|
<sequential> |
|
|
|
<property name="junit.forkmode" value="perTest"/> |
|
|
|
<property name="junit.forkmode" value="perTest"/> |
|
|
|
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> |
|
|
|
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> |
|
|
|
<batchtest todir="${build.test.results.dir}"/> |
|
|
|
<batchtest todir="${build.test.results.dir}"> |
|
|
|
|
|
|
|
<fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}"> |
|
|
|
|
|
|
|
<filename name="${test.binarytestincludes}"/> |
|
|
|
|
|
|
|
</fileset> |
|
|
|
|
|
|
|
</batchtest> |
|
|
|
<syspropertyset> |
|
|
|
<syspropertyset> |
|
|
|
<propertyref prefix="test-sys-prop."/> |
|
|
|
<propertyref prefix="test-sys-prop."/> |
|
|
|
<mapper from="test-sys-prop.*" to="*" type="glob"/> |
|
|
|
<mapper from="test-sys-prop.*" to="*" type="glob"/> |
|
|
@ -548,7 +557,7 @@ is divided into following sections: |
|
|
|
</sequential> |
|
|
|
</sequential> |
|
|
|
</macrodef> |
|
|
|
</macrodef> |
|
|
|
</target> |
|
|
|
</target> |
|
|
|
<target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch"> |
|
|
|
<target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch"> |
|
|
|
<macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3"> |
|
|
|
<macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3"> |
|
|
|
<attribute default="${includes}" name="includes"/> |
|
|
|
<attribute default="${includes}" name="includes"/> |
|
|
|
<attribute default="${excludes}" name="excludes"/> |
|
|
|
<attribute default="${excludes}" name="excludes"/> |
|
|
@ -558,7 +567,11 @@ is divided into following sections: |
|
|
|
<sequential> |
|
|
|
<sequential> |
|
|
|
<property name="junit.forkmode" value="perTest"/> |
|
|
|
<property name="junit.forkmode" value="perTest"/> |
|
|
|
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> |
|
|
|
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> |
|
|
|
<batchtest todir="${build.test.results.dir}"/> |
|
|
|
<batchtest todir="${build.test.results.dir}"> |
|
|
|
|
|
|
|
<fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}"> |
|
|
|
|
|
|
|
<filename name="${test.binarytestincludes}"/> |
|
|
|
|
|
|
|
</fileset> |
|
|
|
|
|
|
|
</batchtest> |
|
|
|
<syspropertyset> |
|
|
|
<syspropertyset> |
|
|
|
<propertyref prefix="test-sys-prop."/> |
|
|
|
<propertyref prefix="test-sys-prop."/> |
|
|
|
<mapper from="test-sys-prop.*" to="*" type="glob"/> |
|
|
|
<mapper from="test-sys-prop.*" to="*" type="glob"/> |
|
|
@ -930,7 +943,7 @@ is divided into following sections: |
|
|
|
<target if="has.persistence.xml" name="-copy-persistence-xml"> |
|
|
|
<target if="has.persistence.xml" name="-copy-persistence-xml"> |
|
|
|
<mkdir dir="${build.classes.dir}/META-INF"/> |
|
|
|
<mkdir dir="${build.classes.dir}/META-INF"/> |
|
|
|
<copy todir="${build.classes.dir}/META-INF"> |
|
|
|
<copy todir="${build.classes.dir}/META-INF"> |
|
|
|
<fileset dir="${meta.inf.dir}" includes="persistence.xml"/> |
|
|
|
<fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/> |
|
|
|
</copy> |
|
|
|
</copy> |
|
|
|
</target> |
|
|
|
</target> |
|
|
|
<target name="-post-compile"> |
|
|
|
<target name="-post-compile"> |
|
|
|