Changeset 14068 in josm for trunk

Timestamp:

2018-08-01T00:08:06+02:00 (6 years ago)

Author:

Don-vip

Message:

checkstyle/sonarqube

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/progress/swing/ProgressMonitorExecutor.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/TestUtils.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/mappaint/AllMappaintTests.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/AllMapCSSTests.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java

@@ -163 +163 @@
             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);

trunk/src/org/openstreetmap/josm/gui/progress/swing/ProgressMonitorExecutor.java

@@ -51 +51 @@
                 t = cancellationException;
             } catch (ExecutionException executionException) {
+                Logging.trace(executionException);
                 t = executionException.getCause();
             } catch (InterruptedException interruptedException) {

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -2 +2 @@
 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 +52 @@
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
-
 import com.google.common.io.ByteStreams;
 
@@ -460 +459 @@
             }
         } catch (IOException e) {
-            fail(e.toString());
+            throw new RuntimeException(e);
         }
     }

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java

@@ -10 +10 @@
 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;

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/AllMappaintTests.java

@@ -5 +5 @@
 import org.junit.runners.Suite;
 import org.openstreetmap.josm.gui.mappaint.mapcss.AllMapCSSTests;
-
-import junit.framework.TestCase;
 
 /**
@@ -17 +15 @@
     AllMapCSSTests.class
 })
-public class AllMappaintTests extends TestCase{
+public class AllMappaintTests {
 
 }

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/AllMapCSSTests.java

@@ -4 +4 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
-
-import junit.framework.TestCase;
 
 /**
@@ -18 +16 @@
     ChildOrParentSelectorTest.class
 })
-public class AllMapCSSTests extends TestCase{
+public class AllMapCSSTests {
 
 }

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

@@ -3 +3 @@
 
 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 +96 @@
         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 +119 @@
         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

trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java

@@ -172 +172 @@
     @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")));
     }
 }