SONAR-3755 complete EncodingUtilsTest

2 files changed, 14 insertions, 0 deletions

diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/internal/EncodingUtils.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/internal/EncodingUtils.java
index 1e1631c6698..698500541ec 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/internal/EncodingUtils.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/internal/EncodingUtils.java
@@ -37,6 +37,9 @@ public class EncodingUtils {
   }
 
   public static Map<String, Object> toMap(String... array) {
+    if (array.length%2==1) {
+      throw new IllegalArgumentException("Not an even number of arguments");
+    }
     Map<String, Object> map = new LinkedHashMap<String, Object>();
     for (int i = 0; i < array.length; i += 2) {
       Object value = array[i + 1];
diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/internal/EncodingUtilsTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/internal/EncodingUtilsTest.java
index 1fa30efa836..6e1f6a8e1a3 100644
--- a/sonar-ws-client/src/test/java/org/sonar/wsclient/internal/EncodingUtilsTest.java
+++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/internal/EncodingUtilsTest.java
@@ -24,6 +24,7 @@ import org.junit.Test;
 import java.util.Date;
 
 import static org.fest.assertions.Assertions.assertThat;
+import static org.fest.assertions.Fail.fail;
 import static org.fest.assertions.MapAssert.entry;
 
 public class EncodingUtilsTest {
@@ -48,4 +49,14 @@ public class EncodingUtilsTest {
     assertThat(EncodingUtils.toMap("1", "one", "2", "two")).hasSize(2).includes(entry("1", "one"), entry("2", "two"));
     assertThat(EncodingUtils.toMap("foo", null)).isEmpty();
   }
+
+  @Test
+  public void toMap_should_fail_if_odd_arguments() {
+    try {
+      EncodingUtils.toMap("foo");
+      fail();
+    } catch (IllegalArgumentException e) {
+      assertThat(e).hasMessage("Not an even number of arguments");
+    }
+  }
 }