Merge branch 'develop' into automationTest

[pub/Android/ownCloud.git] / automationTest / src / test / java / androidtest / tests / Config.java

diff --git a/automationTest/src/test/java/androidtest/tests/Config.java b/automationTest/src/test/java/androidtest/tests/Config.java
index 4e1b0fe..5f5da2b 100644 (file)
--- a/automationTest/src/test/java/androidtest/tests/Config.java
+++ b/automationTest/src/test/java/androidtest/tests/Config.java
@@ -3,22 +3,27 @@ package androidtest.tests;
 public final class Config {
        
        public static final String server = "owncloudServerVar";
 public final class Config {
        
        public static final String server = "owncloudServerVar";

-       public static final Boolean hasSubdirectory = false;
-       public static String URL = GetURl(hasSubdirectory);
+       public static final Boolean hasResource = false;
+       public static String URL = GetURl(server, hasResource, "resourceServerVar");
+       public static boolean isTrusted = true;
+       
+       public static final String server2 = "owncloudServer2Var";
+       public static final Boolean hasResource2 = false;
+       public static String URL2 = GetURl(server2, hasResource2, "resourceServerVar");
+       public static boolean isTrusted2 = true;

        
        public static final String user = "owncloudUserVar";
        public static final String password = "owncloudPasswordVar";
        public static final String user2 = "owncloudUser2Var";
        public static final String password2 = "owncloudPassword2Var";
        
        public static final String user = "owncloudUserVar";
        public static final String password = "owncloudPasswordVar";
        public static final String user2 = "owncloudUser2Var";
        public static final String password2 = "owncloudPassword2Var";

-       public static final String userAccount = user + "@"+server;
-       public static final String userAccount2 = user2 + "@"+server;
+       public static final String userAccount = user + "@"+ server;
+       public static final String userAccount2 = user2 + "@"+ server2;

        
        

-       public static String GetURl(Boolean hasSubdirectory){
+       public static String GetURl(String server, Boolean hasSubdirectory, String serverResource){

                if(hasSubdirectory){
                if(hasSubdirectory){

-                       return server + "/owncloud";
+                       return server + serverResource;

                }else{
                        return server;
                }
        }
                }else{
                        return server;
                }
        }

-

 }
 }