add test

NationalSecurityAgency · Nov 16, 2024 · 616f656 · 616f656
1 parent 045f7f8
commit 616f656
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/src/main/java/emissary/core/IBaseDataObject.java b/src/main/java/emissary/core/IBaseDataObject.java
@@ -3,6 +3,7 @@
 import emissary.core.channels.SeekableByteChannelFactory;
 import emissary.directory.DirectoryEntry;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
@@ -382,7 +383,7 @@ default String getStringParameter(final String key, final String sep) {
      */
     default Collection<String> getParameterAsStrings(final String key) {
         final var obj = getParameter(key);
-        if (obj == null || obj.isEmpty() || ((obj.size() == 1) && (obj.get(0) == null))) {
+        if (CollectionUtils.isEmpty(obj) || ((obj.size() == 1) && (obj.get(0) == null))) {
             return Collections.emptyList();
         } else if ((obj.size() == 1) && (obj.get(0) instanceof String)) {
             return Collections.singletonList((String) obj.get(0));

diff --git a/src/test/java/emissary/core/BaseDataObjectTest.java b/src/test/java/emissary/core/BaseDataObjectTest.java
@@ -1463,4 +1463,39 @@ void testNewInputStream() throws IOException {
             assertArrayEquals(bytes2, byteArrayOutputStream.toByteArray());
         }
     }
+
+    @Test
+    void testGetParameterAsString() {
+        this.b.putParameter("A", 1L);
+        this.b.appendParameter("A", "TWO");
+        this.b.appendParameter("A", "THREE");
+        assertEquals("1", this.b.getParameterAsString("A"));
+        assertEquals("1;TWO;THREE", this.b.getParameterAsConcatString("A"));
+
+        this.b.putParameter("A", 2L);
+        assertEquals("2", this.b.getParameterAsString("A"));
+        assertEquals("2", this.b.getParameterAsConcatString("A"));
+
+        this.b.putParameter("A", "THREE");
+        assertEquals("THREE", this.b.getParameterAsString("A"));
+        assertEquals("THREE", this.b.getParameterAsConcatString("A"));
+
+        this.b.putParameter("A", null);
+        assertNull(this.b.getParameterAsString("A"));
+        assertNull(this.b.getParameterAsConcatString("A"));
+
+        this.b.putParameter("A", "");
+        assertNull(this.b.getParameterAsString("A"));
+        assertNull(this.b.getParameterAsConcatString("A"));
+
+        assertNull(this.b.getParameterAsString("DNE"));
+        assertNull(this.b.getParameterAsConcatString("DNE"));
+
+        this.b.putParameter("A", null);
+        this.b.appendParameter("A", "FOUR");
+        this.b.appendParameter("A", "  ");
+        assertEquals("null", this.b.getParameterAsString("A"));
+        assertEquals("null;FOUR;  ", this.b.getParameterAsConcatString("A"));
+    }
+
 }