removed scrollTo() from AndroidElement

Author: Jonahss

src/main/java/io/appium/java_client/MobileElement.java

@@ -27,7 +27,7 @@
 
 import java.util.List;
 
-public abstract class MobileElement extends RemoteWebElement implements FindsByAccessibilityId, ScrollsTo {
+public abstract class MobileElement extends RemoteWebElement implements FindsByAccessibilityId {
 
 	protected FileDetector fileDetector;
 

src/main/java/io/appium/java_client/android/AndroidElement.java

@@ -20,27 +20,4 @@ public List<WebElement> findElementsByAndroidUIAutomator(String using) {
 		return findElements("-android uiautomator", using);
 	}
 
-	/**
-	   * Scroll forward to the element which has a description or name which contains the input text.
-	   * The scrolling is performed on the first scrollView present on the UI
-	   * @param text
-	   */	
-	@Override
-	public MobileElement scrollTo(String text) {
-		String uiScrollables = AndroidDriver.UiScrollable("new UiSelector().descriptionContains(\"" + text + "\")") +
-				AndroidDriver.UiScrollable("new UiSelector().textContains(\"" + text + "\")");
-        return (MobileElement) findElementByAndroidUIAutomator(uiScrollables);
-	}
-
-	/**
-	 * Scroll forward to the element which has a description or name which exactly matches the input text.
-	 * The scrolling is performed on the first scrollView present on the UI
-	 * @param text
-	 */
-	@Override
-	public MobileElement scrollToExact(String text) {
-	    String uiScrollables = AndroidDriver.UiScrollable("new UiSelector().description(\"" + text + "\")") +
-	    		AndroidDriver.UiScrollable("new UiSelector().text(\"" + text + "\")");
-        return (MobileElement) findElementByAndroidUIAutomator(uiScrollables);
-	}
 }

src/main/java/io/appium/java_client/ios/IOSDriver.java

@@ -27,22 +27,22 @@ public IOSDriver(URL remoteAddress, Capabilities desiredCapabilities) {
 
   /**
    * Scroll to the element whose 'text' attribute contains the input text.
-   * This scrolling happens within the first UIATableView on the UI. Use the additional 'context' param to specify a different scrollView.
+   * This scrolling happens within the first UIATableView on the UI. Use the method on IOSElement to scroll from a different ScrollView.
    * @param text input text contained in text attribute
    */
    @Override
    public MobileElement scrollTo(String text) {
-     return ((MobileElement) findElementByClassName("UIATableView")).scrollTo(text);
+     return ((IOSElement) findElementByClassName("UIATableView")).scrollTo(text);
    }
 
    /**
    * Scroll to the element whose 'text' attribute is equal to the input text.
-   * This scrolling happens within the first UIATableView on the UI. Use the additional 'context' param to specify a different scrollView.
+   * This scrolling happens within the first UIATableView on the UI. Use the method on IOSElement to scroll from a different ScrollView.
    * @param text input text to match
    */
    @Override
    public MobileElement scrollToExact(String text) {
-	  return ((MobileElement) findElementByClassName("UIATableView")).scrollToExact(text);
+	  return ((IOSElement) findElementByClassName("UIATableView")).scrollToExact(text);
    }
 
    /**

src/main/java/io/appium/java_client/ios/IOSElement.java

@@ -1,13 +1,13 @@
 package io.appium.java_client.ios;
 
-import java.util.List;
-
-import org.openqa.selenium.WebElement;
-
 import io.appium.java_client.FindsByIosUIAutomation;
 import io.appium.java_client.MobileElement;
+import io.appium.java_client.ScrollsTo;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
 
-public class IOSElement extends MobileElement implements FindsByIosUIAutomation{
+public class IOSElement extends MobileElement implements FindsByIosUIAutomation, ScrollsTo {
 
 	@Override
 	public WebElement findElementByIosUIAutomation(String using) {
@@ -19,11 +19,21 @@ public List<WebElement> findElementsByIosUIAutomation(String using) {
 		return findElements("-ios uiautomation", using);
 	}
 
+  /**
+   * Scroll to the element whose 'text' attribute contains the input text.
+   * Scrolling happens within this element
+   * @param text input text contained in text attribute
+   */
 	@Override
 	public MobileElement scrollTo(String text) {
 		return (MobileElement) findElementByIosUIAutomation(".scrollToElementWithPredicate(\"name CONTAINS '" + text + "'\")");
 	}
 
+  /**
+   * Scroll to the element whose 'text' attribute matches the input text.
+   * Scrolling happens within this element
+   * @param text input text contained in text attribute
+   */
 	@Override
 	public MobileElement scrollToExact(String text) {
 		return (MobileElement) findElementByIosUIAutomation(".scrollToElementWithName(\"" + text + "\")");

src/test/java/io/appium/java_client/android/AndroidDriverTest.java

@@ -18,15 +18,12 @@
 package io.appium.java_client.android;
 
 import io.appium.java_client.AppiumSetting;
-import io.appium.java_client.MobileElement;
 import io.appium.java_client.NetworkConnectionSetting;
 import io.appium.java_client.remote.MobileCapabilityType;
-
 import org.apache.commons.codec.binary.Base64;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
@@ -172,16 +169,4 @@ public void scrollToExactTest() {
     WebElement views = driver.findElementByAccessibilityId("Views");
     assertNotNull(views);
   }
-  
-  @Test
-  public void scrollToFromElementTest() {
-	MobileElement el = ((MobileElement) (driver.findElement(By.className("android.widget.FrameLayout")))).scrollTo("View");  
-    assertNotNull(el);
-  }
-
-  @Test
-  public void scrollToExactFromElementTest() {
-	MobileElement el = ((MobileElement) (driver.findElement(By.className("android.widget.FrameLayout")))).scrollToExact("Views");  
-    assertNotNull(el);
-  }
 }