Merge pull request #453 from owncloud/improve_action_bar_pr_392_with_develop

[pub/Android/ownCloud.git] / tests / src / com / owncloud / android / test / AccountUtilsTest.java

diff --git a/tests/src/com/owncloud/android/test/AccountUtilsTest.java b/tests/src/com/owncloud/android/test/AccountUtilsTest.java
index 528392a..fc6dc21 100644 (file)
--- a/tests/src/com/owncloud/android/test/AccountUtilsTest.java
+++ b/tests/src/com/owncloud/android/test/AccountUtilsTest.java
@@ -3,9 +3,8 @@
  *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify

- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 2 of the License, or
- *   (at your option) any later version.
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.

  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -19,10 +18,11 @@
 
 package com.owncloud.android.test;
 
 
 package com.owncloud.android.test;
 

+import com.owncloud.android.lib.common.accounts.AccountUtils;
+import com.owncloud.android.lib.resources.status.OwnCloudVersion;
+

 import android.test.AndroidTestCase;
 
 import android.test.AndroidTestCase;
 

-import com.owncloud.android.AccountUtils;
-import com.owncloud.android.utils.OwnCloudVersion;

 
 public class AccountUtilsTest extends AndroidTestCase {
     
 
 public class AccountUtilsTest extends AndroidTestCase {
     


@@ -35,14 +35,21 @@ public class AccountUtilsTest extends AndroidTestCase {
         OwnCloudVersion ocv45 = new OwnCloudVersion(0x040500);
         OwnCloudVersion ocv70 = new OwnCloudVersion(0x070000);
 
         OwnCloudVersion ocv45 = new OwnCloudVersion(0x040500);
         OwnCloudVersion ocv70 = new OwnCloudVersion(0x070000);
 

-        assertTrue(AccountUtils.getWebdavPath(ocv12).equals("/webdav/owncloud.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv12s).equals("/webdav/owncloud.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv22).equals("/files/webdav.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv30).equals("/files/webdav.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv33s).equals("/files/webdav.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv45).equals("/remote.php/webdav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv70).equals("/remote.php/webdav"));
-        assertNull(AccountUtils.getWebdavPath(null));
+        assertTrue(AccountUtils.getWebdavPath(ocv12, false, false).equals("/webdav/owncloud.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv12s, false, false).equals("/webdav/owncloud.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv22, false, false).equals("/files/webdav.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv30,false, false).equals("/files/webdav.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv33s, false, false).equals("/files/webdav.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv45, false, false).equals("/remote.php/webdav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv70, false, false).equals("/remote.php/webdav"));
+        assertNull(AccountUtils.getWebdavPath(null, false, false));
+        assertTrue(AccountUtils.getWebdavPath(ocv12, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv12s, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv22, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv30, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv33s, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv45, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv70, true, false).equals("/remote.php/odav"));

 
         OwnCloudVersion invalidVer = new OwnCloudVersion("a.b.c");
         assertFalse(invalidVer.isVersionValid());
 
         OwnCloudVersion invalidVer = new OwnCloudVersion("a.b.c");
         assertFalse(invalidVer.isVersionValid());