Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,21 @@ class DashboardListWidgetsRemoteOperationIT : AbstractIT() {

val result = DashboardListWidgetsRemoteOperation().execute(nextcloudClient)
assertTrue(result.isSuccess)
val data = result.resultData
assertTrue(data.isNotEmpty())
assertTrue(data["recommendations"]?.buttons?.getOrNull(0) == null)

assertTrue(result.resultData.isNotEmpty())

assertTrue(result.resultData["recommendations"]?.buttons?.getOrNull(0) == null)

assertEquals(1, result.resultData["activity"]?.buttons?.size)
val activityData = data["activity"]
assertEquals(1, activityData?.buttons?.size)
assertTrue(
result.resultData["activity"]
activityData
?.buttons
?.getOrNull(0)
?.type == DashBoardButtonType.MORE
)
assertTrue(result.resultData["activity"]?.roundIcons == false)
assertTrue(activityData?.roundIcons != null)

assertTrue(result.resultData["user_status"]?.roundIcons == true)
val userStatusData = data["user_status"]
assertTrue(userStatusData?.roundIcons != null)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import static junit.framework.TestCase.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;

import android.content.Context;
Expand Down Expand Up @@ -344,9 +345,12 @@ protected void longSleep() {
}

protected void testOnlyOnServer(OwnCloudVersion version) {
OCCapability ocCapability = (OCCapability) new GetCapabilitiesRemoteOperation()
.execute(nextcloudClient)
.getSingleData();
assumeTrue(ocCapability.getVersion().isNewerOrEqual(version));
final var result = new GetCapabilitiesRemoteOperation()
.execute(nextcloudClient);
if (result.isSuccess() && result.getSingleData() instanceof OCCapability ocCapability) {
assumeTrue(ocCapability.getVersion().isNewerOrEqual(version));
} else {
assumeFalse(true);
}
}
}
Loading