IOSElement test was improved

Author: TikhomirovSergey

src/test/java/io/appium/java_client/ios/IOSElementTest.java

@@ -1,41 +1,47 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package io.appium.java_client.ios;
 
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNot.not;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+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;
+
+import java.util.List;
 
-public class IOSElementTest extends AppIOSTest {
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class IOSElementTest extends UICatalogIOSTest {
 
     @Test public void findByAccessibilityIdTest() {
-        assertNotEquals(driver.findElementsByClassName("UIAWindow").get(1)
-            .findElementsByAccessibilityId("ComputeSumButton").size(), 0);
+        assertThat((driver.findElementsByClassName("UIAWindow").get(1))
+                        .findElementsByAccessibilityId("Sliders").size(),
+                not(is(0)));
     }
 
-    @Test public void findByByIosUIAutomationTest() {
-        assertNotEquals((driver.findElementsByClassName("UIAWindow")
-            .get(1))
-            .findElementByIosUIAutomation(".elements().withName(\"Answer\")").getText(), null);
-    }
+    @Test public void setValueTest() {
+        driver.findElementsByClassName("UIAWindow").get(1)
+                .findElementByAccessibilityId("Sliders").click();
+
+        WebDriverWait wait = new WebDriverWait(driver, 20);
 
-    @Test public void setValuerTest() {
-        IOSElement slider = driver.findElementByClassName("UIASlider");
+        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;
+            }
+        }).get(1);
         slider.setValue("0%");
         assertEquals("0%", slider.getAttribute("value"));
     }

src/test/java/io/appium/java_client/pagefactory_tests/IOSPageFactoryTest.java

@@ -23,9 +23,9 @@
 
 import io.appium.java_client.MobileElement;
 import io.appium.java_client.TouchableElement;
-import io.appium.java_client.ios.IOSElement;
 
 import io.appium.java_client.ios.AppIOSTest;
+import io.appium.java_client.ios.IOSElement;
 import io.appium.java_client.pagefactory.AndroidFindBy;
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
 import io.appium.java_client.pagefactory.HowToUseLocators;