Changeset 10171 in josm

Timestamp:

2016-05-10T01:31:36+02:00 (9 years ago)

Author:

Don-vip

Message:

update to checkstyle 6.18

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/io/GeoJSONWriter.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java (modified) (5 diffs)
• tools/checkstyle/checkstyle-6.17-all.jar (deleted)
• tools/checkstyle/checkstyle-6.18-all.jar (added)

trunk/build.xml

@@ -653 +653 @@
     <target name="checkstyle" depends="init-properties">
         <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
-             classpath="tools/checkstyle/checkstyle-6.17-all.jar"/>
+             classpath="tools/checkstyle/checkstyle-6.18-all.jar"/>
         <checkstyle config="tools/checkstyle/josm_checks.xml">
             <fileset dir="${base.dir}/src/org/openstreetmap/josm" includes="**/*.java"

trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java

@@ -124 +124 @@
         return builder
                 .add(BigDecimal.valueOf(c.getX()).setScale(11, RoundingMode.HALF_UP))
-                .add(BigDecimal.valueOf(c.getY()).setScale(11, RoundingMode.HALF_UP))
-                ;
+                .add(BigDecimal.valueOf(c.getY()).setScale(11, RoundingMode.HALF_UP));
     }
 

trunk/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
+
+import static org.junit.Assert.assertEquals;
 
 import org.junit.BeforeClass;
@@ -11 +13 @@
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-
+/**
+ * Unit tests of {@link GeoJSONWriter} class.
+ */
 public class GeoJSONWriterTest {
 
@@ -24 +26 @@
     }
 
+    /**
+     * Unit test
+     */
     @Test
-    public void testPoint() throws Exception {
+    public void testPoint() {
         final Node node = new Node(new LatLon(12.3, 4.56));
         node.put("name", "foo");
@@ -33 +38 @@
         final OsmDataLayer layer = new OsmDataLayer(ds, "foo", null);
         final GeoJSONWriter writer = new GeoJSONWriter(layer, ProjectionPreference.wgs84.getProjection());
-        assertThat(writer.write().trim(), is(("" +
+        assertEquals(("" +
                 "{\n" +
                 "    'type':'FeatureCollection',\n" +
@@ -59 +64 @@
                 "        }\n" +
                 "    ]\n" +
-                "}").replace("'", "\"")));
+                "}").replace("'", "\""), writer.write().trim());
     }
 }