Changeset 13103 in josm


Ignore:
Timestamp:
2017-11-09T20:32:32+01:00 (9 days ago)
Author:
Don-vip
Message:

see #15560 - repair coverage, fix typo, increase integration test timeout

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r13097 r13103  
    3232        <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
    3333        <property name="java.lang.version" value="1.8" />
     34        <property name="jacoco.includes" value="org.openstreetmap.josm.*" />
    3435        <property name="jacoco.inclbootstrapclasses" value="false" />
    3536        <property name="jacoco.inclnolocationclasses" value="false" />
     
    457458        <sequential>
    458459            <echo message="Running @{testfamily}@{testITsuffix} tests with JUnit"/>
    459             <jacoco:coverage destfile="${test.dir}/jacoco@{testITsuffix}.exec" enabled="@{coverage}" includes="org.openstreetmap.josm.*${additionalCoverage}"
    460                 inclbootstrapclasses="${jacoco.inclbootstrapclasses}" inclnolocationclasses="${jacoco.inclnolocationclasses}">
     460            <jacoco:coverage destfile="${test.dir}/jacoco@{testITsuffix}.exec" enabled="@{coverage}" includes="${jacoco.includes}"
     461                inclbootstrapclasses="${jacoco.inclbootstrapclasses}" inclnolocationclasses="${jacoco.inclnolocationclasses}">
    461462                <junit printsummary="yes" fork="true" forkmode="once">
    462463                    <jvmarg value="-Dfile.encoding=UTF-8"/>
  • trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java

    r9460 r13103  
    186186
    187187    /**
    188      * Determines if this primitive has no timestam information.
    189      * @return {@code true} if this primitive has no timestam information
     188     * Determines if this primitive has no timestamp information.
     189     * @return {@code true} if this primitive has no timestamp information
    190190     * @see #getTimestamp
    191191     * @see #getRawTimestamp
  • trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java

    r12858 r13103  
    3838    @Rule
    3939    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    40     public JOSMTestRules test = new JOSMTestRules().preferences();
     40    public JOSMTestRules test = new JOSMTestRules().preferences().timeout(20000);
    4141
    4242    /**
Note: See TracChangeset for help on using the changeset viewer.