Use TestBench-4.0.2

- Based on TB4 Parallel testing.
- Browser setup no longer uses static capabilities.
- Some code cleanup here and there.

Change-Id: I5c419316cd36f4f5041eaa8da8fda3d8b46596c4

2 files changed, 6 insertions, 5 deletions

diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java
index a95ceca22b..9bb53d8742 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java
@@ -19,6 +19,7 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class CaptionLeakTest extends MultiBrowserTest {
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java
index 1afcabec1d..0890414fea 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java
@@ -24,6 +24,7 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class VerticalLayoutFocusWithDOMChangesTest extends MultiBrowserTest {
@@ -54,8 +55,8 @@ public class VerticalLayoutFocusWithDOMChangesTest extends MultiBrowserTest {
         Assert.assertEquals("Just a button", activeElement.getText());
 
         DesiredCapabilities capabilities = getDesiredCapabilities();
-        if (capabilities.equals(BrowserUtil.ie(8))
-                || capabilities.equals(BrowserUtil.ie(9))) {
+        if (BrowserUtil.isIE8(capabilities)
+                || BrowserUtil.isIE(capabilities, 9)) {
             // IE8 and IE9 insert cursor in the start of input instead of end.
             Assert.assertEquals(incrementalText + initialText,
                     tf1.getAttribute("value"));
@@ -86,8 +87,8 @@ public class VerticalLayoutFocusWithDOMChangesTest extends MultiBrowserTest {
 
         new Actions(getDriver()).sendKeys(secondText).build().perform();
         DesiredCapabilities capabilities = getDesiredCapabilities();
-        if (capabilities.equals(BrowserUtil.ie(8))
-                || capabilities.equals(BrowserUtil.ie(9))) {
+        if (BrowserUtil.isIE8(capabilities)
+                || BrowserUtil.isIE(capabilities, 9)) {
             // IE8 and IE9 insert cursor in the start of input instead of end.
             Assert.assertEquals(secondText + firstText,
                     tf2.getAttribute("value"));
@@ -96,5 +97,4 @@ public class VerticalLayoutFocusWithDOMChangesTest extends MultiBrowserTest {
                     tf2.getAttribute("value"));
         }
     }
-
 }