Changeset 13103 in josm for trunk

Timestamp:

2017-11-09T20:32:32+01:00 (6 years ago)

Author:

Don-vip

Message:

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

Location:

trunk

Files:

• build.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/IPrimitive.java (modified) (1 diff)
• test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java (modified) (1 diff)

trunk/build.xml

@@ -32 +32 @@
         <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
         <property name="java.lang.version" value="1.8" />
+        <property name="jacoco.includes" value="org.openstreetmap.josm.*" />
         <property name="jacoco.inclbootstrapclasses" value="false" />
         <property name="jacoco.inclnolocationclasses" value="false" />
@@ -457 +458 @@
         <sequential>
             <echo message="Running @{testfamily}@{testITsuffix} tests with JUnit"/>
-            <jacoco:coverage destfile="${test.dir}/jacoco@{testITsuffix}.exec" enabled="@{coverage}" includes="org.openstreetmap.josm.*${additionalCoverage}"
-                inclbootstrapclasses="${jacoco.inclbootstrapclasses}" inclnolocationclasses="${jacoco.inclnolocationclasses}">
+            <jacoco:coverage destfile="${test.dir}/jacoco@{testITsuffix}.exec" enabled="@{coverage}" includes="${jacoco.includes}"
+                inclbootstrapclasses="${jacoco.inclbootstrapclasses}" inclnolocationclasses="${jacoco.inclnolocationclasses}">
                 <junit printsummary="yes" fork="true" forkmode="once">
                     <jvmarg value="-Dfile.encoding=UTF-8"/>

trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java

@@ -186 +186 @@
 
     /**
-     * Determines if this primitive has no timestam information.
-     * @return {@code true} if this primitive has no timestam information
+     * Determines if this primitive has no timestamp information.
+     * @return {@code true} if this primitive has no timestamp information
      * @see #getTimestamp
      * @see #getRawTimestamp

trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java

@@ -38 +38 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
+    public JOSMTestRules test = new JOSMTestRules().preferences().timeout(20000);
 
     /**