From dbf7da41eb8a311a2c9eb97a42d7dfaa9364b258 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com>
Date: Thu, 23 Nov 2017 11:38:13 +0200
Subject: Fix issues from TestBench version upgrade (#10360)

---
 test/bean-api-validation/pom.xml                           | 14 +++++++++++++-
 .../src/test/java/com/vaadin/data/BeanValidationTest.java  |  2 +-
 .../test/java/com/vaadin/test/osgi/KarafIntegrationIT.java |  8 ++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/bean-api-validation/pom.xml b/test/bean-api-validation/pom.xml
index c384fd10ef..629861fda2 100644
--- a/test/bean-api-validation/pom.xml
+++ b/test/bean-api-validation/pom.xml
@@ -9,6 +9,19 @@
     </parent>
     <artifactId>vaadin-test-bean-api-validation</artifactId>
     <packaging>jar</packaging>
+    
+    <dependencies>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-testbench-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.validation</groupId>
+                    <artifactId>validation-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
@@ -37,5 +50,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/test/bean-api-validation/src/test/java/com/vaadin/data/BeanValidationTest.java b/test/bean-api-validation/src/test/java/com/vaadin/data/BeanValidationTest.java
index dd7c158692..ddd42e367f 100644
--- a/test/bean-api-validation/src/test/java/com/vaadin/data/BeanValidationTest.java
+++ b/test/bean-api-validation/src/test/java/com/vaadin/data/BeanValidationTest.java
@@ -46,7 +46,7 @@ public class BeanValidationTest {
     public void binderWorksWithoutBeanValidationLib() {
         try {
             Class.forName("javax.validation.Validation");
-            fail();
+            fail("Validation API should not be present");
         } catch (ClassNotFoundException ignored) {
         }
 
diff --git a/test/servlet-containers/karaf/karaf-run/src/test/java/com/vaadin/test/osgi/KarafIntegrationIT.java b/test/servlet-containers/karaf/karaf-run/src/test/java/com/vaadin/test/osgi/KarafIntegrationIT.java
index 6cede7b3af..d9e848eeb5 100644
--- a/test/servlet-containers/karaf/karaf-run/src/test/java/com/vaadin/test/osgi/KarafIntegrationIT.java
+++ b/test/servlet-containers/karaf/karaf-run/src/test/java/com/vaadin/test/osgi/KarafIntegrationIT.java
@@ -17,6 +17,8 @@ package com.vaadin.test.osgi;
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.function.Function;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -26,7 +28,6 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.phantomjs.PhantomJSDriver;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
-import com.google.common.base.Predicate;
 import com.vaadin.testbench.TestBenchTestCase;
 import com.vaadin.testbench.elements.TextFieldElement;
 
@@ -52,9 +53,8 @@ public class KarafIntegrationIT extends TestBenchTestCase {
 
     private void runBasicTest(String app1Url, String text) {
         getDriver().navigate().to(app1Url);
-        Predicate<WebDriver> isTrue = driver -> isElementPresent(
-                TextFieldElement.class);
-        new WebDriverWait(getDriver(), 5000).until(isTrue);
+        new WebDriverWait(getDriver(), 5000)
+                .until(driver -> isElementPresent(TextFieldElement.class));
         getDriver().findElement(By.className("v-textfield")).sendKeys(text);
         getDriver().findElement(By.className("v-button")).click();
         String foundText = getDriver().findElement(By.className("v-label"))
-- 
cgit v1.2.3