aboutsummaryrefslogtreecommitdiffstats
path: root/uitest/src
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-02-04 17:00:23 +0200
committerVaadin Code Review <review@vaadin.com>2015-02-05 12:27:27 +0000
commitb5b98e47441aa4ac587de097b22b25cc4852a4ec (patch)
treee32e7d71a2b1c2cf90d9810b075cb87cb112cdde /uitest/src
parentb66c005a16b8141c14d50c2f1bed5a694e5c92c3 (diff)
downloadvaadin-framework-b5b98e47441aa4ac587de097b22b25cc4852a4ec.tar.gz
vaadin-framework-b5b98e47441aa4ac587de097b22b25cc4852a4ec.zip
Revert "Grid now uses ObjectRenderer by default (#15417)"
This reverts commit abaec0217b3351d6f1835d7095ed2a3958fbfcdb. Change-Id: I7f8de3ee803b6de1957ad04b5b1b3bf210783826
Diffstat (limited to 'uitest/src')
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/GridUndefinedObjectConverter.java37
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/GridUndefinedObjectConverterTest.java25
2 files changed, 0 insertions, 62 deletions
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridUndefinedObjectConverter.java b/uitest/src/com/vaadin/tests/components/grid/GridUndefinedObjectConverter.java
deleted file mode 100644
index fba2bbf698..0000000000
--- a/uitest/src/com/vaadin/tests/components/grid/GridUndefinedObjectConverter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.vaadin.tests.components.grid;
-
-import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Grid;
-
-public class GridUndefinedObjectConverter extends AbstractTestUI {
- private static class Pojo {
- private final String content;
-
- public Pojo(String content) {
- this.content = content;
- }
-
- @Override
- public String toString() {
- return "Pojo:" + content;
- }
- }
-
- @Override
- @SuppressWarnings("all")
- protected void setup(VaadinRequest request) {
- IndexedContainer container = new IndexedContainer();
- container.addContainerProperty("pojo", Pojo.class, new Pojo("foo"));
- container.addContainerProperty("pojo object ", Object.class, new Pojo(
- "bar"));
- container.addContainerProperty("int", Integer.class, 1);
- container.addContainerProperty("int object", Object.class, 2);
- container.addContainerProperty("string", String.class, "foo");
- container.addContainerProperty("string object", Object.class, "bar");
- container.addItem();
-
- addComponent(new Grid(container));
- }
-}
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridUndefinedObjectConverterTest.java b/uitest/src/com/vaadin/tests/components/grid/GridUndefinedObjectConverterTest.java
deleted file mode 100644
index 401bfda885..0000000000
--- a/uitest/src/com/vaadin/tests/components/grid/GridUndefinedObjectConverterTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.vaadin.tests.components.grid;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.vaadin.testbench.elements.GridElement;
-import com.vaadin.tests.annotations.TestCategory;
-import com.vaadin.tests.tb3.MultiBrowserTest;
-
-@TestCategory("grid")
-public class GridUndefinedObjectConverterTest extends MultiBrowserTest {
- @Test
- public void testDefaultToStringRendering() {
- openTestURL();
-
- GridElement grid = $(GridElement.class).first();
- assertEquals("pojo", "Pojo:foo", grid.getCell(0, 0).getText());
- assertEquals("pojo object", "Pojo:bar", grid.getCell(0, 1).getText());
- assertEquals("int", "1", grid.getCell(0, 2).getText());
- assertEquals("int object", "2", grid.getCell(0, 3).getText());
- assertEquals("string", "foo", grid.getCell(0, 4).getText());
- assertEquals("string object", "bar", grid.getCell(0, 5).getText());
- }
-}