From 634883287f04d3cd1a97fa0028292e85656a46ed Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 10 Oct 2022 12:54:50 +0200 Subject: Test only on 25+ Signed-off-by: tobiasKaminsky --- .../dashboard/DashboardGetWidgetItemsRemoteOperationIT.kt | 9 +++++++++ .../resources/dashboard/DashboardListWidgetsRemoteOperationIT.kt | 9 +++++++++ .../owncloud/android/lib/resources/status/NextcloudVersion.kt | 5 +++++ 3 files changed, 23 insertions(+) diff --git a/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperationIT.kt b/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperationIT.kt index a52be361..d45dac89 100644 --- a/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperationIT.kt @@ -26,12 +26,21 @@ import com.owncloud.android.AbstractIT import com.owncloud.android.lib.resources.files.CreateFolderRemoteOperation import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation import com.owncloud.android.lib.resources.shares.ShareType +import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation +import com.owncloud.android.lib.resources.status.NextcloudVersion +import com.owncloud.android.lib.resources.status.OCCapability import org.junit.Assert.assertTrue +import org.junit.Assume.assumeTrue import org.junit.Test class DashboardGetWidgetItemsRemoteOperationIT : AbstractIT() { @Test fun getItems() { + // only on NC25+ + val ocCapability = GetCapabilitiesRemoteOperation() + .execute(nextcloudClient).singleData as OCCapability + assumeTrue(ocCapability.version.isNewerOrEqual(NextcloudVersion.nextcloud_25)) + // create folder to have some content assertTrue(CreateFolderRemoteOperation("/testFolder", false).execute(client2).isSuccess) assertTrue( diff --git a/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperationIT.kt b/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperationIT.kt index 69b2d1f6..350da06e 100644 --- a/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperationIT.kt @@ -23,13 +23,22 @@ package com.nextcloud.android.lib.resources.dashboard import com.owncloud.android.AbstractIT +import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation +import com.owncloud.android.lib.resources.status.NextcloudVersion +import com.owncloud.android.lib.resources.status.OCCapability import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue +import org.junit.Assume import org.junit.Test class DashboardListWidgetsRemoteOperationIT : AbstractIT() { @Test fun list() { + // only on NC25+ + val ocCapability = GetCapabilitiesRemoteOperation() + .execute(nextcloudClient).singleData as OCCapability + Assume.assumeTrue(ocCapability.version.isNewerOrEqual(NextcloudVersion.nextcloud_25)) + val result = DashboardListWidgetsRemoteOperation().execute(nextcloudClient) assertTrue(result.isSuccess) diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/NextcloudVersion.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/NextcloudVersion.kt index 67fd561b..a9552250 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/status/NextcloudVersion.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/status/NextcloudVersion.kt @@ -26,11 +26,16 @@ class NextcloudVersion : OwnCloudVersion { companion object { @JvmField val nextcloud_21 = NextcloudVersion(0x15000000) // 21.0 + @JvmField val nextcloud_22 = NextcloudVersion(0x16000000) // 22.0 val nextcloud_23 = NextcloudVersion(0x17000000) // 23.0 + @JvmField val nextcloud_24 = NextcloudVersion(0x18000000) // 24.0 + + @JvmField + val nextcloud_25 = NextcloudVersion(0x19000000) // 25.0 } constructor(string: String) : super(string) -- cgit v1.2.3