summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorOlli Tietäväinen <ollit@vaadin.com>2018-02-12 15:14:49 +0200
committerIlia Motornyi <elmot@vaadin.com>2018-02-28 12:55:15 +0300
commit3e8c87939b2ec7fd25f96bfacfbdf915a14b2344 (patch)
tree02d055dbcd94e335c6ea80a8d83d3db3b596cc61 /uitest
parent333787c4bdff7008b4a0c97d810d1cc89d7dddf7 (diff)
downloadvaadin-framework-3e8c87939b2ec7fd25f96bfacfbdf915a14b2344.tar.gz
vaadin-framework-3e8c87939b2ec7fd25f96bfacfbdf915a14b2344.zip
Implement focus handing in RadioButtonGroup and CheckboxGroup (#10440)
Fixes #10429 * implement focus handing in RadioButtonGroup, fixes #10429 * Merge branch 'master' of https://github.com/vaadin/framework into radiobuttongroup-focus * merge * Merge branch 'master' of https://github.com/vaadin/framework into radiobuttongroup-focus * fix initial focus handling also on CheckBoxGroup and add tests * add license headers * Merge branch 'master' of https://github.com/vaadin/framework into radiobuttongroup-focus * changed client to use lambdas and refactored focus testing to parent class * made FocusTest abstract * Merge branch 'master' of https://github.com/vaadin/framework into radiobuttongroup-focus * don't allow focusing on disabled items & refactor focusing first item
Diffstat (limited to 'uitest')
-rwxr-xr-xuitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocus.java40
-rwxr-xr-xuitest/src/main/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocus.java44
-rwxr-xr-xuitest/src/test/java/com/vaadin/tests/components/FocusTest.java47
-rwxr-xr-xuitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusTest.java45
-rwxr-xr-xuitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocusTest.java45
5 files changed, 221 insertions, 0 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocus.java b/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocus.java
new file mode 100755
index 0000000000..7d845e96a4
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocus.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2000-2016 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.checkboxgroup;
+
+import com.vaadin.annotations.Widgetset;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBoxGroup;
+
+@Widgetset("com.vaadin.DefaultWidgetSet")
+public class CheckBoxGroupFocus extends AbstractTestUIWithLog {
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ CheckBoxGroup<String> cbg = new CheckBoxGroup<>("CheckBoxes");
+ cbg.setItems("Test1", "Test2", "Test3");
+ cbg.select("Test2");
+ cbg.setItemCaptionGenerator(item -> "Option " + item);
+ cbg.focus();
+ CheckBoxGroup<String> cbg2 = new CheckBoxGroup<>("No selection");
+ cbg2.setItems("Foo1", "Foo2", "Foo3");
+ Button button = new Button("focus second group", e -> cbg2.focus());
+ addComponents(cbg, cbg2, button);
+ }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocus.java b/uitest/src/main/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocus.java
new file mode 100755
index 0000000000..4342a32860
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocus.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2000-2016 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.radiobuttongroup;
+
+import com.vaadin.annotations.Widgetset;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.RadioButtonGroup;
+
+/**
+ * @author Vaadin Ltd
+ *
+ */
+@Widgetset("com.vaadin.DefaultWidgetSet")
+public class RadioButtonGroupFocus extends AbstractTestUIWithLog {
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ RadioButtonGroup<String> rbg = new RadioButtonGroup<>("Radios");
+ rbg.setItems("Test1", "Test2", "Test3");
+ rbg.setSelectedItem("Test2");
+ rbg.setItemCaptionGenerator(item -> "Option " + item);
+ rbg.focus();
+ RadioButtonGroup<String> rbg2 = new RadioButtonGroup<>("No selection");
+ rbg2.setItems("Foo1", "Foo2", "Foo3");
+ Button button = new Button("focus second group", e -> rbg2.focus());
+ addComponents(rbg, rbg2, button);
+ }
+
+}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/FocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/FocusTest.java
new file mode 100755
index 0000000000..ae7f5301d2
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/components/FocusTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2000-2016 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;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public abstract class FocusTest extends MultiBrowserTest {
+
+ protected boolean isFocusInsideElement(TestBenchElement element) {
+ WebElement focused = getFocusedElement();
+ assertNotNull(focused);
+ String id = focused.getAttribute("id");
+ assertTrue("Focused element should have a non-empty id",
+ id != null && !"".equals(id));
+ return element.isElementPresent(By.id(id));
+ }
+
+ @Override
+ public List<DesiredCapabilities> getBrowsersToTest() {
+ // Focus does not move when expected with Selenium/TB and Firefox 45
+ return getBrowsersExcludingFirefox();
+ }
+
+}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusTest.java
new file mode 100755
index 0000000000..4d6c52e22b
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2000-2016 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.checkboxgroup;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.CheckBoxGroupElement;
+import com.vaadin.tests.components.FocusTest;
+
+public class CheckBoxGroupFocusTest extends FocusTest {
+
+ @Test
+ public void focusOnInit() {
+ openTestURL();
+ CheckBoxGroupElement checkBoxGroup = $(CheckBoxGroupElement.class)
+ .first();
+ assertTrue(isFocusInsideElement(checkBoxGroup));
+ }
+
+ @Test
+ public void moveFocusAfterClick() {
+ openTestURL();
+ $(ButtonElement.class).first().click();
+ CheckBoxGroupElement checkBoxGroup = $(CheckBoxGroupElement.class)
+ .last();
+ assertTrue(isFocusInsideElement(checkBoxGroup));
+ }
+
+}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocusTest.java
new file mode 100755
index 0000000000..37916abf90
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocusTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2000-2016 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.radiobuttongroup;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.RadioButtonGroupElement;
+import com.vaadin.tests.components.FocusTest;
+
+public class RadioButtonGroupFocusTest extends FocusTest {
+
+ @Test
+ public void focusOnInit() {
+ openTestURL();
+ RadioButtonGroupElement radioButtonGroup = $(
+ RadioButtonGroupElement.class).first();
+ assertTrue(isFocusInsideElement(radioButtonGroup));
+ }
+
+ @Test
+ public void moveFocusAfterClick() {
+ openTestURL();
+ $(ButtonElement.class).first().click();
+ RadioButtonGroupElement radioButtonGroup2 = $(
+ RadioButtonGroupElement.class).last();
+ assertTrue(isFocusInsideElement(radioButtonGroup2));
+ }
+
+}