Merge remote-tracking branch 'origin/master' into grid

Conflicts:
	WebContent/release-notes.html

Change-Id: Ie05bea7142134a7a9d655fcdf6ca232fd13c742b

1 files changed, 107 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java b/uitest/src/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java
new file mode 100644
index 0000000000..2ab6be25ac
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2000-2014 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.accessibility;
+
+import java.util.Stack;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.window.WindowRole;
+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.Window;
+
+/**
+ * UI to test if subwindows get the correct assistive roles.
+ *
+ * @author Vaadin Ltd
+ */
+public class WindowWaiAriaRoles extends AbstractTestUI {
+    Stack<Window> windows = new Stack<Window>();
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
+     * VaadinRequest)
+     */
+    @Override
+    protected void setup(VaadinRequest request) {
+        Button closeButton = new Button("Close windows");
+        closeButton.addClickListener(new ClickListener() {
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                while (!windows.isEmpty()) {
+                    Window window = windows.pop();
+                    removeWindow(window);
+                }
+            }
+
+        });
+
+        Button regularButton = new Button("Regular");
+        regularButton.addClickListener(new ClickListener() {
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                Window regularWindow = new Window("Regular window");
+                openWindow(regularWindow);
+            }
+        });
+
+        Button alertButton = new Button("Alert");
+        alertButton.addClickListener(new ClickListener() {
+            @Override
+            public void buttonClick(ClickEvent event) {
+                Window alertWindow = new Window("Alert window");
+                alertWindow.setAssistiveRole(WindowRole.ALERTDIALOG);
+                openWindow(alertWindow);
+            }
+        });
+        addComponent(closeButton);
+        addComponent(regularButton);
+        addComponent(alertButton);
+    }
+
+    void openWindow(Window window) {
+        windows.push(window);
+        window.center();
+        addWindow(window);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
+     */
+    @Override
+    protected String getTestDescription() {
+        return "The alert window should have the role 'alertdialog' and the regular window should have the role 'dialog'";
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
+     */
+    @Override
+    protected Integer getTicketNumber() {
+        return 14289;
+    }
+
+}