diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2011-04-19 16:06:31 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2011-04-19 16:06:31 +0000 |
| commit | acbeb93752c30f3b1d1fbebbd646306d97c7953b (patch) | |
| tree | 654a16ff1ff14a41f346b936085712e5e55534f7 | |
| parent | bd31087d6e1ca18ca2fb1e2da293ae0805ace24f (diff) | |
| download | vaadin-framework-acbeb93752c30f3b1d1fbebbd646306d97c7953b.tar.gz vaadin-framework-acbeb93752c30f3b1d1fbebbd646306d97c7953b.zip | |
merged last table related changes from 6.5
svn changeset:18401/svn branch:6.6
4 files changed, 144 insertions, 3 deletions
diff --git a/tests/src/com/vaadin/tests/components/table/TableScrollOnFocus.html b/tests/src/com/vaadin/tests/components/table/TableScrollOnFocus.html new file mode 100644 index 0000000000..1a91211040 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/table/TableScrollOnFocus.html @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="http://arturwin.office.itmill.com:8888/" /> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.table.TableScrollOnFocus?restartApplication</td> + <td></td> +</tr> +<tr> + <td>scroll</td> + <td>vaadin=runcomvaadintestscomponentstableTableScrollOnFocus::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]</td> + <td>3864</td> +</tr> +<tr> + <td>pause</td> + <td>300</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTableScrollOnFocus::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td> + <td>391,141</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTableScrollOnFocus::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]</td> + <td>3234</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>visible-185-199</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/src/com/vaadin/tests/components/table/TableScrollOnFocus.java b/tests/src/com/vaadin/tests/components/table/TableScrollOnFocus.java new file mode 100644 index 0000000000..05e101a5f9 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/table/TableScrollOnFocus.java @@ -0,0 +1,49 @@ +package com.vaadin.tests.components.table;
+
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Table;
+
+public class TableScrollOnFocus extends TestBase {
+ @Override
+ protected void setup() {
+ final Table table = new Table();
+ final CheckBox chkSelectable = new CheckBox("selectable");
+
+ chkSelectable.setImmediate(true);
+ chkSelectable.addListener(new ValueChangeListener() {
+ public void valueChange(ValueChangeEvent event) {
+ table.setSelectable(chkSelectable.booleanValue());
+ }
+ });
+
+ table.addContainerProperty("row #", String.class, "-");
+ table.setColumnWidth("row #", 150);
+ for (int i = 1; i < 200; i++) {
+ table.addItem(new String[] { "" + i }, null);
+ }
+ table.setSortDisabled(true);
+
+ chkSelectable.setValue(true);
+
+ addComponent(chkSelectable);
+ addComponent(table);
+ }
+
+ @Override
+ protected String getDescription() {
+ return "The table scrolls up 2 pages after loosing and regaining the focus!</b><p>"
+ + "Drag scrollbar to top then to the bottom of the table.<br>"
+ + "Click somewhere beside the table to take away the focus,<br>"
+ + "then click back on the table (header or scrollbar) to give back the focus<br>"
+ + "(Pressing Tab and Shift-Tab does the same job).<p>"
+ + "If the table is set to non-selectable-mode, no self-scrolling occurs.";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 6774;
+ }
+}
\ No newline at end of file diff --git a/tests/src/com/vaadin/tests/components/table/TableScrollsOnSelection.html b/tests/src/com/vaadin/tests/components/table/TableScrollsOnSelection.html index 7be7e3760d..dff3dcbc48 100644 --- a/tests/src/com/vaadin/tests/components/table/TableScrollsOnSelection.html +++ b/tests/src/com/vaadin/tests/components/table/TableScrollsOnSelection.html @@ -29,9 +29,9 @@ </tr> <!--Select the last item (79)--> <tr> - <td>mouseClick</td> - <td>vaadin=runcomvaadintestscomponentstableTableScrollsOnSelection::/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[79]/domChild[0]/domChild[0]</td> - <td>38,-892</td> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTableScrollsOnSelection::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[79]/domChild[0]/domChild[0]</td> + <td>38,-892</td> </tr> <!--Ensure the page is not scrolled to the beginning--> <tr> diff --git a/tests/src/com/vaadin/tests/components/table/WideSelectableTable.java b/tests/src/com/vaadin/tests/components/table/WideSelectableTable.java new file mode 100644 index 0000000000..c820dc08d5 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/table/WideSelectableTable.java @@ -0,0 +1,45 @@ +package com.vaadin.tests.components.table; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Table; +import com.vaadin.ui.VerticalLayout; + +public class WideSelectableTable extends TestBase { + + @Override + protected void setup() { + final int NUMBER_OF_COLS = 50; + + // mainWindow.setSizeFull(); + // setMainWindow(mainWindow); + + Table ptable = new Table(); + for (int colcount = 0; colcount < NUMBER_OF_COLS; colcount++) { + String col = "COL_" + colcount + ""; + ptable.addContainerProperty(col, String.class, "--"); + ptable.addItem(colcount + "-").getItemProperty(col) + .setValue("--" + colcount + ""); + } + ptable.setSelectable(true); + ptable.setMultiSelect(true); + ptable.setColumnReorderingAllowed(false); + ptable.setImmediate(true); + + ptable.setWidth("100%"); + ptable.setPageLength(5); + + VerticalLayout vl = new VerticalLayout(); + vl.addComponent(ptable); + addComponent(vl); + } + + @Override + protected String getDescription() { + return "A wide table scrolls to the beginning when sorting a column at the beginning when sorting a column at the end"; + } + + @Override + protected Integer getTicketNumber() { + return 6788; + } +}
\ No newline at end of file |