Changeset 10638 in josm for trunk/test

Timestamp:

2016-07-25T21:19:38+02:00 (9 years ago)

Author:

Don-vip

Message:

see #11390, fix #13206 - Migrate Function interface to java 8 (patch by michael2402, modified) - gsoc-core

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/tagging/presets/PresetClassificationsTest.java (modified) (3 diffs)
• gui/tagging/presets/TaggingPresetReaderTest.java (modified) (3 diffs)
• io/OsmWriterTest.java (modified) (3 diffs)
• tools/UtilsTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/PresetClassificationsTest.java

@@ -10 +10 @@
 import java.util.EnumSet;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.junit.BeforeClass;
@@ -20 +21 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetSelector.PresetClassification;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetSelector.PresetClassifications;
-import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
 
@@ -48 +48 @@
 
     private List<String> getMatchingPresetNames(String searchText, OsmPrimitive w) {
-        return Utils.transform(getMatchingPresets(searchText, w), new Utils.Function<PresetClassification, String>() {
-            @Override
-            public String apply(PresetClassification x) {
-                return x.preset.name;
-            }
-        });
+        return getMatchingPresets(searchText, w).stream().map(x -> x.preset.name).collect(Collectors.toList());
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java

@@ -5 +5 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.junit.Assert;
@@ -17 +19 @@
 import org.openstreetmap.josm.gui.tagging.presets.items.Check;
 import org.openstreetmap.josm.gui.tagging.presets.items.Key;
-import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
 
@@ -59 +60 @@
         assertThat(presets, hasSize(1));
         final TaggingPreset abc = presets.iterator().next();
-        final List<String> keys = Utils.transform(abc.data, new Utils.Function<TaggingPresetItem, String>() {
-            @Override
-            public String apply(TaggingPresetItem x) {
-                return x instanceof Key ? ((Key) x).key : null;
-            }
-        });
+        assertTrue(abc.data.stream().allMatch(Key.class::isInstance));
+        final List<String> keys = abc.data.stream().map(x -> ((Key) x).key).collect(Collectors.toList());
         assertEquals("[A1, A2, A3, B1, B2, B3, C1, C2, C3]", keys.toString());
     }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertArrayEquals;
 
 import java.util.ArrayList;
@@ -11 +11 @@
 import org.junit.Test;
 import org.openstreetmap.josm.data.osm.NodeData;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -33 +32 @@
         Collections.sort(ids, OsmWriter.byIdComparator);
 
-        final String idsAsString = Utils.transform(ids, new Utils.Function<NodeData, Object>() {
-            @Override
-            public Object apply(NodeData x) {
-                return x.getUniqueId();
-            }
-        }).toString();
-
-        assertEquals("[-3, -12, -20, -9223372036854775808, 0, 2, 12, 65, 9223372036854775807]", idsAsString);
+        final long[] longIds = ids.stream().mapToLong(x -> x.getUniqueId()).toArray();
+        assertArrayEquals(new long[] {
+                -3, -12, -20, -9223372036854775808L, 0, 2, 12, 65, 9223372036854775807L
+        }, longIds);
     }
 }

trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

@@ -8 +8 @@
 import java.net.URL;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import java.util.Locale;
 
@@ -176 +178 @@
      */
     @Test
-    public void testSizeString() throws Exception {
+    public void testSizeString() {
         assertEquals("0 B", Utils.getSizeString(0, Locale.ENGLISH));
         assertEquals("123 B", Utils.getSizeString(123, Locale.ENGLISH));
@@ -189 +191 @@
      */
     @Test(expected = IllegalArgumentException.class)
-    public void testSizeStringNegative() throws Exception {
+    public void testSizeStringNegative() {
         Utils.getSizeString(-1, Locale.ENGLISH);
     }
 
+    /**
+     * Test {@link Utils#joinAsHtmlUnorderedList(Iterable)}
+     */
+    @Test
+    public void joinAsHtmlUnorderedList() {
+        List<? extends Object> items = Arrays.asList("1", new Integer(2));
+        assertEquals("<ul><li>1</li><li>2</li></ul>", Utils.joinAsHtmlUnorderedList(items));
+        assertEquals("<ul></ul>", Utils.joinAsHtmlUnorderedList(Collections.emptyList()));
+    }
 }