Skip to content

Commit 1f03609

Browse files
tobiasKaminskytobiasKaminsky
committed
wip
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
1 parent 2c44e87 commit 1f03609

13 files changed

+81
-42
lines changed

Diff for: ‎library/src/androidTest/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperationIT.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class UnifiedSearchRemoteOperationIT : AbstractIT() {
5959
@Test
6060
fun filesSearch() {
6161
val remotePath = "/testFolder"
62-
assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(client).isSuccess)
62+
assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient).isSuccess)
6363
val remoteFile = ReadFileRemoteOperation(remotePath)
6464
.execute(client).data[0] as RemoteFile
6565
val fileId = remoteFile.localId
@@ -80,7 +80,12 @@ class UnifiedSearchRemoteOperationIT : AbstractIT() {
8080

8181
@Test
8282
fun filesSearchWhitespace() {
83-
assertTrue(CreateFolderRemoteOperation("/test Folder/", true).execute(client).isSuccess)
83+
assertTrue(
84+
CreateFolderRemoteOperation(
85+
"/test Folder/",
86+
true
87+
).execute(nextcloudClient).isSuccess
88+
)
8489

8590
val result = UnifiedSearchRemoteOperation("files", "test").execute(nextcloudClient)
8691
assertTrue(result.isSuccess)

Diff for: ‎library/src/androidTest/java/com/nextcloud/android/lib/richWorkspace/RichWorkspaceDirectEditingRemoteOperationIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void getEditLinkForRoot() {
5353
public void getEditLinkForFolder() {
5454
String path = "/workspace/sub1/";
5555

56-
assertTrue(new CreateFolderRemoteOperation(path, true).execute(client).isSuccess());
56+
assertTrue(new CreateFolderRemoteOperation(path, true).execute(nextcloudClient).isSuccess());
5757

5858
RemoteOperationResult result = new RichWorkspaceDirectEditingRemoteOperation(path).execute(client);
5959
assertTrue(result.isSuccess());
@@ -70,7 +70,7 @@ public void reuseExistingFile() throws IOException {
7070
String filePath = folder + "Readme.md";
7171
File txtFile = getFile(ASSETS__TEXT_FILE_NAME);
7272

73-
assertTrue(new CreateFolderRemoteOperation(folder, true).execute(client).isSuccess());
73+
assertTrue(new CreateFolderRemoteOperation(folder, true).execute(nextcloudClient).isSuccess());
7474

7575
RemoteOperationResult uploadResult = new UploadFileRemoteOperation(txtFile.getAbsolutePath(),
7676
filePath,

Diff for: ‎library/src/androidTest/java/com/nextcloud/lib/resources/users/GetActivitiesRemoteOperationIT.kt

+6-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ class GetActivitiesRemoteOperationIT : AbstractIT() {
3333
@Test
3434
fun getActivities() {
3535
// set-up, create a folder so there is an activity
36-
assertTrue(CreateFolderRemoteOperation("/test/123/1", true).execute(client).isSuccess)
36+
assertTrue(
37+
CreateFolderRemoteOperation(
38+
"/test/123/1",
39+
true
40+
).execute(nextcloudClient).isSuccess
41+
)
3742

3843
val result = nextcloudClient.execute(GetActivitiesRemoteOperation())
3944
assertTrue(result.isSuccess)

Diff for: ‎library/src/androidTest/java/com/owncloud/android/CopyFileIT.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
*/
2727
package com.owncloud.android;
2828

29+
import static org.junit.Assert.assertEquals;
30+
import static org.junit.Assert.assertSame;
31+
import static org.junit.Assert.assertTrue;
32+
2933
import android.util.Log;
3034

3135
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -42,10 +46,6 @@
4246

4347
import java.io.File;
4448

45-
import static org.junit.Assert.assertEquals;
46-
import static org.junit.Assert.assertSame;
47-
import static org.junit.Assert.assertTrue;
48-
4949
/**
5050
* Class to test CopyRemoteFileOperation
5151
*/
@@ -180,7 +180,7 @@ public void createFixtures() throws Exception {
180180

181181
RemoteOperationResult result;
182182
for (String folderPath : FOLDERS_IN_FIXTURE) {
183-
result = new CreateFolderRemoteOperation(folderPath, true).execute(client);
183+
result = new CreateFolderRemoteOperation(folderPath, true).execute(nextcloudClient);
184184

185185
assertTrue("Error creating folder" + folderPath + ": " + result, result.isSuccess());
186186
}

Diff for: ‎library/src/androidTest/java/com/owncloud/android/CreateFolderIT.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
*/
2727
package com.owncloud.android;
2828

29+
import static org.junit.Assert.assertTrue;
30+
2931
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
3032
import com.owncloud.android.lib.resources.files.CreateFolderRemoteOperation;
3133
import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
@@ -39,8 +41,6 @@
3941
import java.util.Iterator;
4042
import java.util.List;
4143

42-
import static org.junit.Assert.assertTrue;
43-
4444
/**
4545
* Class to test Create Folder Operation
4646
*/
@@ -70,13 +70,13 @@ public void setUp() {
7070
public void testCreateFolder() {
7171
String remotePath = mFullPath2FolderBase;
7272
mCreatedFolderPaths.add(remotePath);
73-
RemoteOperationResult result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
73+
RemoteOperationResult result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
7474
assertTrue(result.isSuccess());
7575

7676
// Create Subfolder
7777
remotePath = mFullPath2FolderBase + FOLDER_PATH_BASE;
7878
mCreatedFolderPaths.add(remotePath);
79-
result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
79+
result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
8080
assertTrue(result.isSuccess());
8181
}
8282

@@ -87,31 +87,31 @@ public void testCreateFolder() {
8787
@Test
8888
public void testCreateFolderSpecialCharactersOnNewVersion() {
8989
String remotePath = mFullPath2FolderBase + "_<";
90-
RemoteOperationResult result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
90+
RemoteOperationResult result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
9191
assertTrue("Remote path: " + remotePath, result.isSuccess());
9292

9393
remotePath = mFullPath2FolderBase + "_>";
94-
result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
94+
result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
9595
assertTrue("Remote path: " + remotePath, result.isSuccess());
9696

9797
remotePath = mFullPath2FolderBase + "_:";
98-
result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
98+
result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
9999
assertTrue("Remote path: " + remotePath, result.isSuccess());
100100

101101
remotePath = mFullPath2FolderBase + "_\"";
102-
result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
102+
result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
103103
assertTrue("Remote path: " + remotePath, result.isSuccess());
104104

105105
remotePath = mFullPath2FolderBase + "_|";
106-
result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
106+
result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
107107
assertTrue("Remote path: " + remotePath, result.isSuccess());
108108

109109
remotePath = mFullPath2FolderBase + "_?";
110-
result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
110+
result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
111111
assertTrue("Remote path: " + remotePath, result.isSuccess());
112112

113113
remotePath = mFullPath2FolderBase + "_*";
114-
result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
114+
result = new CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient);
115115
assertTrue("Remote path: " + remotePath, result.isSuccess());
116116
}
117117

Diff for: ‎library/src/androidTest/java/com/owncloud/android/DeleteFileIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void setUp() throws Exception {
5858
mFullPath2Folder = baseFolderPath + FOLDER_PATH;
5959
mFullPath2File = baseFolderPath + FILE_PATH;
6060

61-
RemoteOperationResult result = new CreateFolderRemoteOperation(mFullPath2Folder, true).execute(client);
61+
RemoteOperationResult result = new CreateFolderRemoteOperation(mFullPath2Folder, true).execute(nextcloudClient);
6262
assertTrue("Error creating folder" + mFullPath2Folder + ": " + result, result.isSuccess());
6363

6464
File textFile = getFile(ASSETS__TEXT_FILE_NAME);

Diff for: ‎library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetSharesIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@
4949
public class GetSharesIT extends AbstractIT {
5050
@Test
5151
public void testGetShares() {
52-
assertTrue(new CreateFolderRemoteOperation("/1/", true).execute(client).isSuccess());
52+
assertTrue(new CreateFolderRemoteOperation("/1/", true).execute(nextcloudClient).isSuccess());
5353
assertTrue(new CreateShareRemoteOperation("/1/",
5454
ShareType.PUBLIC_LINK,
5555
"",
5656
false,
5757
"",
5858
1).execute(client).isSuccess());
5959

60-
assertTrue(new CreateFolderRemoteOperation("/2/", true).execute(client).isSuccess());
60+
assertTrue(new CreateFolderRemoteOperation("/2/", true).execute(nextcloudClient).isSuccess());
6161
assertTrue(new CreateShareRemoteOperation("/2/",
6262
ShareType.PUBLIC_LINK,
6363
"",

Diff for: ‎library/src/androidTest/java/com/owncloud/android/lib/resources/e2ee/UpdateMetadataRemoteOperationIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void uploadAndModify() {
5959

6060
// create folder
6161
String folder = "/" + RandomString.make(20) + "/";
62-
assertTrue(new CreateFolderRemoteOperation(folder, true).execute(client).isSuccess());
62+
assertTrue(new CreateFolderRemoteOperation(folder, true).execute(nextcloudClient).isSuccess());
6363
RemoteFile remoteFolder = (RemoteFile) new ReadFileRemoteOperation(folder).execute(client).getSingleData();
6464

6565
assertNotNull(remoteFolder);

Diff for: ‎library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperationIT.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class ReadFileRemoteOperationIT : AbstractIT() {
3131
fun readRemoteFolder() {
3232
val remotePath = "/test/"
3333

34-
assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(client).isSuccess)
34+
assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient).isSuccess)
3535

3636
val result = ReadFileRemoteOperation(remotePath).execute(client)
3737

Diff for: ‎library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFolderRemoteOperationIT.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ReadFolderRemoteOperationIT : AbstractIT() {
3232
fun readRemoteFolderWithContent() {
3333
val remotePath = "/test/"
3434

35-
assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(client).isSuccess)
35+
assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(nextcloudClient).isSuccess)
3636

3737
// create file
3838
val filePath = createFile("text")

Diff for: ‎library/src/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void testSearchByFileIdEmpty() {
7373

7474
@Test
7575
public void testSearchByFileIdSuccess() {
76-
assertTrue(new CreateFolderRemoteOperation("/test/", true).execute(client).isSuccess());
76+
assertTrue(new CreateFolderRemoteOperation("/test/", true).execute(nextcloudClient).isSuccess());
7777

7878
RemoteOperationResult readFile = new ReadFileRemoteOperation("/test/").execute(client);
7979
assertTrue(readFile.isSuccess());
@@ -164,7 +164,7 @@ public void oneFavorite() {
164164
String path = "/testFolder/";
165165

166166
// create folder, make it favorite
167-
new CreateFolderRemoteOperation(path, true).execute(client);
167+
new CreateFolderRemoteOperation(path, true).execute(nextcloudClient);
168168
assertTrue(new ToggleFavoriteRemoteOperation(true, path).execute(client).isSuccess());
169169

170170
SearchRemoteOperation sut = new SearchRemoteOperation("",
@@ -413,7 +413,7 @@ public void showOnlyFolders() throws IOException {
413413
assertTrue(result.isSuccess());
414414
assertTrue(result.getResultData().isEmpty());
415415

416-
assertTrue(new CreateFolderRemoteOperation("/folder/", false).execute(client).isSuccess());
416+
assertTrue(new CreateFolderRemoteOperation("/folder/", false).execute(nextcloudClient).isSuccess());
417417

418418
result = sut.execute(client);
419419
assertTrue(result.isSuccess());

Diff for: ‎library/src/androidTest/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperationIT.java

+17-8
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
import androidx.test.platform.app.InstrumentationRegistry;
3838

39+
import com.nextcloud.common.NextcloudClient;
3940
import com.owncloud.android.AbstractIT;
4041
import com.owncloud.android.lib.common.OwnCloudBasicCredentials;
4142
import com.owncloud.android.lib.common.OwnCloudClient;
@@ -47,15 +48,17 @@
4748

4849
import java.util.List;
4950

51+
import okhttp3.Credentials;
52+
5053
public class GetSharesRemoteOperationIT extends AbstractIT {
5154
@Test
5255
public void searchSharedFiles() {
53-
assertTrue(new CreateFolderRemoteOperation("/shareToAdmin/", true).execute(client).isSuccess());
54-
assertTrue(new CreateFolderRemoteOperation("/shareToGroup/", true).execute(client).isSuccess());
55-
assertTrue(new CreateFolderRemoteOperation("/shareViaLink/", true).execute(client).isSuccess());
56-
// assertTrue(new CreateFolderRemoteOperation("/shareViaMail/", true).execute(client).isSuccess());
57-
assertTrue(new CreateFolderRemoteOperation("/noShare/", true).execute(client).isSuccess());
58-
//assertTrue(new CreateFolderRemoteOperation("/shareToCircle/", true).execute(client).isSuccess());
56+
assertTrue(new CreateFolderRemoteOperation("/shareToAdmin/", true).execute(nextcloudClient).isSuccess());
57+
assertTrue(new CreateFolderRemoteOperation("/shareToGroup/", true).execute(nextcloudClient).isSuccess());
58+
assertTrue(new CreateFolderRemoteOperation("/shareViaLink/", true).execute(nextcloudClient).isSuccess());
59+
// assertTrue(new CreateFolderRemoteOperation("/shareViaMail/", true).execute(nextcloudClient).isSuccess());
60+
assertTrue(new CreateFolderRemoteOperation("/noShare/", true).execute(nextcloudClient).isSuccess());
61+
//assertTrue(new CreateFolderRemoteOperation("/shareToCircle/", true).execute(nextcloudClient).isSuccess());
5962

6063
GetSharesRemoteOperation sut = new GetSharesRemoteOperation();
6164

@@ -180,7 +183,7 @@ public void sharedWithMe() {
180183

181184

182185
// share folder to user "admin"
183-
assertTrue(new CreateFolderRemoteOperation("/shareToAdmin/", true).execute(client).isSuccess());
186+
assertTrue(new CreateFolderRemoteOperation("/shareToAdmin/", true).execute(nextcloudClient).isSuccess());
184187
assertTrue(new CreateShareRemoteOperation("/shareToAdmin/",
185188
ShareType.USER,
186189
"admin",
@@ -206,8 +209,14 @@ public void sharedWithMe() {
206209
clientUser1.setCredentials(new OwnCloudBasicCredentials(loginName, password));
207210
clientUser1.setUserId(loginName); // for test same as userId
208211

212+
NextcloudClient nextcloudClient1 = new NextcloudClient(
213+
url,
214+
loginName,
215+
Credentials.basic(loginName, password),
216+
context);
217+
209218
// share folder to previous user
210-
assertTrue(new CreateFolderRemoteOperation("/shareToUser/", true).execute(clientUser1).isSuccess());
219+
assertTrue(new CreateFolderRemoteOperation("/shareToUser/", true).execute(nextcloudClient1).isSuccess());
211220
assertTrue(new CreateShareRemoteOperation("/shareToUser/",
212221
ShareType.USER,
213222
client.getCredentials().getUsername(),

Diff for: ‎library/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt

+24-4
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@ class UpdateShareRemoteOperationIT : AbstractIT() {
6060
}
6161

6262
private fun testUpdateNote(note: String) {
63-
Assert.assertTrue(CreateFolderRemoteOperation("/note/", true).execute(client).isSuccess)
63+
Assert.assertTrue(
64+
CreateFolderRemoteOperation(
65+
"/note/",
66+
true
67+
).execute(nextcloudClient).isSuccess
68+
)
6469

6570
// share folder to user "admin"
6671
val createOperationResult = CreateShareRemoteOperation(
@@ -96,7 +101,12 @@ class UpdateShareRemoteOperationIT : AbstractIT() {
96101
@Test
97102
fun updateLabel() {
98103
val label = "test & test"
99-
Assert.assertTrue(CreateFolderRemoteOperation("/label/", true).execute(client).isSuccess)
104+
Assert.assertTrue(
105+
CreateFolderRemoteOperation(
106+
"/label/",
107+
true
108+
).execute(nextcloudClient).isSuccess
109+
)
100110

101111
// share folder via public link
102112
val createOperationResult = CreateShareRemoteOperation(
@@ -131,7 +141,12 @@ class UpdateShareRemoteOperationIT : AbstractIT() {
131141
@Test
132142
fun invalidPassword() {
133143
val folder = "/invalidPassword/"
134-
Assert.assertTrue(CreateFolderRemoteOperation(folder, true).execute(client).isSuccess)
144+
Assert.assertTrue(
145+
CreateFolderRemoteOperation(
146+
folder,
147+
true
148+
).execute(nextcloudClient).isSuccess
149+
)
135150

136151
// share folder via public link
137152
val createOperationResult = CreateShareRemoteOperation(
@@ -178,7 +193,12 @@ class UpdateShareRemoteOperationIT : AbstractIT() {
178193
@Test
179194
fun validPassword() {
180195
val folder = "/validPassword/"
181-
Assert.assertTrue(CreateFolderRemoteOperation(folder, true).execute(client).isSuccess)
196+
Assert.assertTrue(
197+
CreateFolderRemoteOperation(
198+
folder,
199+
true
200+
).execute(nextcloudClient).isSuccess
201+
)
182202

183203
// share folder via public link
184204
val createOperationResult = CreateShareRemoteOperation(

0 commit comments

Comments
 (0)