appium#714 FIX

TikhomirovSergey · TikhomirovSergey · commit 168d9d8cc068 · 2017-09-02T12:17:30.000+03:00
- test improvement
diff --git a/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java b/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java
@@ -1,12 +1,11 @@
 package io.appium.java_client.android;
 
 import static org.junit.Assert.assertNotEquals;
+import static org.openqa.selenium.By.id;
 
-import com.google.common.base.Function;
 
 import org.junit.Test;
 
-import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
 import java.util.List;
@@ -17,18 +16,15 @@ public void openNotification() throws Exception {
         driver.closeApp();
         driver.openNotifications();
         WebDriverWait wait = new WebDriverWait(driver, 20);
-        assertNotEquals(0, wait.until(new Function<WebDriver, List<AndroidElement>>() {
-            @Override
-            public List<AndroidElement> apply(WebDriver input) {
-                List<AndroidElement> result = driver
-                        .findElementsById("com.android.systemui:id/carrier_label");
+        assertNotEquals(0, wait.until(input -> {
+            List<AndroidElement> result = input
+                    .findElements(id("com.android.systemui:id/carrier_label"));
 
-                if (result.size() == 0) {
-                    return null;
-                }
-
-                return result;
+            if (result.size() == 0) {
+                return null;
             }
+
+            return result;
         }).size());
     }
 }
diff --git a/src/test/java/io/appium/java_client/ios/IOSElementTest.java b/src/test/java/io/appium/java_client/ios/IOSElementTest.java
@@ -5,13 +5,11 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
-import com.google.common.base.Function;
 
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
@@ -32,15 +30,12 @@ public class IOSElementTest extends UICatalogIOSTest {
 
         WebDriverWait wait = new WebDriverWait(driver, 20);
 
-        IOSElement slider = (IOSElement) wait.until(new Function<WebDriver, List<WebElement>>() {
-            @Override
-            public List<WebElement> apply(WebDriver input) {
-                List<WebElement> result = input.findElements(By.className("UIASlider"));
-                if (result.size() == 0) {
-                    return null;
-                }
-                return result;
+        IOSElement slider = (IOSElement) wait.until(input -> {
+            List<WebElement> result = input.findElements(By.className("UIASlider"));
+            if (result.size() == 0) {
+                return null;
             }
+            return result;
         }).get(1);
         slider.setValue("0%");
         assertEquals("0%", slider.getAttribute("value"));
