fix: change the browser matcher for a more generic one. Some basic improvements

Author: jesmrec

executeTests

@@ -44,8 +44,8 @@ help()
    echo -e ""
    echo -e "\t\t\$APPIUM_URL (optional): Appium server URL. if Appium Server is not specified, will be used \"localhost:4723/wd/hub\""
    echo -e ""
-      echo -e "\t\t\$BACKEND (optional): oCIS or oC10. If not specified, will be used oCIS"
-      echo -e ""
+   echo -e "\t\t\$BACKEND (optional): oCIS or oC10. If not specified, will be used oCIS"
+   echo -e ""
    echo -e "The option -h: will show this help"
    echo -e ""
    echo -e ""

src/main/java/android/FileListPage.java

@@ -93,6 +93,9 @@ public class FileListPage extends CommonPage {
     @AndroidFindBy(id = "com.owncloud.android:id/dialog_file_already_exists_title")
     WebElement conflictTitle;
 
+    @AndroidFindBy(id = "android:id/chooser_header")
+    List<WebElement> chooserHeader;
+
     public static FileListPage instance;
 
     private FileListPage() {
@@ -343,9 +346,10 @@ public boolean isItemOpened(String itemType, String itemName) {
         if (itemType.equals("file")) {
             Log.log(Level.FINE, "Opening file");
             //Waiting till file is opened and the dialog shown
-            waitById(WAIT_TIME, "android:id/chooser_header");
-            //To dismiss the dialog
-            tap(200,300);
+            if (!chooserHeader.isEmpty()) {
+                //To dismiss the dialog if the specific version shows the chooser header
+                tap(200, 300);
+            }
             boolean fileNameVisible = findUIAutomatorText(itemName).isDisplayed();
             boolean fileTypeIconVisible = findId("com.owncloud.android:id/fdImageDetailFile").isDisplayed();
             return fileNameVisible && fileTypeIconVisible;

src/main/java/android/ShortcutDialogPage.java

@@ -23,7 +23,7 @@ public class ShortcutDialogPage extends CommonPage {
     @AndroidFindBy(id = "android:id/button1")
     private WebElement openShortcut;
 
-    @AndroidFindBy(id = "com.android.chrome:id/fre_main_layout")
+    @AndroidFindBy(id = "com.android.chrome:id/title")
     private WebElement browser;
 
     public static ShortcutDialogPage instance;

src/test/java/io/cucumber/DocumentProviderSteps.java

@@ -4,7 +4,6 @@
 
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.When;
-import utils.log.Log;
 import utils.log.StepLogger;
 
 public class DocumentProviderSteps {

src/test/java/io/cucumber/LoginSteps.java

@@ -10,7 +10,6 @@
 
 import io.cucumber.java.en.Given;
 import utils.LocProperties;
-import utils.log.Log;
 import utils.log.StepLogger;
 
 public class LoginSteps {

src/test/java/io/cucumber/UploadSteps.java

@@ -3,7 +3,6 @@
 import java.util.logging.Level;
 
 import io.cucumber.java.en.Then;
-import utils.log.Log;
 import utils.log.StepLogger;
 
 public class UploadSteps {