Add unit test.

src/com/dmdirc/util/io/ListenerInputStream.java

@@ -53,8 +53,8 @@ public class ListenerInputStream extends FilterInputStream {
         this.length = length;
         count = 0;
         mark = count;
-        if (length == -1) {
-            listener.setIndeterminate(true);
+        if (listener != null) {
+            listener.setIndeterminate(length == -1);
         }
     }
 

test/com/dmdirc/util/collections/URLEncodingMapFlattenerTest.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.util.collections;
+
+import com.google.common.collect.ImmutableMap;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static junit.framework.TestCase.assertEquals;
+
+@RunWith(MockitoJUnitRunner.class)
+public class URLEncodingMapFlattenerTest {
+
+    private URLEncodingMapFlattener instance;
+    private Map<String, String> map;
+
+    @Before
+    public void setUp() throws Exception {
+        instance = new URLEncodingMapFlattener();
+        map = ImmutableMap.<String, String>builder()
+                .put("key", "value")
+                .put("key&", "value&")
+                .build();
+    }
+
+    @Test
+    public void testApply() throws Exception {
+        final List<String> result = map.entrySet().stream()
+                .flatMap(instance)
+                .collect(Collectors.toList());
+        assertEquals(2, result.size());
+        assertEquals("key=value", result.get(0));
+        assertEquals("key%26=value%26", result.get(1));
+    }
+}