From d63c1f9014e0a49e5250edd41bd5c7542901c267 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 24 Nov 2016 14:52:15 +0200 Subject: Upgrade to TestBench 5 alpha1 and JUnit 4.12 Change-Id: Ib3f88b6aca37ebb1962b4692df0c4ba11fe92bc2 --- pom.xml | 2 +- .../vaadin/testbench/customelements/NativeSelectElement.java | 3 ++- .../java/com/vaadin/testbench/customelements/TableElement.java | 3 ++- .../src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java | 10 +--------- uitest/ivy.xml | 4 ++-- .../table/ColumnCollapsingAndColumnExpansionTest.java | 5 +++-- .../com/vaadin/tests/components/table/MemoryLeakTableTest.java | 2 +- 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 67d313a8e8..449920905c 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ com.vaadin vaadin-testbench - 4.1.0 + 5.0.0.alpha1 org.eclipse.jetty diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java index a183951a29..876f2e7c0b 100644 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java +++ b/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java @@ -35,7 +35,8 @@ public class NativeSelectElement extends AbstractSelectElement { } public List getOptions() { - return wrapElements(selectElement.getOptions(), getCommandExecutor()); + return wrapElements(selectElement.getOptions(), + getTestBenchCommandExecutor()); } public void selectByText(String text) throws ReadOnlyException { diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java index 28432fade9..733ddb5a8a 100644 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java +++ b/uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java @@ -11,7 +11,8 @@ public class TableElement extends com.vaadin.testbench.elements.TableElement { getCollapseMenuToggle().click(); WebElement cm = getDriver() .findElement(By.xpath("//*[@id='PID_VAADIN_CM']")); - return wrapElement(cm, getCommandExecutor()).wrap(CollapseMenu.class); + return wrapElement(cm, getTestBenchCommandExecutor()) + .wrap(CollapseMenu.class); } public static class CollapseMenu extends ContextMenuElement { diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java index dce2c77db0..023d32d6c9 100644 --- a/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java +++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java @@ -59,7 +59,6 @@ import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; -import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium; import com.vaadin.server.LegacyApplication; import com.vaadin.server.UIProvider; import com.vaadin.testbench.TestBenchDriverProxy; @@ -833,14 +832,7 @@ public abstract class AbstractTB3Test extends ParallelTest { } public void hitButton(String id) { - if (BrowserUtil.isPhantomJS(getDesiredCapabilities())) { - driver.findElement(By.id(id)).click(); - } else { - WebDriverBackedSelenium selenium = new WebDriverBackedSelenium( - driver, driver.getCurrentUrl()); - - selenium.keyPress("id=" + id, "\\13"); - } + driver.findElement(By.id(id)).click(); } protected void openDebugLogTab() { diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 3e92b17ff9..15da194adb 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -108,7 +108,7 @@ - @@ -122,7 +122,7 @@ + rev="5.0.0.alpha1" conf="build-provided -> default" /> diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java index 3b986b503c..7f0947fc2d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java @@ -26,6 +26,7 @@ import com.vaadin.testbench.TestBenchElement; import com.vaadin.testbench.customelements.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.TableElement.ContextMenuElement; +import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.tests.tb3.MultiBrowserTest; public class ColumnCollapsingAndColumnExpansionTest extends MultiBrowserTest { @@ -62,8 +63,8 @@ public class ColumnCollapsingAndColumnExpansionTest extends MultiBrowserTest { } private void contextClick(TestBenchElement e) { - if (e.isPhantomJS()) { - JavascriptExecutor js = e.getCommandExecutor(); + if (BrowserUtil.isPhantomJS(getDesiredCapabilities())) { + JavascriptExecutor js = (JavascriptExecutor) getDriver(); String scr = "var element=arguments[0];" + "var ev = document.createEvent('HTMLEvents');" + "ev.initEvent('contextmenu', true, false);" diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java index f950319e71..8e004c26a7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java @@ -86,7 +86,7 @@ public class MemoryLeakTableTest extends MultiBrowserTest { private void scrollTable(TableElement tbl, int value) { WebElement actualElement = tbl .findElement(By.className("v-table-body-wrapper")); - JavascriptExecutor js = tbl.getCommandExecutor(); + JavascriptExecutor js = (JavascriptExecutor) getDriver(); js.executeScript("arguments[0].scrollTop = " + value, actualElement); } } -- cgit v1.2.3