Index: /trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java	(revision 14067)
+++ /trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java	(revision 14068)
@@ -163,7 +163,7 @@
             try {
                 final Object obj = get(PT_TIME);
-                final Date time = obj instanceof Date ? (Date) obj : DateUtils.fromString(obj.toString());
-                this.time = time.getTime() / 1000.;
-                return time;
+                final Date date = obj instanceof Date ? (Date) obj : DateUtils.fromString(obj.toString());
+                time = date.getTime() / 1000.;
+                return date;
             } catch (UncheckedParseException e) {
                 Logging.warn(e);
Index: /trunk/src/org/openstreetmap/josm/gui/progress/swing/ProgressMonitorExecutor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/progress/swing/ProgressMonitorExecutor.java	(revision 14067)
+++ /trunk/src/org/openstreetmap/josm/gui/progress/swing/ProgressMonitorExecutor.java	(revision 14068)
@@ -51,4 +51,5 @@
                 t = cancellationException;
             } catch (ExecutionException executionException) {
+                Logging.trace(executionException);
                 t = executionException.getCause();
             } catch (InterruptedException interruptedException) {
Index: /trunk/test/unit/org/openstreetmap/josm/TestUtils.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 14067)
+++ /trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 14068)
@@ -2,6 +2,6 @@
 package org.openstreetmap.josm;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -52,5 +52,4 @@
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
-
 import com.google.common.io.ByteStreams;
 
@@ -460,5 +459,5 @@
             }
         } catch (IOException e) {
-            fail(e.toString());
+            throw new RuntimeException(e);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java	(revision 14067)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java	(revision 14068)
@@ -10,5 +10,4 @@
 import org.junit.Test;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.GpxLayerTest;
Index: /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/AllMappaintTests.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/AllMappaintTests.java	(revision 14067)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/AllMappaintTests.java	(revision 14068)
@@ -5,6 +5,4 @@
 import org.junit.runners.Suite;
 import org.openstreetmap.josm.gui.mappaint.mapcss.AllMapCSSTests;
-
-import junit.framework.TestCase;
 
 /**
@@ -17,5 +15,5 @@
     AllMapCSSTests.class
 })
-public class AllMappaintTests extends TestCase{
+public class AllMappaintTests {
 
 }
Index: /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/AllMapCSSTests.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/AllMapCSSTests.java	(revision 14067)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/AllMapCSSTests.java	(revision 14068)
@@ -4,6 +4,4 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
-
-import junit.framework.TestCase;
 
 /**
@@ -18,5 +16,5 @@
     ChildOrParentSelectorTest.class
 })
-public class AllMapCSSTests extends TestCase{
+public class AllMapCSSTests {
 
 }
Index: /trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.java	(revision 14067)
+++ /trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.java	(revision 14068)
@@ -3,4 +3,5 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -95,10 +96,10 @@
         q = parser.parse("open=true");
         assertNotNull(q);
-        assertEquals(Boolean.TRUE, q.getRestrictionToOpen());
+        assertTrue(q.getRestrictionToOpen());
 
         // OK
         q = parser.parse("open=false");
         assertNotNull(q);
-        assertEquals(Boolean.FALSE, q.getRestrictionToOpen());
+        assertFalse(q.getRestrictionToOpen());
 
         // illegal value for open
@@ -118,10 +119,10 @@
         q = parser.parse("closed=true");
         assertNotNull(q);
-        assertEquals(Boolean.TRUE, q.getRestrictionToClosed());
+        assertTrue(q.getRestrictionToClosed());
 
         // OK
         q = parser.parse("closed=false");
         assertNotNull(q);
-        assertEquals(Boolean.FALSE, q.getRestrictionToClosed());
+        assertFalse(q.getRestrictionToClosed());
 
         // illegal value for open
Index: /trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java	(revision 14067)
+++ /trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java	(revision 14068)
@@ -172,7 +172,10 @@
     @Test
     public void testTicket16496() throws Exception {
-        assertEquals("2018-05-30T16:28:59.400Z", iso8601.format(readDate("$GNRMC,162859.400,A,4543.03388,N,00058.19870,W,45.252,209.07,300518,,,D,V*13")));
-        assertEquals("2018-05-30T16:28:59.400Z", iso8601.format(readDate("$GNRMC,162859.40,A,4543.03388,N,00058.19870,W,45.252,209.07,300518,,,D,V*23")));
-        assertEquals("2018-05-30T16:28:59.400Z", iso8601.format(readDate("$GNRMC,162859.4,A,4543.03388,N,00058.19870,W,45.252,209.07,300518,,,D,V*13")));
+        assertEquals("2018-05-30T16:28:59.400Z", iso8601.format(
+                readDate("$GNRMC,162859.400,A,4543.03388,N,00058.19870,W,45.252,209.07,300518,,,D,V*13")));
+        assertEquals("2018-05-30T16:28:59.400Z", iso8601.format(
+                readDate("$GNRMC,162859.40,A,4543.03388,N,00058.19870,W,45.252,209.07,300518,,,D,V*23")));
+        assertEquals("2018-05-30T16:28:59.400Z", iso8601.format(
+                readDate("$GNRMC,162859.4,A,4543.03388,N,00058.19870,W,45.252,209.07,300518,,,D,V*13")));
     }
 }