Reimplement basic Grid renderers

Change-Id: Ic855143d23cc7735d00130806df45b6579ba0d5c

2 files changed, 19 insertions, 12 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
index b78e5272fe..a47d8b3e9e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
@@ -1,7 +1,6 @@
 package com.vaadin.tests.components.grid.basics;
 
 import java.text.DecimalFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -25,6 +24,10 @@ import com.vaadin.ui.MenuBar.MenuItem;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.renderers.DateRenderer;
+import com.vaadin.ui.renderers.HtmlRenderer;
+import com.vaadin.ui.renderers.NumberRenderer;
+import com.vaadin.ui.renderers.ProgressBarRenderer;
 
 @Widgetset("com.vaadin.DefaultWidgetSet")
 public class GridBasics extends AbstractTestUIWithLog {
@@ -113,16 +116,20 @@ public class GridBasics extends AbstractTestUIWithLog {
         grid = new Grid<>();
         grid.setItems(data);
 
-        grid.addColumn("Column 0", String.class,
+        grid.addColumn("Column 0",
                 dataObj -> "(" + dataObj.getRowNumber() + ", 0)");
-        grid.addColumn("Column 1", String.class,
+        grid.addColumn("Column 1",
                 dataObj -> "(" + dataObj.getRowNumber() + ", 1)");
-        grid.addColumn("Row Number", Integer.class, DataObject::getRowNumber);
-        grid.addColumn("Date", Date.class, DataObject::getDate);
-        grid.addColumn("HTML String", String.class, DataObject::getHtmlString);
-        grid.addColumn("Big Random", Integer.class, DataObject::getBigRandom);
-        grid.addColumn("Small Random", Integer.class,
-                DataObject::getSmallRandom);
+
+        grid.addColumn("Row Number", DataObject::getRowNumber,
+                new NumberRenderer());
+        grid.addColumn("Date", DataObject::getDate, new DateRenderer());
+        grid.addColumn("HTML String", DataObject::getHtmlString,
+                new HtmlRenderer());
+        grid.addColumn("Big Random", DataObject::getBigRandom,
+                new NumberRenderer());
+        grid.addColumn("Small Random", data -> data.getSmallRandom() / 5d,
+                new ProgressBarRenderer());
 
         ((SingleSelection<DataObject>) grid.getSelectionModel())
                 .addSelectionListener(e -> log("Selected: " + e.getValue()));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridContentTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridContentTest.java
index 267567bb53..88f2eb0b20 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridContentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridContentTest.java
@@ -5,13 +5,13 @@ import org.junit.Test;
 
 public class GridContentTest extends GridBasicsTest {
 
-    @Test(expected = AssertionError.class)
+    @Test
     public void testHtmlRenderer() {
         DataObject first = getTestData().findFirst().orElse(null);
         Assert.assertEquals("Text content should match row number",
                 first.getRowNumber().toString(),
-                getGridElement().getCell(0, 2).getText());
+                getGridElement().getCell(0, 4).getText());
         Assert.assertEquals("HTML content did not match", first.getHtmlString(),
-                getGridElement().getCell(0, 2).getAttribute("innerHTML"));
+                getGridElement().getCell(0, 4).getAttribute("innerHTML"));
     }
 }