Changeset 14201 in josm for trunk/test/unit/org/openstreetmap/josm/io

Timestamp:

2018-08-29T19:40:53+02:00 (6 years ago)

Author:

Don-vip

Message:

spotbugs - fix various issues found with Eclipse plugin

Location:

trunk/test/unit/org/openstreetmap/josm/io

Files:

• OsmChangesetContentParserTest.java (modified) (1 diff)
• OsmJsonReaderTest.java (modified) (4 diffs)
• OsmWriterTest.java (modified) (3 diffs)
• remotecontrol/RemoteControlTest.java (modified) (2 diffs)

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

@@ -53 +53 @@
      */
     @Test
+    @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF_NONVIRTUAL")
     public void test_Constructor() {
 
         // should be OK
-        new OsmChangesetContentParser(new ByteArrayInputStream("".getBytes()));
+        new OsmChangesetContentParser(new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)));
 
         shouldFail(() -> {

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

@@ -9 +9 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
 import java.util.Iterator;
 
@@ -39 +38 @@
     public JOSMTestRules test = new JOSMTestRules();
 
-    private static final SimpleDateFormat iso8601 = DateUtils.newIsoDateTimeFormat();
-
     /**
      * Setup test
@@ -46 +43 @@
     @BeforeClass
     public static void setUp() {
-        iso8601.setTimeZone(DateUtils.UTC);
+        DateUtils.newIsoDateTimeFormat().setTimeZone(DateUtils.UTC);
     }
 
@@ -122 +119 @@
         assertEquals(1, n.getUniqueId());
         assertEquals(new LatLon(2.0, -3.0), n.getCoor());
-        assertEquals("2018-01-01T00:00:00Z", iso8601.format(n.getTimestamp()));
+        assertEquals("2018-01-01T00:00:00Z", DateUtils.newIsoDateTimeFormat().format(n.getTimestamp()));
         assertEquals(4, n.getVersion());
         assertEquals(5, n.getChangesetId());

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

@@ -7 +7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -15 +17 @@
 import org.junit.Test;
 import org.openstreetmap.josm.data.osm.DownloadPolicy;
+import org.openstreetmap.josm.data.osm.NodeData;
 import org.openstreetmap.josm.data.osm.UploadPolicy;
-import org.openstreetmap.josm.data.osm.NodeData;
 
 /**
@@ -60 +62 @@
     private static void doTestHeader(DownloadPolicy download, UploadPolicy upload, String expected) throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try (PrintWriter out = new PrintWriter(baos);
+        try (PrintWriter out = new PrintWriter(new OutputStreamWriter(baos, StandardCharsets.UTF_8));
              OsmWriter writer = OsmWriterFactory.createOsmWriter(out, true, OsmWriter.DEFAULT_API_VERSION)) {
             writer.header(download, upload);

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

@@ -46 +46 @@
     private String httpsBase;
 
+    private static class PlatformHookWindowsMock extends MockUp<PlatformHookWindows> {
+        @Mock
+        public boolean setupHttpsCertificate(String entryAlias, TrustedCertificateEntry trustedCert) {
+            return true;
+        }
+    }
+
     /**
      * Starts Remote control before testing requests.
@@ -59 +66 @@
             // appveyor doesn't like us tinkering with the root keystore, so mock this out
             TestUtils.assumeWorkingJMockit();
-            new MockUp<PlatformHookWindows>() {
-                @Mock
-                public boolean setupHttpsCertificate(String entryAlias, TrustedCertificateEntry trustedCert) {
-                    return true;
-                }
-            };
+            new PlatformHookWindowsMock();
         }