diff options
author | Artur Signell <artur@vaadin.com> | 2012-11-21 20:33:05 +0200 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2012-11-22 09:50:18 +0000 |
commit | de1450300bcc83eb3f6eddcd39bd77e02b24dfeb (patch) | |
tree | 6e0da07dbb25d902c1744517e4afa6b761b11f4a /uitest | |
parent | 1810b99839cb5616e84722c1f767953b7093a08b (diff) | |
download | vaadin-framework-de1450300bcc83eb3f6eddcd39bd77e02b24dfeb.tar.gz vaadin-framework-de1450300bcc83eb3f6eddcd39bd77e02b24dfeb.zip |
Fixed tab index handling in broken components (#10315)
Change-Id: I27a1a3541886b126f0798f4d25ae6d22df81aa79
Diffstat (limited to 'uitest')
-rw-r--r-- | uitest/src/com/vaadin/tests/fields/TabIndexes.html | 176 | ||||
-rw-r--r-- | uitest/src/com/vaadin/tests/fields/TabIndexes.java | 159 |
2 files changed, 335 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/fields/TabIndexes.html b/uitest/src/com/vaadin/tests/fields/TabIndexes.html new file mode 100644 index 0000000000..1f865627ad --- /dev/null +++ b/uitest/src/com/vaadin/tests/fields/TabIndexes.html @@ -0,0 +1,176 @@ +<?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.fields.TabIndexes?restartApplication</td> + <td></td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-1/domChild[1]/domChild[1]@tabIndex</td> + <td>0</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-2/domChild[0]@tabIndex</td> + <td>0</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-3/domChild[0]@tabIndex</td> + <td>0</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-4/domChild[0]@tabIndex</td> + <td>0</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-5@tabIndex</td> + <td>0</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-6/domChild[0]@tabIndex</td> + <td>0</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-7/domChild[0]@tabIndex</td> + <td>0</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-1/domChild[1]/domChild[1]@tabIndex</td> + <td>1</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-2/domChild[0]@tabIndex</td> + <td>1</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-3/domChild[0]@tabIndex</td> + <td>1</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-4/domChild[0]@tabIndex</td> + <td>1</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-5@tabIndex</td> + <td>1</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-6/domChild[0]@tabIndex</td> + <td>1</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-7/domChild[0]@tabIndex</td> + <td>1</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[3]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-1/domChild[1]/domChild[1]@tabIndex</td> + <td>1</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-2/domChild[0]@tabIndex</td> + <td>2</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-3/domChild[0]@tabIndex</td> + <td>3</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-4/domChild[0]@tabIndex</td> + <td>4</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-5@tabIndex</td> + <td>5</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-6/domChild[0]@tabIndex</td> + <td>6</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-7/domChild[0]@tabIndex</td> + <td>7</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[4]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-1/domChild[1]/domChild[1]@tabIndex</td> + <td>7</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-2/domChild[0]@tabIndex</td> + <td>6</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-3/domChild[0]@tabIndex</td> + <td>5</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-4/domChild[0]@tabIndex</td> + <td>4</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-5@tabIndex</td> + <td>3</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-6/domChild[0]@tabIndex</td> + <td>2</td> +</tr> +<tr> + <td>assertAttribute</td> + <td>vaadin=runcomvaadintestsfieldsTabIndexes::PID_Sfield-7/domChild[0]@tabIndex</td> + <td>1</td> +</tr> +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/fields/TabIndexes.java b/uitest/src/com/vaadin/tests/fields/TabIndexes.java new file mode 100644 index 0000000000..c88bb97c73 --- /dev/null +++ b/uitest/src/com/vaadin/tests/fields/TabIndexes.java @@ -0,0 +1,159 @@ +package com.vaadin.tests.fields; + +import java.util.ArrayList; +import java.util.List; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.util.Log; +import com.vaadin.ui.AbstractField; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.CheckBox; +import com.vaadin.ui.ComboBox; +import com.vaadin.ui.Field; +import com.vaadin.ui.GridLayout; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.InlineDateField; +import com.vaadin.ui.ListSelect; +import com.vaadin.ui.NativeSelect; +import com.vaadin.ui.OptionGroup; +import com.vaadin.ui.PasswordField; +import com.vaadin.ui.PopupDateField; +import com.vaadin.ui.RichTextArea; +import com.vaadin.ui.Table; +import com.vaadin.ui.TextArea; +import com.vaadin.ui.TextField; +import com.vaadin.ui.Tree; +import com.vaadin.ui.TreeTable; +import com.vaadin.ui.TwinColSelect; + +public class TabIndexes extends AbstractTestUI { + + private List<AbstractField> fields; + private Log log = new Log(5); + + @Override + protected void setup(VaadinRequest request) { + addComponent(log); + HorizontalLayout buttonLayout = new HorizontalLayout(); + addComponent(buttonLayout); + Button clearTabIndexes = new Button("Set all tab indexes to 0"); + clearTabIndexes.addClickListener(new ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + log.log("Setting tab indexes to 0"); + for (AbstractField f : fields) { + f.setTabIndex(0); + } + updateCaptions(); + } + }); + Button setTabIndexesToOne = new Button("Set all tab indexes to 1"); + setTabIndexesToOne.addClickListener(new ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + log.log("Setting tab indexes to 1"); + for (AbstractField f : fields) { + f.setTabIndex(1); + } + updateCaptions(); + } + }); + Button setTabIndexesInOrder = new Button("Set tab indexes to 1..N"); + setTabIndexesInOrder.addClickListener(new ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + int tabIndex = 1; + log.log("Setting tab indexes to 1..N"); + for (AbstractField f : fields) { + f.setTabIndex(tabIndex++); + } + updateCaptions(); + } + }); + Button setTabIndexesInReverseOrder = new Button( + "Set tab indexes to N..1"); + setTabIndexesInReverseOrder.addClickListener(new ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + int tabIndex = fields.size(); + log.log("Setting tab indexes to N..1"); + for (AbstractField f : fields) { + f.setTabIndex(tabIndex--); + } + updateCaptions(); + } + }); + fields = new ArrayList<AbstractField>(); + Table t = new Table(); + t.setSelectable(true); + t.addContainerProperty("foo", String.class, "bar"); + t.addItem(); + fields.add(t); + fields.add(new ComboBox()); + fields.add(new NativeSelect()); + fields.add(new ListSelect()); + fields.add(new TextField()); + fields.add(new PopupDateField()); + fields.add(new InlineDateField()); + OptionGroup og = new OptionGroup(); + og.addItem("Item 1"); + og.addItem("Item 2"); + fields.add(og); + TreeTable tt = new TreeTable(); + tt.setSelectable(true); + tt.addContainerProperty("foo", String.class, "bar"); + tt.addItem(); + + fields.add(tt); + Tree tree = new Tree(); + tree.addItem("Item 1"); + fields.add(tree); + fields.add(new TwinColSelect()); + fields.add(new PasswordField()); + fields.add(new TextField()); + fields.add(new TextArea()); + fields.add(new RichTextArea()); + fields.add(new CheckBox()); + // fields.add(new Slider()); + + clearTabIndexes.click(); + + buttonLayout.addComponents(clearTabIndexes, setTabIndexesToOne, + setTabIndexesInOrder, setTabIndexesInReverseOrder); + + int fieldId = 1; + GridLayout gl = new GridLayout(4, 4); + for (Field f : fields) { + f.setId("field-" + fieldId++); + gl.addComponent(f); + } + addComponent(gl); + + } + + protected void updateCaptions() { + for (Field f : fields) { + f.setCaption(f.getClass().getSimpleName() + " Tab index: " + + f.getTabIndex()); + } + } + + @Override + protected Integer getTicketNumber() { + return 10315; + } + + @Override + protected String getTestDescription() { + // TODO Auto-generated method stub + return null; + } + +} |