Upgrade to TestBench 5 alpha1 and JUnit 4.12

Change-Id: Ib3f88b6aca37ebb1962b4692df0c4ba11fe92bc2

3 files changed, 5 insertions, 11 deletions

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<TestBenchElement> 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() {