From 04d6842bb7fc4d288c3cc07966988f55cf6841a4 Mon Sep 17 00:00:00 2001
From: Henrik Paul <henrik@vaadin.com>
Date: Tue, 26 Aug 2014 14:39:48 +0300
Subject: [PATCH] Fixes "add first row" action (#13334)

Change-Id: I23e2dcbf5d7e0801ae63e02126eee8e85726eefc
---
 .../grid/basicfeatures/GridBasicFeatures.java | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
index d54b1838ea..a862aa095f 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
@@ -561,10 +561,28 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                     public void execute(Grid c, String value, Object data) {
                         Item item = ds.addItemAt(0, new Object());
                         for (int i = 0; i < COLUMNS; i++) {
-                            item.getItemProperty(getColumnProperty(i))
-                                    .setValue("newcell: " + i);
+                            Class<?> type = ds.getType(getColumnProperty(i));
+                            if (String.class.isAssignableFrom(type)) {
+                                Property<String> itemProperty = getProperty(
+                                        item, i);
+                                itemProperty.setValue("newcell: " + i);
+                            } else if (Integer.class.isAssignableFrom(type)) {
+                                Property<Integer> itemProperty = getProperty(
+                                        item, i);
+                                itemProperty.setValue(Integer.valueOf(i));
+                            } else {
+                                // let the default value be taken implicitly.
+                            }
                         }
                     }
+
+                    private <T extends Object> Property<T> getProperty(
+                            Item item, int i) {
+                        @SuppressWarnings("unchecked")
+                        Property<T> itemProperty = item
+                                .getItemProperty(getColumnProperty(i));
+                        return itemProperty;
+                    }
                 }, null);
 
         createClickAction("Remove first row", "Body rows",
-- 
2.39.5