Changeset 9501 in josm for trunk/build.xml

Timestamp:

2016-01-17T15:06:09+01:00 (8 years ago)

Author:

Don-vip

Message:

make the distinction between unit tests (*Test.java) and integration tests (*TestIT.java)

Location:

trunk

Files:

• . (modified) (1 prop)
• build.xml (modified) (6 diffs)

trunk

@@ -10 +10 @@
 taginfo-img
 build2
+junit*.properties
+foobar

@@ -10 +10 @@
 taginfo-img
 build2
+junit*.properties
+foobar

trunk/build.xml

@@ -321 +321 @@
         <init-test-preferences testfamily="functional"/>
         <init-test-preferences testfamily="performance"/>
+        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="tools/jacocoant.jar" />
     </target>
     <target name="test-clean">
@@ -326 +327 @@
         <delete dir="${test.dir}/report"/>
         <delete file="${test.dir}/jacoco.exec" />
+        <delete file="${test.dir}/jacocoIT.exec" />
         <delete file="${test.dir}/config/unit-josm.home/preferences.xml" />
         <delete file="${test.dir}/config/functional-josm.home/preferences.xml" />
@@ -370 +372 @@
     <macrodef name="call-junit">
         <attribute name="testfamily"/>
+        <attribute name="testITsuffix" default=""/>
         <sequential>
-            <echo message="Running @{testfamily} tests with JUnit"/>
-            <jacoco:coverage destfile="${test.dir}/jacoco.exec">
+            <echo message="Running @{testfamily}@{testITsuffix} tests with JUnit"/>
+            <jacoco:coverage destfile="${test.dir}/jacoco@{testITsuffix}.exec">
                 <junit printsummary="yes" fork="true" forkmode="once">
                     <jvmarg value="-Dfile.encoding=UTF-8"/>
@@ -388 +391 @@
                     <formatter type="xml"/>
                     <batchtest fork="yes" todir="${test.dir}/report">
-                        <fileset dir="${test.dir}/build/@{testfamily}" includes="**/*Test.class"/>
+                        <fileset dir="${test.dir}/build/@{testfamily}" includes="**/*Test@{testITsuffix}.class"/>
                     </batchtest>
                 </junit>
@@ -394 +397 @@
         </sequential>
     </macrodef>
-    <target name="test" depends="test-compile" 
+    <target name="test" depends="test-compile" unless="test.notRequired"
         description="Run unit, functional and performance tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password">
-        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="tools/jacocoant.jar" />
         <call-junit testfamily="unit"/>
         <call-junit testfamily="functional"/>
         <call-junit testfamily="performance"/>
     </target>
-    <target name="test-html" depends="test" description="Generate HTML test reports">
+    <target name="test-it" depends="test-compile" unless="test-it.notRequired"
+        description="Run integration tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password">
+        <call-junit testfamily="unit" testITsuffix="IT"/>
+        <call-junit testfamily="functional" testITsuffix="IT"/>
+        <call-junit testfamily="performance" testITsuffix="IT"/>
+    </target>
+    <target name="test-html" depends="test, test-it" description="Generate HTML test reports">
         <!-- May require additional ant dependencies like ant-trax package -->
         <junitreport todir="${test.dir}/report">
@@ -412 +420 @@
             <executiondata>
                 <file file="${test.dir}/jacoco.exec"/>
+                <file file="${test.dir}/jacocoIT.exec"/>
             </executiondata>
             <structure name="JOSM Test Coverage">

@@ -10 +10 @@
 taginfo-img
 build2
+junit*.properties
+foobar