Changeset 9829 in josm for trunk

Timestamp:

2016-02-19T02:34:18+01:00 (9 years ago)

Author:

Don-vip

Message:

fix warnings, add unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/Preferences.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/PreferencesTest.groovy (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1418 +1418 @@
      */
     public String toXML(Collection<Entry<String, Setting<?>>> settings, boolean nopass, boolean defaults) {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        PreferencesWriter prefWriter = new PreferencesWriter(pw, nopass, defaults);
-        prefWriter.write(settings);
-        sw.flush();
-        StringBuffer sb = sw.getBuffer();
-        return sb.toString();
+        try (
+            StringWriter sw = new StringWriter();
+            PreferencesWriter prefWriter = new PreferencesWriter(new PrintWriter(sw), nopass, defaults);
+        ) {
+            prefWriter.write(settings);
+            sw.flush();
+            return sw.toString();
+        } catch (IOException e) {
+            Main.error(e);
+            return null;
+        }
     }
 

trunk/test/unit/org/openstreetmap/josm/data/PreferencesTest.groovy

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data
 
@@ -27 +28 @@
         assert Main.pref.getDefaultColor("foo").alpha == 0x12
     }
+
+    void testToXml() {
+        assert Main.pref.toXML(true) == String.format(
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>%n" +
+            "<preferences xmlns='http://josm.openstreetmap.de/preferences-1.0' version='%d'>%n" +
+            "  <tag key='expert' value='true'/>%n" +
+            "  <tag key='jdk.Arrays.useLegacyMergeSort' value='false'/>%n" +
+            "  <tag key='language' value='en'/>%n" +
+            "  <tag key='osm-server.url' value='http://api06.dev.openstreetmap.org/api'/>%n" +
+            "  <tag key='osm-server.username' value='josm_test'/>%n" +
+            "</preferences>%n", Version.getInstance().getVersion())
+    }
 }