Merge remote-tracking branch 'origin/master' into grid-unbuffered-editor

Change-Id: Id630861d5089b0deabbccffe66d971252c44f46b

1 files changed, 10 insertions, 0 deletions

diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java b/server/tests/src/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java
index 977985c6cb..bcd0dc15bd 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java
@@ -141,6 +141,16 @@ public class StringToCollectionConverterTest {
         Assert.assertEquals("Z,Y", presentation);
     }
 
+    @Test
+    public void convertToModel_singleItem() {
+        StringToCollectionConverter converter = new StringToCollectionConverter();
+        Collection<?> model = converter.convertToModel("a", List.class, null);
+        Iterator<?> iterator = model.iterator();
+        Assert.assertEquals("Incorrect fist token", "a", iterator.next());
+        Assert.assertFalse("More than one item detected after conversation",
+                iterator.hasNext());
+    }
+
     public enum TestEnum {
         X, Y, Z;
     }