From 2e4677b67a63980fd71955d4325c4e329a95f5e8 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Tue, 30 Dec 2014 11:27:03 +0200
Subject: [PATCH] Fix DefaultTextRenderer warning with String data (#15430)

Change-Id: I04eae1e82da6bb0213be19599c7d8fc3085a92a5
---
 client/src/com/vaadin/client/widgets/Grid.java         |  2 +-
 .../basicfeatures/GridDefaultTextRendererTest.java     |  8 ++++++++
 .../client/grid/GridDefaultTextRendererWidget.java     | 10 +++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index 4756921325..a32dccd391 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -2516,7 +2516,7 @@ public class Grid<T> extends ResizeComposite implements
 
             @Override
             public void render(RendererCellReference cell, Object data) {
-                if (!warned) {
+                if (!warned && !(data instanceof String)) {
                     getLogger().warning(
                             Column.this.toString() + ": "
                                     + DEFAULT_RENDERER_WARNING);
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
index cd31bfc860..79eadd03d8 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.GridElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.elements.ServerClass;
@@ -40,6 +41,7 @@ public class GridDefaultTextRendererTest extends MultiBrowserTest {
 
     @Before
     public void init() {
+        setDebug(true);
         openTestURL();
         grid = $(MyGridElement.class).first();
         assertFalse("There was an unexpected notification during init",
@@ -57,4 +59,10 @@ public class GridDefaultTextRendererTest extends MultiBrowserTest {
         assertEquals("Second cell should've been populated ", "string", grid
                 .getCell(1, 0).getText());
     }
+
+    @Test
+    public void testWarningShouldNotBeInDebugLog() {
+        assertFalse("Warning visible with string content.",
+                isElementPresent(By.xpath("//span[contains(.,'attached:#1')]")));
+    }
 }
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java
index 173ae097ed..4f1ea48be5 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java
@@ -47,10 +47,18 @@ public class GridDefaultTextRendererWidget extends
             }
         });
 
+        grid.addColumn(new Column<String, String>() {
+
+            @Override
+            public String getValue(String row) {
+                return "foo";
+            }
+
+        });
+
         grid.setHeightByRows(2);
         grid.setHeightMode(HeightMode.ROW);
         grid.setSelectionMode(SelectionMode.NONE);
         addNorth(grid, 500);
     }
-
 }
-- 
2.39.5