Changeset 7040 in josm

Timestamp:

2014-05-02T00:04:06+02:00 (10 years ago)

Author:

Don-vip

Message:

tests/build update:

• update Jacoco to version 0.7.0
• compile performance tests even if not run by ant task
• do not create empty package-info.class files in javac task
• move RemoteControl test to unit tests to get coverage information
• fix NPEs seen in tests in headless mode
• proper test failures when properties files can not be loaded

Location:

trunk

Files:

• build.xml (modified) (3 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) (1 diff)
• test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) (1 diff)
• test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java (modified) (2 diffs)
• test/functional/org/openstreetmap/josm/io/remotecontrol (deleted)
• test/unit/org/openstreetmap/josm/io/remotecontrol (added)
• test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java (copied) (copied from trunk/test/functional/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java ) (1 diff)
• tools/jacocoant.jar (modified) ( previous)

trunk/build.xml

@@ -199 +199 @@
         <!-- COTS -->
         <javac srcdir="src" includes="com/**,oauth/**,org/apache/commons/codec/**,org/glassfish/**" nowarn="on"
-                destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="iso-8859-1">
+                destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="iso-8859-1">
             <!-- get rid of "internal proprietary API" warning -->
                 <compilerarg value="-XDignore.symbol.file"/>
@@ -205 +205 @@
         <!-- JMapViewer/JOSM -->
         <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java" 
-                destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="UTF-8">
+                destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
             <compilerarg value="-Xlint:cast"/>
             <compilerarg value="-Xlint:deprecation"/>
@@ -268 +268 @@
     </target>
     <target name="test-compile" depends="test-init,dist">
-        <javac srcdir="${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="UTF-8">
+        <javac srcdir="${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on"
+                includeantruntime="false" createMissingPackageInfoClass="off" encoding="UTF-8">
             <compilerarg value="-Xlint:all"/>
             <compilerarg value="-Xlint:-serial"/>
         </javac>
-        <javac srcdir="${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="UTF-8">
+        <javac srcdir="${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on"
+                includeantruntime="false" createMissingPackageInfoClass="off" encoding="UTF-8">
+            <compilerarg value="-Xlint:all"/>
+            <compilerarg value="-Xlint:-serial"/>
+        </javac>
+        <javac srcdir="${test.dir}/performance" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on"
+                includeantruntime="false" createMissingPackageInfoClass="off" encoding="UTF-8">
             <compilerarg value="-Xlint:all"/>
             <compilerarg value="-Xlint:-serial"/>

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java

@@ -18 +18 @@
     private final Rectangle clipBounds;
 
+    /**
+     * Constructs a new {@code LineClip}.
+     * @param p1 start point of the clipped line
+     * @param p2 end point of the clipped line
+     * @param clipBounds Clip bounds
+     */
     public LineClip(Point p1, Point p2, Rectangle clipBounds) {
         this.p1 = p1;
@@ -29 +35 @@
      */
     public boolean execute() {
+        if (clipBounds == null) {
+            return false;
+        }
         return cohenSutherland(p1.x, p1.y, p2.x, p2.y, clipBounds.x , clipBounds.y, clipBounds.x + clipBounds.width, clipBounds.y + clipBounds.height);
     }
@@ -35 +44 @@
      * @return start point of the clipped line
      */
-    public Point getP1()
-    {
+    public Point getP1() {
         return p1;
     }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -1175 +1175 @@
         GeneralPath onewayArrowsCasing = showOneway ? new GeneralPath() : null;
         Rectangle bounds = g.getClipBounds();
-        bounds.grow(100, 100);                  // avoid arrow heads at the border
+        if (bounds != null) {
+            // avoid arrow heads at the border
+            bounds.grow(100, 100);
+        }
 
         double wayLength = 0;

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -141 +141 @@
         //
         try (InputStream is = MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties")) {
+            if (is == null) {
+                throw new IOException();
+            }
             testProperties.load(is);
         } catch(IOException e){

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -148 +148 @@
         //
         try (InputStream is = MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties")) {
+            if (is == null) {
+                throw new IOException();
+            }
             testProperties.load(is);
         } catch(IOException e){

trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java

@@ -19 +19 @@
 
     @Test
-    public void test1()  throws OsmTransferException {
+    public void testNode()  throws OsmTransferException {
         OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.NODE,266187);
         HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);
@@ -27 +27 @@
 
     @Test
-    public void test2()  throws OsmTransferException {
-        OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.WAY,32916);
+    public void testWay()  throws OsmTransferException {
+        OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.WAY,3058844);
         HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);
-        History h = ds.getHistory(32916, OsmPrimitiveType.WAY);
+        History h = ds.getHistory(3058844, OsmPrimitiveType.WAY);
         System.out.println("num versions: " + h.getNumVersions());
     }
 
     @Test
-    public void test3()  throws OsmTransferException {
+    public void testRelation()  throws OsmTransferException {
         OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.RELATION,49);
         HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java

@@ -30 +30 @@
 
 /**
- * Functional tests for Remote Control
+ * Unit tests for Remote Control
  */
 public class RemoteControlTest {