Skip to content

Commit 8745a31

Browse files
tobiasKaminskytobiasKaminsky
committed
GetCapabilitiesRemoteOperation now returns OCCapability
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
1 parent 23034a9 commit 8745a31

File tree

16 files changed

+50
-79
lines changed

16 files changed

+50
-79
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class DashboardListWidgetsRemoteOperationIT : AbstractIT() {
3333
?.getOrNull(0)
3434
?.type == DashBoardButtonType.MORE
3535
)
36-
assertTrue(result.resultData["activity"]?.roundIcons == false)
36+
assertTrue(result.resultData["activity"]?.roundIcons == true)
3737

3838
assertTrue(result.resultData["user_status"]?.roundIcons == true)
3939
}

‎library/src/androidTest/java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperationIT.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@ package com.nextcloud.android.lib.resources.groupfolders
99

1010
import com.owncloud.android.AbstractIT
1111
import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation
12-
import com.owncloud.android.lib.resources.status.OCCapability
1312
import org.junit.Assert.assertEquals
1413
import org.junit.Assume.assumeTrue
1514
import org.junit.Test
1615

1716
class GetGroupfoldersRemoteOperationIT : AbstractIT() {
1817
@Test
1918
fun getGroupfolders() {
20-
val capability = GetCapabilitiesRemoteOperation().execute(client).singleData as OCCapability
19+
val capability = GetCapabilitiesRemoteOperation().execute(client).resultData
2120

2221
assumeTrue(capability.groupfolders.isTrue)
2322

‎library/src/androidTest/java/com/nextcloud/android/lib/resources/search/SearchProvidersRemoteOperationIT.kt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ package com.nextcloud.android.lib.resources.search
99

1010
import com.owncloud.android.AbstractIT
1111
import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation
12-
import com.owncloud.android.lib.resources.status.OCCapability
1312
import com.owncloud.android.lib.resources.status.OwnCloudVersion
1413
import org.junit.Assert.assertFalse
1514
import org.junit.Assert.assertNotNull
@@ -38,10 +37,7 @@ class SearchProvidersRemoteOperationIT : AbstractIT() {
3837
@Test
3938
fun getSearchProvidersOnOldServer() {
4039
// only on < NC20
41-
val ocCapability =
42-
GetCapabilitiesRemoteOperation()
43-
.execute(nextcloudClient)
44-
.singleData as OCCapability
40+
val ocCapability = GetCapabilitiesRemoteOperation().execute(nextcloudClient).resultData
4541
assumeTrue(
4642
ocCapability.version.isOlderThan(OwnCloudVersion.nextcloud_20)
4743
)

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,7 @@ protected void longSleep() {
344344
}
345345

346346
protected void testOnlyOnServer(OwnCloudVersion version) {
347-
OCCapability ocCapability = (OCCapability) new GetCapabilitiesRemoteOperation()
348-
.execute(nextcloudClient)
349-
.getSingleData();
347+
OCCapability ocCapability = new GetCapabilitiesRemoteOperation().execute(nextcloudClient).getResultData();
350348
assumeTrue(ocCapability.getVersion().isNewerOrEqual(version));
351349
}
352350
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,7 @@ public void testShareToGroupSharees() {
154154
ShareeUser sharee = new ShareeUser("users", "", ShareType.GROUP);
155155

156156
// only on NC26+
157-
OCCapability ocCapability = (OCCapability) new GetCapabilitiesRemoteOperation()
158-
.execute(nextcloudClient).getSingleData();
157+
OCCapability ocCapability = new GetCapabilitiesRemoteOperation().execute(nextcloudClient).getResultData();
159158
if (ocCapability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_26)) {
160159
sharee.setDisplayName("users");
161160
}

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

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,28 +36,27 @@ public class GetCapabilitiesRemoteOperationIT extends AbstractIT {
3636
@Test
3737
public void testGetRemoteCapabilitiesOperation() {
3838
// get capabilities
39-
RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(client);
39+
RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation().execute(client);
4040
assertTrue(result.isSuccess());
41-
assertTrue(result.getData() != null && result.getData().size() == 1);
41+
assertNotNull(result.getResultData());
4242

43-
OCCapability capability = (OCCapability) result.getData().get(0);
44-
checkCapability(capability, client.getUserId());
43+
checkCapability(result.getResultData(), client.getUserId());
4544
}
4645

4746
@Test
4847
public void testGetRemoteCapabilitiesOperationEtag() {
4948
// get capabilities
50-
RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(client);
49+
RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation().execute(client);
5150
assertTrue(result.isSuccess());
52-
assertTrue(result.getData() != null && result.getData().size() == 1);
51+
assertNotNull(result.getResultData());
5352

54-
OCCapability capability = (OCCapability) result.getData().get(0);
53+
OCCapability capability = result.getResultData();
5554

56-
RemoteOperationResult resultEtag = new GetCapabilitiesRemoteOperation(capability).execute(client);
55+
RemoteOperationResult<OCCapability> resultEtag = new GetCapabilitiesRemoteOperation(capability).execute(client);
5756
assertTrue(resultEtag.isSuccess());
58-
assertTrue(resultEtag.getData() != null && resultEtag.getData().size() == 1);
57+
assertNotNull(result.getResultData());
5958

60-
OCCapability sameCapability = (OCCapability) resultEtag.getData().get(0);
59+
OCCapability sameCapability = resultEtag.getResultData();
6160

6261
if (capability.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_19)) {
6362
assertEquals(capability, sameCapability);
@@ -74,28 +73,27 @@ public void testGetRemoteCapabilitiesOperationEtag() {
7473
@Test
7574
public void testGetRemoteCapabilitiesOperationWithNextcloudClient() {
7675
// get capabilities
77-
RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
76+
RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
7877
assertTrue(result.isSuccess());
79-
assertTrue(result.getData() != null && result.getData().size() == 1);
78+
assertNotNull(result.getResultData());
8079

81-
OCCapability capability = (OCCapability) result.getData().get(0);
82-
checkCapability(capability, client.getUserId());
80+
checkCapability(result.getResultData(), client.getUserId());
8381
}
8482

8583
@Test
8684
public void testGetRemoteCapabilitiesOperationEtagWithNextcloudClient() {
8785
// get capabilities
88-
RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
86+
RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
8987
assertTrue(result.isSuccess());
90-
assertTrue(result.getData() != null && result.getData().size() == 1);
88+
assertNotNull(result.getResultData());
9189

92-
OCCapability capability = (OCCapability) result.getData().get(0);
90+
OCCapability capability = result.getResultData();
9391

94-
RemoteOperationResult resultEtag = new GetCapabilitiesRemoteOperation(capability).execute(nextcloudClient);
92+
RemoteOperationResult<OCCapability> resultEtag = new GetCapabilitiesRemoteOperation(capability).execute(nextcloudClient);
9593
assertTrue(resultEtag.isSuccess());
96-
assertTrue(resultEtag.getData() != null && resultEtag.getData().size() == 1);
94+
assertNotNull(result.getResultData());
9795

98-
OCCapability sameCapability = (OCCapability) resultEtag.getData().get(0);
96+
OCCapability sameCapability = resultEtag.getResultData();
9997

10098
if (capability.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_19)) {
10199
assertEquals(capability, sameCapability);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ public void testGetUserQuota() {
4141

4242
assertNotNull(quota);
4343

44-
OCCapability capability = (OCCapability) new GetCapabilitiesRemoteOperation()
45-
.execute(nextcloudClient).getSingleData();
44+
OCCapability capability = new GetCapabilitiesRemoteOperation().execute(nextcloudClient).getResultData();
4645

4746
if (capability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_31)) {
4847
assertEquals(SPACE_UNLIMITED, quota.getFree());

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ class FilesDownloadLimitIT : AbstractIT() {
7979
}
8080
}
8181

82-
private fun getCapability(): OCCapability =
83-
GetCapabilitiesRemoteOperation().execute(nextcloudClient).singleData as OCCapability
82+
private fun getCapability(): OCCapability = GetCapabilitiesRemoteOperation().execute(nextcloudClient).resultData
8483

8584
private fun createTestFile(): Boolean {
8685
val localPath = createFile("test")

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import com.owncloud.android.lib.resources.files.model.ImageDimension
1515
import com.owncloud.android.lib.resources.files.model.RemoteFile
1616
import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation
1717
import com.owncloud.android.lib.resources.status.NextcloudVersion
18-
import com.owncloud.android.lib.resources.status.OCCapability
1918
import org.junit.Assert.assertEquals
2019
import org.junit.Assert.assertFalse
2120
import org.junit.Assert.assertTrue
@@ -119,10 +118,7 @@ class ReadFileRemoteOperationIT : AbstractIT() {
119118

120119
testOnlyOnServer(NextcloudVersion.nextcloud_27)
121120

122-
val ocCapability =
123-
GetCapabilitiesRemoteOperation()
124-
.execute(nextcloudClient)
125-
.singleData as OCCapability
121+
val ocCapability = GetCapabilitiesRemoteOperation().execute(nextcloudClient).resultData
126122

127123
if (ocCapability.version.majorVersionNumber == NextcloudVersion.nextcloud_27.majorVersionNumber) {
128124
@Suppress("Detekt.MagicNumber")

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import com.owncloud.android.AbstractIT
1111
import com.owncloud.android.lib.resources.files.model.RemoteFile
1212
import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation
1313
import com.owncloud.android.lib.resources.status.NextcloudVersion
14-
import com.owncloud.android.lib.resources.status.OCCapability
1514
import org.junit.Assert.assertEquals
1615
import org.junit.Assert.assertTrue
1716
import org.junit.Test
@@ -41,10 +40,7 @@ class ReadFileVersionsRemoteOperationIT : AbstractIT() {
4140
assertTrue(sutResult.isSuccess)
4241

4342
var versionCount = 0
44-
val ocCapability =
45-
GetCapabilitiesRemoteOperation()
46-
.execute(nextcloudClient)
47-
.singleData as OCCapability
43+
val ocCapability = GetCapabilitiesRemoteOperation().execute(nextcloudClient).resultData
4844
if (ocCapability.version.isNewerOrEqual(NextcloudVersion.nextcloud_26)) {
4945
// with NC26+ we always have a starting version
5046
versionCount++

0 commit comments

Comments
 (0)