Implemented Focusable in MenuBar (#7674)

Change-Id: I31cd6fafffacc16147e63d3878fcf025163deb5b
author: Jens Jansson <peppe@vaadin.com> 2013-06-28 15:09:08 +0300
committer: Vaadin Code Review <review@vaadin.com> 2013-06-28 12:36:19 +0000
commit: 419c6c787508a8b9c14a4613a96f3ac8e48b1981 (patch)
tree: 2ee3fadab43f45c3c4a1410d335dae0eb147d7fa /uitest
parent: c107efcb1bdcf1528b56016dc277fdd44513077d (diff)
download: vaadin-framework-419c6c787508a8b9c14a4613a96f3ac8e48b1981.tar.gz
vaadin-framework-419c6c787508a8b9c14a4613a96f3ac8e48b1981.zip
2 files changed, 173 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.html
new file mode 100644
index 0000000000..cd8de3757a
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.html
@@ -0,0 +1,71 @@
+<?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="" />
+<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/MenuBarFocus?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VMenuBar[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VMenuBar[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VMenuBar[0]</td>
+	<td>enter</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VLabel[0]</td>
+	<td>Foo clicked</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VMenuBar[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VMenuBar[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VMenuBar[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VMenuBar[0]</td>
+	<td>enter</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VLabel[0]</td>
+	<td>Bar clicked</td>
+</tr>
+</tbody></table>
+</body>
+</html>
+\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.java
new file mode 100644
index 0000000000..2ea7a23333
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.menubar;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.MenuBar;
+import com.vaadin.ui.MenuBar.Command;
+import com.vaadin.ui.MenuBar.MenuItem;
+
+public class MenuBarFocus extends AbstractTestUI {
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
+     * VaadinRequest)
+     */
+    @Override
+    protected void setup(VaadinRequest request) {
+        final MenuBar bar = buildMenu();
+        Button focusButton = buildButton(bar);
+
+        addComponent(bar);
+        addComponent(focusButton);
+        getLayout().setSpacing(true);
+    }
+
+    private MenuBar buildMenu() {
+        final MenuBar bar = new MenuBar();
+        bar.setDescription("Root Menu");
+
+        Command command = new Command() {
+
+            @Override
+            public void menuSelected(MenuItem selectedItem) {
+                addComponent(new Label(selectedItem.getText() + " clicked"));
+
+            }
+        };
+
+        // File
+        final MenuItem file = bar.addItem("File", null);
+        file.addItem("Foo", command);
+        file.addItem("Bar", command);
+
+        // Edit
+        MenuItem edit = bar.addItem("Edit", null);
+        edit.addItem("Baz", command);
+        edit.addItem("Bay", command);
+
+        bar.setTabIndex(2);
+        return bar;
+    }
+
+    private Button buildButton(final MenuBar bar) {
+        ClickListener buttonClickListener = new ClickListener() {
+            @Override
+            public void buttonClick(ClickEvent event) {
+                bar.focus();
+            }
+        };
+
+        Button focusButton = new Button("Click me to focus the menubar",
+                buttonClickListener);
+        focusButton.setTabIndex(1);
+        return focusButton;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
+     */
+    @Override
+    protected String getTestDescription() {
+        return "This test checks if you can focus a menu bar on the client from the server side";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 7674;
+    }
+
+}
author	Jens Jansson <peppe@vaadin.com>	2013-06-28 15:09:08 +0300
committer	Vaadin Code Review <review@vaadin.com>	2013-06-28 12:36:19 +0000
commit	419c6c787508a8b9c14a4613a96f3ac8e48b1981 (patch)
tree	2ee3fadab43f45c3c4a1410d335dae0eb147d7fa /uitest
parent	c107efcb1bdcf1528b56016dc277fdd44513077d (diff)
download	vaadin-framework-419c6c787508a8b9c14a4613a96f3ac8e48b1981.tar.gz vaadin-framework-419c6c787508a8b9c14a4613a96f3ac8e48b1981.zip