Changeset 35411 in osm for applications/editors


Ignore:
Timestamp:
2020-04-05T20:36:24+02:00 (5 years ago)
Author:
donvip
Message:

see #josm16860 - resolve test libraries using Ivy

File:
1 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/build-common.xml

    r35390 r35411  
    1414
    1515    <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
     16    <property name="josm.ivy"               location="../../core/ivy.xml"/>
    1617    <property name="josm.test.build.dir"    location="../../core/test/build"/>
    1718    <property name="jmockit.jar"            location="../00_core_test_lib/jmockit.jar"/>
     
    531532    </target>
    532533
    533     <path id="test.classpath">
    534         <!-- JMockit must be included before JUnit in the classpath -->
    535         <pathelement path="${jmockit.jar}"/>
    536         <fileset dir="../00_core_test_lib">
    537             <include name="**/*.jar"/>
    538             <exclude name="**/jmockit*.jar"/>
    539         </fileset>
    540         <fileset dir="${plugin.test.dir}/lib" erroronmissingdir="no">
    541             <include name="**/*.jar"/>
    542             <exclude name="**/*-sources.jar"/>
    543             <exclude name="**/*-javadoc.jar"/>
    544         </fileset>
    545         <fileset dir="lib" erroronmissingdir="no">
    546             <include name="**/*.jar"/>
    547             <exclude name="**/*-sources.jar"/>
    548             <exclude name="**/*-javadoc.jar"/>
    549         </fileset>
    550         <pathelement path="${plugin.resources.dir}"/>
    551         <pathelement path="${plugin.test.dir}/data"/>
    552         <pathelement path="${josm.test.build.dir}/unit"/>
    553         <pathelement path="${josm}"/>
    554         <pathelement path="${plugin.jar}"/>
    555         <pathelement path="${annotations.jar}"/>
    556     </path>
    557534    <macrodef name="init-test-preferences">
    558535        <sequential>
     
    570547        <mkdir dir="${plugin.test.dir}/report"/>
    571548        <init-test-preferences/>
     549        <ivy:retrieve pattern="../00_core_test_lib/[artifact].[ext]" conf="test"/>
     550        <path id="test.classpath">
     551            <!-- JMockit must be included before JUnit in the classpath -->
     552            <pathelement path="${jmockit.jar}"/>
     553            <fileset dir="../00_core_test_lib">
     554                <include name="**/*.jar"/>
     555                <exclude name="**/jmockit*.jar"/>
     556            </fileset>
     557            <fileset dir="${plugin.test.dir}/lib" erroronmissingdir="no">
     558                <include name="**/*.jar"/>
     559                <exclude name="**/*-sources.jar"/>
     560                <exclude name="**/*-javadoc.jar"/>
     561            </fileset>
     562            <fileset dir="lib" erroronmissingdir="no">
     563                <include name="**/*.jar"/>
     564                <exclude name="**/*-sources.jar"/>
     565                <exclude name="**/*-javadoc.jar"/>
     566            </fileset>
     567            <pathelement path="${plugin.resources.dir}"/>
     568            <pathelement path="${plugin.test.dir}/data"/>
     569            <pathelement path="${josm.test.build.dir}/unit"/>
     570            <pathelement path="${josm}"/>
     571            <pathelement path="${plugin.jar}"/>
     572            <pathelement path="${annotations.jar}"/>
     573        </path>
    572574    </target>
    573575    <target name="test-clean">
     
    593595    <target name="test" depends="dist, test-clean, test-compile" if="test.present"
    594596        description="Run unit tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password">
     597        <ivy:retrieve file="${josm.ivy}" pattern="../00_core_tools/[conf].[ext]" conf="jacocoant"/>
    595598        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="../00_core_tools/jacocoant.jar" />
    596599        <sequential>
Note: See TracChangeset for help on using the changeset viewer.