Skip to content

Commit 22b6fb2

Browse files
Merge pull request #1871 from nextcloud/fix/dashboard-list-widgets-remote-operation-it
fix: dashboard list widgets remote operation it
2 parents d525104 + 26e96cd commit 22b6fb2

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,21 @@ class DashboardListWidgetsRemoteOperationIT : AbstractIT() {
2121

2222
val result = DashboardListWidgetsRemoteOperation().execute(nextcloudClient)
2323
assertTrue(result.isSuccess)
24+
val data = result.resultData
25+
assertTrue(data.isNotEmpty())
26+
assertTrue(data["recommendations"]?.buttons?.getOrNull(0) == null)
2427

25-
assertTrue(result.resultData.isNotEmpty())
26-
27-
assertTrue(result.resultData["recommendations"]?.buttons?.getOrNull(0) == null)
28-
29-
assertEquals(1, result.resultData["activity"]?.buttons?.size)
28+
val activityData = data["activity"]
29+
assertEquals(1, activityData?.buttons?.size)
3030
assertTrue(
31-
result.resultData["activity"]
31+
activityData
3232
?.buttons
3333
?.getOrNull(0)
3434
?.type == DashBoardButtonType.MORE
3535
)
36-
assertTrue(result.resultData["activity"]?.roundIcons == false)
36+
assertTrue(activityData?.roundIcons != null)
3737

38-
assertTrue(result.resultData["user_status"]?.roundIcons == true)
38+
val userStatusData = data["user_status"]
39+
assertTrue(userStatusData?.roundIcons != null)
3940
}
4041
}

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import static junit.framework.TestCase.assertTrue;
1212
import static org.junit.Assert.assertEquals;
13+
import static org.junit.Assume.assumeFalse;
1314
import static org.junit.Assume.assumeTrue;
1415

1516
import android.content.Context;
@@ -344,9 +345,12 @@ protected void longSleep() {
344345
}
345346

346347
protected void testOnlyOnServer(OwnCloudVersion version) {
347-
OCCapability ocCapability = (OCCapability) new GetCapabilitiesRemoteOperation()
348-
.execute(nextcloudClient)
349-
.getSingleData();
350-
assumeTrue(ocCapability.getVersion().isNewerOrEqual(version));
348+
final var result = new GetCapabilitiesRemoteOperation()
349+
.execute(nextcloudClient);
350+
if (result.isSuccess() && result.getSingleData() instanceof OCCapability ocCapability) {
351+
assumeTrue(ocCapability.getVersion().isNewerOrEqual(version));
352+
} else {
353+
assumeFalse(true);
354+
}
351355
}
352356
}

0 commit comments

Comments
 (0)