Fix possible ArrayStoreException in stream (#701)

* Fix possible ArrayStoreException in stream * Fix possible ArrayStoreException in stream. Add regression test
jline · Sep 15, 2021 · 9ca636f · 9ca636f
1 parent b14c437
commit 9ca636f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/terminal/src/main/java/org/jline/utils/InfoCmp.java b/terminal/src/main/java/org/jline/utils/InfoCmp.java
@@ -503,7 +503,7 @@ public enum Capability {
         public String[] getNames() {
             return getCapabilitiesByName().entrySet().stream()
                     .filter(e -> e.getValue() == this)
-                    .map(Map.Entry::getValue)
+                    .map(Map.Entry::getKey)
                     .toArray(String[]::new);
         }
 

diff --git a/terminal/src/test/java/org/jline/utils/InfoCmpTest.java b/terminal/src/test/java/org/jline/utils/InfoCmpTest.java
@@ -12,7 +12,6 @@
 import org.junit.Test;
 
 import java.io.IOException;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.FileSystems;
@@ -29,8 +28,8 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -52,6 +51,12 @@ public void testInfoCmp() {
         assertTrue(strings.containsKey(Capability.byName("acsc")));
     }
 
+    @Test
+    public void testGetNames() {
+        String[] result = Capability.bit_image_entwining.getNames();
+        assertArrayEquals(new String[]{"bit_image_entwining", "bitwin"}, result);
+    }
+
     @Test
     public void testInfoCmpWithHexa() {
         Set<Capability> bools = new HashSet<>();