From 3c901dcead8a829ac06b1dbdd55a033001071572 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 11 Aug 2011 12:56:40 +0000 Subject: Tests for #5916 svn changeset:20303/svn branch:6.7 --- .../table/TableGeneratedStringColumns.html | 152 +++++++++++++++++++++ .../com/vaadin/tests/components/table/Tables.java | 55 ++++++-- .../treetable/TreeTableGeneratedColumns.html | 152 +++++++++++++++++++++ 3 files changed, 346 insertions(+), 13 deletions(-) create mode 100644 tests/src/com/vaadin/tests/components/table/TableGeneratedStringColumns.html create mode 100644 tests/src/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html diff --git a/tests/src/com/vaadin/tests/components/table/TableGeneratedStringColumns.html b/tests/src/com/vaadin/tests/components/table/TableGeneratedStringColumns.html new file mode 100644 index 0000000000..4d5f4c2d17 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/table/TableGeneratedStringColumns.html @@ -0,0 +1,152 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
New Test
open/run/com.vaadin.tests.components.table.Tables?restartApplication
mouseClickvaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item123,10
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item058,13
mouseClickvaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item031,10
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item536,11
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item086,8
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item222,7
mouseClickvaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item027,8
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item837,8
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item477,10
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item745,10
mouseClickvaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item045,21
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item830,2
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item4109,7
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item871,10
screenCaptureplain-html
mouseClickvaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item039,12
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item238,13
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item039,7
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item1019,9
mouseClickvaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item017,10
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item948,11
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item239,10
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item253,13
mouseClickvaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[3]/VMenuBar[0]#item216,6
screenCaptureplain-right-html-left
+ + diff --git a/tests/src/com/vaadin/tests/components/table/Tables.java b/tests/src/com/vaadin/tests/components/table/Tables.java index f663fbb48b..4ff42e7bc8 100644 --- a/tests/src/com/vaadin/tests/components/table/Tables.java +++ b/tests/src/com/vaadin/tests/components/table/Tables.java @@ -12,7 +12,6 @@ import com.vaadin.terminal.Resource; import com.vaadin.tests.components.select.AbstractSelectTestCase; import com.vaadin.ui.AbstractSelect.MultiSelectMode; import com.vaadin.ui.Button; -import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.Table; import com.vaadin.ui.Table.ColumnGenerator; @@ -192,13 +191,15 @@ public class Tables extends AbstractSelectTestCase }; private class GeneratedColumn { - private Class type; + private Class type; private String width; + private boolean html; - public GeneratedColumn(Class type, String width) { + public GeneratedColumn(Class type, String width, boolean html) { super(); this.type = type; this.width = width; + this.html = html; } } @@ -216,18 +217,34 @@ public class Tables extends AbstractSelectTestCase c.addGeneratedColumn(generatedColumnId + generatedColumnNextNr, new ColumnGenerator() { - public Component generateCell(Table source, - Object itemId, Object columnId) { + public Object generateCell(Table source, Object itemId, + Object columnId) { + String value = ""; + if (col.html) { + value = "" + itemId + "" + "/" + "" + + columnId + ""; + } else { + value = itemId + "/" + columnId; + } if (col.type == Button.class) { Button b = new Button(); - b.setCaption(itemId + "/" + columnId); + b.setCaption(value); b.setWidth(col.width); return b; } else if (col.type == Label.class) { Label l = new Label(); - l.setValue(itemId + "/" + columnId); l.setWidth(col.width); + if (col.html) { + l.setValue(value); + l.setContentMode(Label.CONTENT_XHTML); + } else { + l.setValue(value); + } return l; + } else if (col.type == String.class) { + return value; + } else if (col.type == Object.class) { + return new Object(); } return null; @@ -301,24 +318,36 @@ public class Tables extends AbstractSelectTestCase String category = "Generated columns"; createCategory(category, categoryFeatures); createClickAction("Add Button", category, addGeneratedColumnCommand, - new GeneratedColumn(Button.class, null)); + new GeneratedColumn(Button.class, null, false)); createClickAction("Add 200px wide Button", category, addGeneratedColumnCommand, new GeneratedColumn(Button.class, - "200px")); + "200px", false)); createClickAction("Add 100% wide Button", category, addGeneratedColumnCommand, new GeneratedColumn(Button.class, - "100%")); + "100%", false)); createClickAction("Add Label", category, addGeneratedColumnCommand, - new GeneratedColumn(Label.class, null)); + new GeneratedColumn(Label.class, null, false)); createClickAction("Add 100px Label", category, addGeneratedColumnCommand, new GeneratedColumn(Label.class, - "100px")); + "100px", false)); createClickAction("Add 100% wide Label", category, addGeneratedColumnCommand, new GeneratedColumn(Label.class, - "100%")); + "100%", false)); createClickAction("Remove generated columns", category, removeGeneratedColumnsCommand, null); + createClickAction("Add string as generated column", category, + addGeneratedColumnCommand, new GeneratedColumn(String.class, + "", false)); + createClickAction("Add HTML string as generated column", category, + addGeneratedColumnCommand, new GeneratedColumn(String.class, + "", true)); + createClickAction("Add 100px HTML Label", category, + addGeneratedColumnCommand, new GeneratedColumn(Label.class, + "100px", true)); + createClickAction("Add Object as generated column", category, + addGeneratedColumnCommand, new GeneratedColumn(Object.class, + "", false)); } private void createColumnHeaderMode(String category) { diff --git a/tests/src/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html b/tests/src/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html new file mode 100644 index 0000000000..09014f3aa0 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html @@ -0,0 +1,152 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
New Test
open/run/com.vaadin.tests.components.treetable.TreeTableTest?restartApplication
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::PID_Smenu#item038,13
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[0]/VMenuBar[0]#item550,1
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[1]/VMenuBar[0]#item063,9
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[2]/VMenuBar[0]#item332,14
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::PID_Smenu#item038,10
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[0]/VMenuBar[0]#item846,7
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[1]/VMenuBar[0]#item476,6
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[2]/VMenuBar[0]#item4101,11
assertTextvaadin=runcomvaadintestscomponentstreetableTreeTableTest::PID_StestComponent/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[0]/VLabel[0]Item 1/Generated 1
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::PID_Smenu#item049,19
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[0]/VMenuBar[0]#item854,9
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[1]/VMenuBar[0]#item496,1
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[2]/VMenuBar[0]#item9101,9
assertTextvaadin=runcomvaadintestscomponentstreetableTreeTableTest::PID_StestComponent/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[0]/VLabel[1]Item 1/Generated 2
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::PID_Smenu#item032,9
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[0]/VMenuBar[0]#item844,4
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[1]/VMenuBar[0]#item471,4
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[2]/VMenuBar[0]#item7143,11
assertTextvaadin=runcomvaadintestscomponentstreetableTreeTableTest::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[5]/domChild[0]Item 1/Generated 3
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::PID_Smenu#item043,1
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[0]/VMenuBar[0]#item849,3
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[1]/VMenuBar[0]#item490,10
mouseClickvaadin=runcomvaadintestscomponentstreetableTreeTableTest::Root/VOverlay[2]/VMenuBar[0]#item8135,14
assertTextvaadin=runcomvaadintestscomponentstreetableTreeTableTest::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[6]/domChild[0]<i>Item 1</i>/<b>Generated 4</b>
screenCapturegenerated-columns-label-label-string-string
+ + -- cgit v1.2.3