Skip to content

Commit 342de39

Browse files
ZetaTomZetaTom
committed
Deprecate OwnCloudClient - Sharing
Signed-off-by: ZetaTom <[email protected]>
1 parent 7f3e444 commit 342de39

22 files changed

+228
-265
lines changed

‎library/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import com.github.spotbugs.snom.SpotBugsTask
21
import com.github.spotbugs.snom.Confidence
32
import com.github.spotbugs.snom.Effort
3+
import com.github.spotbugs.snom.SpotBugsTask
44

55
buildscript {
66
ext {
77
junit_version = '4.13.2'
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.2.1'
11-
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.6'
10+
classpath 'com.android.tools.build:gradle:8.2.0'
11+
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.5'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.4"
1414
classpath "org.jacoco:org.jacoco.core:$jacoco_version"

‎library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperationIT.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class DashboardGetWidgetItemsRemoteOperationIT : AbstractIT() {
3838
testOnlyOnServer(NextcloudVersion.nextcloud_25)
3939

4040
// create folder to have some content
41-
assertTrue(CreateFolderRemoteOperation("/testFolder", false).execute(client2).isSuccess)
41+
assertTrue(CreateFolderRemoteOperation("/testFolder", false).execute(nextcloudClient2).isSuccess)
4242
assertTrue(
4343
CreateShareRemoteOperation(
4444
"/testFolder",
@@ -47,7 +47,7 @@ class DashboardGetWidgetItemsRemoteOperationIT : AbstractIT() {
4747
false,
4848
"",
4949
OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER
50-
).execute(client2)
50+
).execute(nextcloudClient2)
5151
.isSuccess
5252
)
5353

‎library/src/androidTest/java/com/owncloud/android/AbstractIT.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,10 @@
2626
*/
2727
package com.owncloud.android;
2828

29-
import static junit.framework.TestCase.assertTrue;
30-
import static org.junit.Assert.assertEquals;
31-
import static org.junit.Assert.fail;
32-
import static org.junit.Assume.assumeTrue;
33-
3429
import android.content.Context;
3530
import android.net.Uri;
3631
import android.os.Bundle;
3732

38-
import androidx.test.platform.app.InstrumentationRegistry;
39-
4033
import com.nextcloud.common.NextcloudClient;
4134
import com.owncloud.android.lib.common.OwnCloudBasicCredentials;
4235
import com.owncloud.android.lib.common.OwnCloudClient;
@@ -73,8 +66,14 @@
7366
import java.security.cert.CertificateException;
7467
import java.security.cert.X509Certificate;
7568

69+
import androidx.test.platform.app.InstrumentationRegistry;
7670
import okhttp3.Credentials;
7771

72+
import static junit.framework.TestCase.assertTrue;
73+
import static org.junit.Assert.assertEquals;
74+
import static org.junit.Assert.fail;
75+
import static org.junit.Assume.assumeTrue;
76+
7877
/**
7978
* Common base for all integration tests
8079
*/
@@ -90,6 +89,7 @@ public abstract class AbstractIT {
9089
public static OwnCloudClient client;
9190
public static OwnCloudClient client2;
9291
protected static NextcloudClient nextcloudClient;
92+
protected static NextcloudClient nextcloudClient2;
9393
protected static Context context;
9494
protected static Uri url;
9595

@@ -129,6 +129,10 @@ public static void beforeAll() throws InterruptedException,
129129
String credentials = Credentials.basic(loginName, password);
130130
nextcloudClient = new NextcloudClient(url, userId, credentials, context);
131131

132+
String userId2 = loginName; // for test same as userId
133+
String credentials2 = Credentials.basic(loginName2, password2);
134+
nextcloudClient2 = new NextcloudClient(url, userId2, credentials2, context);
135+
132136
waitForServer(client, url);
133137
testConnection();
134138
}

‎library/src/androidTest/java/com/owncloud/android/FileIT.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
*/
2727
package com.owncloud.android;
2828

29-
import static org.junit.Assert.assertEquals;
30-
import static org.junit.Assert.assertFalse;
31-
import static org.junit.Assert.assertTrue;
32-
3329
import android.net.Uri;
3430

3531
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -50,6 +46,10 @@
5046
import java.util.ArrayList;
5147
import java.util.List;
5248

49+
import static org.junit.Assert.assertEquals;
50+
import static org.junit.Assert.assertFalse;
51+
import static org.junit.Assert.assertTrue;
52+
5353
/**
5454
* Tests related to file operations
5555
*/
@@ -145,7 +145,7 @@ public void testShareViaLinkSharees() {
145145
false,
146146
"",
147147
OCShare.NO_PERMISSION)
148-
.execute(client).isSuccess());
148+
.execute(nextcloudClient).isSuccess());
149149

150150
// verify
151151
RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client);
@@ -186,7 +186,7 @@ public void testShareToGroupSharees() {
186186
false,
187187
"",
188188
OCShare.NO_PERMISSION)
189-
.execute(client).isSuccess());
189+
.execute(nextcloudClient).isSuccess());
190190

191191
// verify
192192
RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client);
@@ -221,7 +221,7 @@ public void testOneSharees() {
221221
false,
222222
"",
223223
OCShare.NO_PERMISSION)
224-
.execute(client).isSuccess());
224+
.execute(nextcloudClient).isSuccess());
225225

226226
// verify
227227
RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client);
@@ -258,15 +258,15 @@ public void testTwoShareesOnParent() {
258258
false,
259259
"",
260260
OCShare.NO_PERMISSION)
261-
.execute(client).isSuccess());
261+
.execute(nextcloudClient).isSuccess());
262262

263263
assertTrue(new CreateShareRemoteOperation(path,
264264
ShareType.USER,
265265
"user2",
266266
false,
267267
"",
268268
OCShare.NO_PERMISSION)
269-
.execute(client).isSuccess());
269+
.execute(nextcloudClient).isSuccess());
270270

271271
// verify
272272
RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client);
@@ -306,15 +306,15 @@ public void testTwoSharees() {
306306
false,
307307
"",
308308
OCShare.NO_PERMISSION)
309-
.execute(client).isSuccess());
309+
.execute(nextcloudClient).isSuccess());
310310

311311
assertTrue(new CreateShareRemoteOperation(path,
312312
ShareType.USER,
313313
"user2",
314314
false,
315315
"",
316316
OCShare.NO_PERMISSION)
317-
.execute(client).isSuccess());
317+
.execute(nextcloudClient).isSuccess());
318318

319319
// verify
320320
RemoteOperationResult result = new ReadFolderRemoteOperation(path).execute(client);

‎library/src/androidTest/java/com/owncloud/android/lib/common/operations/CreateShareIT.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
*/
2727
package com.owncloud.android.lib.common.operations;
2828

29-
import static org.junit.Assert.assertEquals;
30-
import static org.junit.Assert.assertFalse;
31-
import static org.junit.Assert.assertTrue;
32-
3329
import com.owncloud.android.AbstractIT;
3430
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
3531
import com.owncloud.android.lib.resources.files.UploadFileRemoteOperation;
@@ -41,6 +37,10 @@
4137

4238
import java.io.File;
4339

40+
import static org.junit.Assert.assertEquals;
41+
import static org.junit.Assert.assertFalse;
42+
import static org.junit.Assert.assertTrue;
43+
4444
/**
4545
* Test create share
4646
*/
@@ -75,7 +75,7 @@ public void testCreatePublicShareSuccessful() {
7575
"",
7676
false,
7777
"",
78-
1).execute(client);
78+
1).execute(nextcloudClient);
7979
assertTrue(result.isSuccess());
8080
}
8181

@@ -86,7 +86,7 @@ public void testCreatePublicShareFailure() {
8686
"",
8787
false,
8888
"",
89-
1).execute(client);
89+
1).execute(nextcloudClient);
9090

9191
assertFalse(result.isSuccess());
9292
assertEquals(ResultCode.FILE_NOT_FOUND, result.getCode());
@@ -102,7 +102,7 @@ public void testCreatePrivateShareWithUserSuccessful() {
102102
"admin",
103103
false,
104104
"",
105-
31).execute(client);
105+
31).execute(nextcloudClient);
106106
assertTrue(result.isSuccess());
107107
}
108108

@@ -116,7 +116,7 @@ public void testCreatePrivateShareWithUserNotExists() {
116116
"no_exist",
117117
false,
118118
"",
119-
31).execute(client);
119+
31).execute(nextcloudClient);
120120
assertFalse(result.isSuccess());
121121

122122
// TODO 404 is File not found, but actually it is "user not found"
@@ -133,7 +133,7 @@ public void testCreatePrivateShareWithFileNotExists() {
133133
"admin",
134134
false,
135135
"",
136-
31).execute(client);
136+
31).execute(nextcloudClient);
137137
assertFalse(result.isSuccess());
138138
assertEquals(ResultCode.FILE_NOT_FOUND, result.getCode());
139139
}
@@ -148,7 +148,7 @@ public void testCreatePrivateShareWithGroupSuccessful() {
148148
"admin",
149149
false,
150150
"",
151-
1).execute(client);
151+
1).execute(nextcloudClient);
152152
assertTrue(result.isSuccess());
153153
}
154154

@@ -162,7 +162,7 @@ public void testCreatePrivateShareWithNonExistingGroupSharee() {
162162
"no_exist",
163163
false,
164164
"",
165-
31).execute(client);
165+
31).execute(nextcloudClient);
166166
assertFalse(result.isSuccess());
167167

168168
// TODO 404 is File not found, but actually it is "user not found"
@@ -179,7 +179,7 @@ public void testCreatePrivateShareWithNonExistingFile() {
179179
"admin",
180180
false,
181181
"",
182-
31).execute(client);
182+
31).execute(nextcloudClient);
183183
assertFalse(result.isSuccess());
184184
assertEquals(ResultCode.FILE_NOT_FOUND, result.getCode());
185185
}
@@ -208,7 +208,7 @@ public void testCreateFederatedShareWithNonExistingSharee() {
208208
"no_exist@" + serverUri2,
209209
false,
210210
"",
211-
31).execute(client);
211+
31).execute(nextcloudClient);
212212

213213
assertFalse("sharee doesn't exist in an existing remote server", result.isSuccess());
214214
assertEquals("sharee doesn't exist in an existing remote server, forbidden",
@@ -225,7 +225,7 @@ public void testCreateFederatedShareWithNonExistingRemoteServer() {
225225
"no_exist",
226226
false,
227227
"",
228-
31).execute(client);
228+
31).execute(nextcloudClient);
229229
assertFalse(result.isSuccess());
230230
// TODO expected:<SHARE_WRONG_PARAMETER> but was:<SHARE_FORBIDDEN>
231231
assertEquals("remote server doesn't exist", ResultCode.SHARE_FORBIDDEN, result.getCode());
@@ -241,7 +241,7 @@ public void testCreateFederatedShareWithNonExistingFile() {
241241
"admin@" + serverUri2,
242242
false,
243243
"",
244-
31).execute(client);
244+
31).execute(nextcloudClient);
245245

246246
assertFalse("file doesn't exist", result.isSuccess());
247247
assertEquals("file doesn't exist", ResultCode.FILE_NOT_FOUND, result.getCode());

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
*/
2727
package com.owncloud.android.lib.common.operations;
2828

29-
import static org.junit.Assert.assertEquals;
30-
import static org.junit.Assert.assertTrue;
31-
3229
import com.owncloud.android.AbstractIT;
3330
import com.owncloud.android.lib.resources.files.CreateFolderRemoteOperation;
3431
import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
@@ -40,6 +37,9 @@
4037

4138
import java.util.List;
4239

40+
import static org.junit.Assert.assertEquals;
41+
import static org.junit.Assert.assertTrue;
42+
4343
/**
4444
* Class to test Get Shares Operation
4545
*
@@ -55,17 +55,17 @@ public void testGetShares() {
5555
"",
5656
false,
5757
"",
58-
1).execute(client).isSuccess());
58+
1).execute(nextcloudClient).isSuccess());
5959

6060
assertTrue(new CreateFolderRemoteOperation("/2/", true).execute(client).isSuccess());
6161
assertTrue(new CreateShareRemoteOperation("/2/",
6262
ShareType.PUBLIC_LINK,
6363
"",
6464
false,
6565
"",
66-
1).execute(client).isSuccess());
66+
1).execute(nextcloudClient).isSuccess());
6767

68-
RemoteOperationResult<List<OCShare>> result = new GetSharesRemoteOperation().execute(client);
68+
RemoteOperationResult<List<OCShare>> result = new GetSharesRemoteOperation().execute(nextcloudClient);
6969
assertTrue(result.isSuccess());
7070
assertEquals(2, result.getResultData().size());
7171
assertEquals("/1/", result.getResultData().get(0).getPath());

‎library/src/androidTest/java/com/owncloud/android/lib/common/operations/RemoveShareIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
*/
2727
package com.owncloud.android.lib.common.operations;
2828

29-
import static org.junit.Assert.assertTrue;
30-
3129
import com.owncloud.android.AbstractIT;
3230
import com.owncloud.android.lib.resources.files.UploadFileRemoteOperation;
3331
import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
@@ -41,6 +39,8 @@
4139
import java.io.IOException;
4240
import java.util.List;
4341

42+
import static org.junit.Assert.assertTrue;
43+
4444
public class RemoveShareIT extends AbstractIT {
4545
private static final String FILE_TO_UNSHARE = "/fileToUnshare.txt";
4646

@@ -61,7 +61,7 @@ public void testRemoveShare() throws IOException {
6161
ShareType.PUBLIC_LINK,
6262
"",
6363
false,
64-
"", 1).execute(client);
64+
"", 1).execute(nextcloudClient);
6565

6666
assertTrue(result.isSuccess());
6767

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,9 @@
2626
*/
2727
package com.owncloud.android.lib.resources.files;
2828

29-
import static junit.framework.TestCase.assertEquals;
30-
import static junit.framework.TestCase.assertTrue;
31-
3229
import android.net.Uri;
3330
import android.os.Bundle;
3431

35-
import androidx.test.platform.app.InstrumentationRegistry;
36-
3732
import com.owncloud.android.AbstractIT;
3833
import com.owncloud.android.lib.common.OwnCloudBasicCredentials;
3934
import com.owncloud.android.lib.common.OwnCloudClient;
@@ -51,6 +46,11 @@
5146
import java.io.IOException;
5247
import java.util.List;
5348

49+
import androidx.test.platform.app.InstrumentationRegistry;
50+
51+
import static junit.framework.TestCase.assertEquals;
52+
import static junit.framework.TestCase.assertTrue;
53+
5454
public class SearchRemoteOperationIT extends AbstractIT {
5555
private static OCCapability capability;
5656

@@ -196,7 +196,7 @@ public void favoriteFiles() throws IOException {
196196
client.getUserId(),
197197
false,
198198
"",
199-
31).execute(client2)
199+
31).execute(nextcloudClient2)
200200
.isSuccess()
201201
);
202202

0 commit comments

Comments
 (0)