add new test cases

[pub/Android/ownCloud.git] / automationTest / src / test / java / androidtest / models / FilesView.java

diff --git a/automationTest/src/test/java/androidtest/models/FilesView.java b/automationTest/src/test/java/androidtest/models/FilesView.java
index 73fb67f..c913b10 100644 (file)
--- a/automationTest/src/test/java/androidtest/models/FilesView.java
+++ b/automationTest/src/test/java/androidtest/models/FilesView.java
@@ -1,22 +1,19 @@
 package androidtest.models;
 
-import java.util.HashMap;
-
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.android.AndroidElement;
 import io.appium.java_client.pagefactory.AndroidFindBy;
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
-
-import org.openqa.selenium.remote.RemoteWebElement;
 import org.openqa.selenium.support.CacheLookup;
 import org.openqa.selenium.support.PageFactory;
+import androidtest.actions.Actions;
 
-public class FilesView {
+public class FilesView{
        final AndroidDriver driver;
        
        @CacheLookup
        @AndroidFindBy(id = "com.owncloud.android:id/list_root")
-       private AndroidElement fileLayout;
+       private AndroidElement filesLayout;
        
        @CacheLookup
        @AndroidFindBy(id = "com.owncloud.android:id/upload_files_btn_upload")
@@ -35,12 +32,9 @@ public class FilesView {
                return mainView;
        }
        
+       //change to scrollTillFindElement
        public void scrollTillFindFile (String fileName) {
-        HashMap<String, String> scrollObject = new HashMap<String, String>();
-        scrollObject.put("text", fileName);
-        scrollObject.put("element", ( (RemoteWebElement) fileLayout).getId());
-        driver.executeScript("mobile: scrollTo", scrollObject);
-               fileElement = (AndroidElement) driver.findElementByName(fileName);
+               fileElement = Actions.scrollTillFindElement (fileName,filesLayout,driver);
        }
        
        public void clickOnFileName (String fileName) {