wip

tobiasKaminsky · tobiasKaminsky · commit 1f03609ec420 · 2022-05-20T09:51:46.000+02:00
Signed-off-by: tobiasKaminsky &lt;tobias@kaminsky.me&gt;
diff --git a/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperationIT.kt b/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperationIT.kt
@@ -59,7 +59,7 @@ class UnifiedSearchRemoteOperationIT : AbstractIT() {
     @Test
     fun filesSearch() {
         val remotePath = "/testFolder"
-        assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(client).isSuccess)
+        assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient).isSuccess)
         val remoteFile = ReadFileRemoteOperation(remotePath)
             .execute(client).data[0] as RemoteFile
         val fileId = remoteFile.localId
@@ -80,7 +80,12 @@ class UnifiedSearchRemoteOperationIT : AbstractIT() {
 
     @Test
     fun filesSearchWhitespace() {
-        assertTrue(CreateFolderRemoteOperation("/test Folder/", true).execute(client).isSuccess)
+        assertTrue(
+            CreateFolderRemoteOperation(
+                "/test Folder/",
+                true
+            ).execute(nextcloudClient).isSuccess
+        )
 
         val result = UnifiedSearchRemoteOperation("files", "test").execute(nextcloudClient)
         assertTrue(result.isSuccess)
diff --git a/library/src/androidTest/java/com/nextcloud/android/lib/richWorkspace/RichWorkspaceDirectEditingRemoteOperationIT.java b/library/src/androidTest/java/com/nextcloud/android/lib/richWorkspace/RichWorkspaceDirectEditingRemoteOperationIT.java
@@ -53,7 +53,7 @@ public void getEditLinkForRoot() {
     public void getEditLinkForFolder() {
         String path = "/workspace/sub1/";
 
-        assertTrue(new CreateFolderRemoteOperation(path, true).execute(client).isSuccess());
+        assertTrue(new CreateFolderRemoteOperation(path, true).execute(nextcloudClient).isSuccess());
 
         RemoteOperationResult result = new RichWorkspaceDirectEditingRemoteOperation(path).execute(client);
         assertTrue(result.isSuccess());
@@ -70,7 +70,7 @@ public void reuseExistingFile() throws IOException {
         String filePath = folder + "Readme.md";
         File txtFile = getFile(ASSETS__TEXT_FILE_NAME);
 
-        assertTrue(new CreateFolderRemoteOperation(folder, true).execute(client).isSuccess());
+        assertTrue(new CreateFolderRemoteOperation(folder, true).execute(nextcloudClient).isSuccess());
 
         RemoteOperationResult uploadResult = new UploadFileRemoteOperation(txtFile.getAbsolutePath(),
                 filePath,
diff --git a/library/src/androidTest/java/com/nextcloud/lib/resources/users/GetActivitiesRemoteOperationIT.kt b/library/src/androidTest/java/com/nextcloud/lib/resources/users/GetActivitiesRemoteOperationIT.kt
@@ -33,7 +33,12 @@ class GetActivitiesRemoteOperationIT : AbstractIT() {
     @Test
     fun getActivities() {
         // set-up, create a folder so there is an activity
-        assertTrue(CreateFolderRemoteOperation("/test/123/1", true).execute(client).isSuccess)
+        assertTrue(
+            CreateFolderRemoteOperation(
+                "/test/123/1",
+                true
+            ).execute(nextcloudClient).isSuccess
+        )
 
         val result = nextcloudClient.execute(GetActivitiesRemoteOperation())
         assertTrue(result.isSuccess)
diff --git a/library/src/androidTest/java/com/owncloud/android/CopyFileIT.java b/library/src/androidTest/java/com/owncloud/android/CopyFileIT.java
@@ -26,6 +26,10 @@
  */
 package com.owncloud.android;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 import android.util.Log;
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -42,10 +46,6 @@
 
 import java.io.File;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
 /**
  * Class to test CopyRemoteFileOperation
  */
@@ -180,7 +180,7 @@ public void createFixtures() throws Exception {
 
         RemoteOperationResult result;
         for (String folderPath : FOLDERS_IN_FIXTURE) {
-            result = new CreateFolderRemoteOperation(folderPath, true).execute(client);
+            result = new CreateFolderRemoteOperation(folderPath, true).execute(nextcloudClient);
 
             assertTrue("Error creating folder" + folderPath + ": " + result, result.isSuccess());
         }
diff --git a/library/src/androidTest/java/com/owncloud/android/CreateFolderIT.java b/library/src/androidTest/java/com/owncloud/android/CreateFolderIT.java
@@ -26,6 +26,8 @@
  */
 package com.owncloud.android;
 
+import static org.junit.Assert.assertTrue;
+
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.resources.files.CreateFolderRemoteOperation;
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
@@ -39,8 +41,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import static org.junit.Assert.assertTrue;
-
 /**
  * Class to test Create Folder Operation
  */
@@ -70,13 +70,13 @@ public void setUp() {
     public void testCreateFolder() {
         String remotePath = mFullPath2FolderBase;
         mCreatedFolderPaths.add(remotePath);
-        RemoteOperationResult result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
+        RemoteOperationResult result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
         assertTrue(result.isSuccess());
 
         // Create Subfolder
         remotePath = mFullPath2FolderBase + FOLDER_PATH_BASE;
         mCreatedFolderPaths.add(remotePath);
-        result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
+        result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
         assertTrue(result.isSuccess());
     }
 
@@ -87,31 +87,31 @@ public void testCreateFolder() {
     @Test
     public void testCreateFolderSpecialCharactersOnNewVersion() {
         String remotePath = mFullPath2FolderBase + "_<";
-        RemoteOperationResult result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
+        RemoteOperationResult result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
         assertTrue("Remote path: " + remotePath, result.isSuccess());
 
         remotePath = mFullPath2FolderBase + "_>";
-        result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
+        result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
         assertTrue("Remote path: " + remotePath, result.isSuccess());
 
         remotePath = mFullPath2FolderBase + "_:";
-        result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
+        result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
         assertTrue("Remote path: " + remotePath, result.isSuccess());
 
         remotePath = mFullPath2FolderBase + "_\"";
-        result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
+        result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
         assertTrue("Remote path: " + remotePath, result.isSuccess());
 
         remotePath = mFullPath2FolderBase + "_|";
-        result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
+        result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
         assertTrue("Remote path: " + remotePath, result.isSuccess());
 
         remotePath = mFullPath2FolderBase + "_?";
-        result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
+        result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
         assertTrue("Remote path: " + remotePath, result.isSuccess());
 
         remotePath = mFullPath2FolderBase + "_*";
-        result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
+        result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
         assertTrue("Remote path: " + remotePath, result.isSuccess());
     }
 
diff --git a/library/src/androidTest/java/com/owncloud/android/DeleteFileIT.java b/library/src/androidTest/java/com/owncloud/android/DeleteFileIT.java
@@ -58,7 +58,7 @@ public void setUp() throws Exception {
         mFullPath2Folder = baseFolderPath + FOLDER_PATH;
         mFullPath2File = baseFolderPath + FILE_PATH;
 
-        RemoteOperationResult result = new CreateFolderRemoteOperation(mFullPath2Folder, true).execute(client);
+        RemoteOperationResult result = new CreateFolderRemoteOperation(mFullPath2Folder, true).execute(nextcloudClient);
         assertTrue("Error creating folder" + mFullPath2Folder + ": " + result, result.isSuccess());
 
         File textFile = getFile(ASSETS__TEXT_FILE_NAME);
diff --git a/library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetSharesIT.java b/library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetSharesIT.java
@@ -49,15 +49,15 @@
 public class GetSharesIT extends AbstractIT {
     @Test
     public void testGetShares() {
-        assertTrue(new CreateFolderRemoteOperation("/1/", true).execute(client).isSuccess());
+        assertTrue(new CreateFolderRemoteOperation("/1/", true).execute(nextcloudClient).isSuccess());
         assertTrue(new CreateShareRemoteOperation("/1/",
                 ShareType.PUBLIC_LINK,
                 "",
                 false,
                 "",
                 1).execute(client).isSuccess());
 
-        assertTrue(new CreateFolderRemoteOperation("/2/", true).execute(client).isSuccess());
+        assertTrue(new CreateFolderRemoteOperation("/2/", true).execute(nextcloudClient).isSuccess());
         assertTrue(new CreateShareRemoteOperation("/2/",
                 ShareType.PUBLIC_LINK,
                 "",
diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/e2ee/UpdateMetadataRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/lib/resources/e2ee/UpdateMetadataRemoteOperationIT.java
@@ -59,7 +59,7 @@ public void uploadAndModify() {
 
         // create folder
         String folder = "/" + RandomString.make(20) + "/";
-        assertTrue(new CreateFolderRemoteOperation(folder, true).execute(client).isSuccess());
+        assertTrue(new CreateFolderRemoteOperation(folder, true).execute(nextcloudClient).isSuccess());
         RemoteFile remoteFolder = (RemoteFile) new ReadFileRemoteOperation(folder).execute(client).getSingleData();
 
         assertNotNull(remoteFolder);
diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperationIT.kt
@@ -31,7 +31,7 @@ class ReadFileRemoteOperationIT : AbstractIT() {
     fun readRemoteFolder() {
         val remotePath = "/test/"
 
-        assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(client).isSuccess)
+        assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient).isSuccess)
 
         val result = ReadFileRemoteOperation(remotePath).execute(client)
 
diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFolderRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFolderRemoteOperationIT.kt
@@ -32,7 +32,7 @@ class ReadFolderRemoteOperationIT : AbstractIT() {
     fun readRemoteFolderWithContent() {
         val remotePath = "/test/"
 
-        assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(client).isSuccess)
+        assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient).isSuccess)
 
         // create file
         val filePath = createFile("text")
diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java
@@ -73,7 +73,7 @@ public void testSearchByFileIdEmpty() {
 
     @Test
     public void testSearchByFileIdSuccess() {
-        assertTrue(new CreateFolderRemoteOperation("/test/", true).execute(client).isSuccess());
+        assertTrue(new CreateFolderRemoteOperation("/test/", true).execute(nextcloudClient).isSuccess());
 
         RemoteOperationResult readFile = new ReadFileRemoteOperation("/test/").execute(client);
         assertTrue(readFile.isSuccess());
@@ -164,7 +164,7 @@ public void oneFavorite() {
         String path = "/testFolder/";
 
         // create folder, make it favorite
-        new CreateFolderRemoteOperation(path, true).execute(client);
+        new CreateFolderRemoteOperation(path, true).execute(nextcloudClient);
         assertTrue(new ToggleFavoriteRemoteOperation(true, path).execute(client).isSuccess());
 
         SearchRemoteOperation sut = new SearchRemoteOperation("",
@@ -413,7 +413,7 @@ public void showOnlyFolders() throws IOException {
         assertTrue(result.isSuccess());
         assertTrue(result.getResultData().isEmpty());
 
-        assertTrue(new CreateFolderRemoteOperation("/folder/", false).execute(client).isSuccess());
+        assertTrue(new CreateFolderRemoteOperation("/folder/", false).execute(nextcloudClient).isSuccess());
 
         result = sut.execute(client);
         assertTrue(result.isSuccess());
diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperationIT.java
@@ -36,6 +36,7 @@
 
 import androidx.test.platform.app.InstrumentationRegistry;
 
+import com.nextcloud.common.NextcloudClient;
 import com.owncloud.android.AbstractIT;
 import com.owncloud.android.lib.common.OwnCloudBasicCredentials;
 import com.owncloud.android.lib.common.OwnCloudClient;
@@ -47,15 +48,17 @@
 
 import java.util.List;
 
+import okhttp3.Credentials;
+
 public class GetSharesRemoteOperationIT extends AbstractIT {
     @Test
     public void searchSharedFiles() {
-        assertTrue(new CreateFolderRemoteOperation("/shareToAdmin/", true).execute(client).isSuccess());
-        assertTrue(new CreateFolderRemoteOperation("/shareToGroup/", true).execute(client).isSuccess());
-        assertTrue(new CreateFolderRemoteOperation("/shareViaLink/", true).execute(client).isSuccess());
-//        assertTrue(new CreateFolderRemoteOperation("/shareViaMail/", true).execute(client).isSuccess());
-        assertTrue(new CreateFolderRemoteOperation("/noShare/", true).execute(client).isSuccess());
-        //assertTrue(new CreateFolderRemoteOperation("/shareToCircle/", true).execute(client).isSuccess());
+        assertTrue(new CreateFolderRemoteOperation("/shareToAdmin/", true).execute(nextcloudClient).isSuccess());
+        assertTrue(new CreateFolderRemoteOperation("/shareToGroup/", true).execute(nextcloudClient).isSuccess());
+        assertTrue(new CreateFolderRemoteOperation("/shareViaLink/", true).execute(nextcloudClient).isSuccess());
+//        assertTrue(new CreateFolderRemoteOperation("/shareViaMail/", true).execute(nextcloudClient).isSuccess());
+        assertTrue(new CreateFolderRemoteOperation("/noShare/", true).execute(nextcloudClient).isSuccess());
+        //assertTrue(new CreateFolderRemoteOperation("/shareToCircle/", true).execute(nextcloudClient).isSuccess());
 
         GetSharesRemoteOperation sut = new GetSharesRemoteOperation();
 
@@ -180,7 +183,7 @@ public void sharedWithMe() {
 
 
         // share folder to user "admin"
-        assertTrue(new CreateFolderRemoteOperation("/shareToAdmin/", true).execute(client).isSuccess());
+        assertTrue(new CreateFolderRemoteOperation("/shareToAdmin/", true).execute(nextcloudClient).isSuccess());
         assertTrue(new CreateShareRemoteOperation("/shareToAdmin/",
                 ShareType.USER,
                 "admin",
@@ -206,8 +209,14 @@ public void sharedWithMe() {
         clientUser1.setCredentials(new OwnCloudBasicCredentials(loginName, password));
         clientUser1.setUserId(loginName); // for test same as userId
 
+        NextcloudClient nextcloudClient1 = new NextcloudClient(
+                url,
+                loginName,
+                Credentials.basic(loginName, password),
+                context);
+
         // share folder to previous user
-        assertTrue(new CreateFolderRemoteOperation("/shareToUser/", true).execute(clientUser1).isSuccess());
+        assertTrue(new CreateFolderRemoteOperation("/shareToUser/", true).execute(nextcloudClient1).isSuccess());
         assertTrue(new CreateShareRemoteOperation("/shareToUser/",
                 ShareType.USER,
                 client.getCredentials().getUsername(),
diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt
@@ -60,7 +60,12 @@ class UpdateShareRemoteOperationIT : AbstractIT() {
     }
 
     private fun testUpdateNote(note: String) {
-        Assert.assertTrue(CreateFolderRemoteOperation("/note/", true).execute(client).isSuccess)
+        Assert.assertTrue(
+            CreateFolderRemoteOperation(
+                "/note/",
+                true
+            ).execute(nextcloudClient).isSuccess
+        )
 
         // share folder to user "admin"
         val createOperationResult = CreateShareRemoteOperation(
@@ -96,7 +101,12 @@ class UpdateShareRemoteOperationIT : AbstractIT() {
     @Test
     fun updateLabel() {
         val label = "test & test"
-        Assert.assertTrue(CreateFolderRemoteOperation("/label/", true).execute(client).isSuccess)
+        Assert.assertTrue(
+            CreateFolderRemoteOperation(
+                "/label/",
+                true
+            ).execute(nextcloudClient).isSuccess
+        )
 
         // share folder via public link
         val createOperationResult = CreateShareRemoteOperation(
@@ -131,7 +141,12 @@ class UpdateShareRemoteOperationIT : AbstractIT() {
     @Test
     fun invalidPassword() {
         val folder = "/invalidPassword/"
-        Assert.assertTrue(CreateFolderRemoteOperation(folder, true).execute(client).isSuccess)
+        Assert.assertTrue(
+            CreateFolderRemoteOperation(
+                folder,
+                true
+            ).execute(nextcloudClient).isSuccess
+        )
 
         // share folder via public link
         val createOperationResult = CreateShareRemoteOperation(
@@ -178,7 +193,12 @@ class UpdateShareRemoteOperationIT : AbstractIT() {
     @Test
     fun validPassword() {
         val folder = "/validPassword/"
-        Assert.assertTrue(CreateFolderRemoteOperation(folder, true).execute(client).isSuccess)
+        Assert.assertTrue(
+            CreateFolderRemoteOperation(
+                folder,
+                true
+            ).execute(nextcloudClient).isSuccess
+        )
 
         // share folder via public link
         val createOperationResult = CreateShareRemoteOperation(
