Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 9748)
+++ trunk/build.xml	(revision 9749)
@@ -642,5 +642,5 @@
     <target name="checkstyle">
         <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties" 
-             classpath="tools/checkstyle/checkstyle-6.14.1-all.jar"/>
+             classpath="tools/checkstyle/checkstyle-6.15-all.jar"/>
         <checkstyle config="tools/checkstyle/josm_checks.xml">
             <fileset dir="${basedir}/src/org/openstreetmap/josm" includes="**/*.java" 
Index: trunk/test/unit/org/openstreetmap/josm/io/NmeaReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/NmeaReaderTest.java	(revision 9748)
+++ trunk/test/unit/org/openstreetmap/josm/io/NmeaReaderTest.java	(revision 9749)
@@ -2,5 +2,5 @@
 package org.openstreetmap.josm.io;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 import java.io.FileInputStream;
@@ -9,5 +9,4 @@
 import java.util.List;
 
-import nl.jqno.equalsverifier.EqualsVerifier;
 import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -15,4 +14,6 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.io.NmeaReader.NMEA_TYPE;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
 
 /**
Index: trunk/test/unit/org/openstreetmap/josm/io/OsmWriterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/OsmWriterTest.java	(revision 9748)
+++ trunk/test/unit/org/openstreetmap/josm/io/OsmWriterTest.java	(revision 9749)
@@ -13,8 +13,14 @@
 import org.openstreetmap.josm.tools.Utils;
 
+/**
+ * Unit tests of {@link OsmWriter} class.
+ */
 public class OsmWriterTest {
 
+    /**
+     * Unit test of {@link OsmWriter#byIdComparator}.
+     */
     @Test
-    public void testByIdComparator() throws Exception {
+    public void testByIdComparator() {
 
         final List<NodeData> ids = new ArrayList<>();