cover server versions for garm

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/androidTest/java/com/nextcloud/client/assistant/AssistantRepositoryTests.kt

@@ -8,7 +8,6 @@
 package com.nextcloud.client.assistant
 
 import com.nextcloud.client.assistant.repository.remote.AssistantRemoteRepositoryImpl
-import com.nextcloud.test.ServerVersion
 import com.nextcloud.test.SinceServer
 import com.owncloud.android.AbstractOnServerIT
 import com.owncloud.android.lib.resources.assistant.v2.model.TaskTypeData
@@ -19,7 +18,7 @@ import org.junit.Before
 import org.junit.Test
 
 @Suppress("MagicNumber")
-@SinceServer(ServerVersion.NEXTCLOUD_28)
+@SinceServer(majorVersion = 28)
 class AssistantRepositoryTests : AbstractOnServerIT() {
 
     private var sut: AssistantRemoteRepositoryImpl? = null

app/src/androidTest/java/com/nextcloud/test/ServerVersion.kt

@@ -8,7 +8,6 @@
 
 package com.nextcloud.utils
 
-import com.nextcloud.test.ServerVersion
 import com.nextcloud.test.SinceServer
 import com.nextcloud.utils.autoRename.AutoRename
 import com.owncloud.android.AbstractOnServerIT
@@ -20,7 +19,7 @@ import org.junit.Before
 import org.junit.Test
 
 @Suppress("TooManyFunctions")
-@SinceServer(ServerVersion.NEXTCLOUD_30)
+@SinceServer(majorVersion = 30)
 class AutoRenameTests : AbstractOnServerIT() {
 
     private var capability: OCCapability = fileDataStorageManager.getCapability(account.name)

app/src/androidTest/java/com/nextcloud/utils/AutoRenameTests.kt

@@ -7,7 +7,6 @@
 
 package com.nextcloud.utils
 
-import com.nextcloud.test.ServerVersion
 import com.nextcloud.test.SinceServer
 import com.nextcloud.utils.fileNameValidator.FileNameValidator
 import com.owncloud.android.AbstractOnServerIT
@@ -44,7 +43,7 @@ class FileNameValidatorTests : AbstractOnServerIT() {
     }
 
     @Test
-    @SinceServer(ServerVersion.NEXTCLOUD_30)
+    @SinceServer(majorVersion = 30)
     fun testInvalidCharacter() {
         testOnlyOnServer(NextcloudVersion.nextcloud_30)
 
@@ -56,7 +55,7 @@ class FileNameValidatorTests : AbstractOnServerIT() {
     }
 
     @Test
-    @SinceServer(ServerVersion.NEXTCLOUD_30)
+    @SinceServer(majorVersion = 30)
     fun testReservedName() {
         testOnlyOnServer(NextcloudVersion.nextcloud_30)
 
@@ -65,7 +64,7 @@ class FileNameValidatorTests : AbstractOnServerIT() {
     }
 
     @Test
-    @SinceServer(ServerVersion.NEXTCLOUD_30)
+    @SinceServer(majorVersion = 30)
     fun testForbiddenFilenameExtension() {
         testOnlyOnServer(NextcloudVersion.nextcloud_30)
 
@@ -146,7 +145,7 @@ class FileNameValidatorTests : AbstractOnServerIT() {
     }
 
     @Test
-    @SinceServer(ServerVersion.NEXTCLOUD_30)
+    @SinceServer(majorVersion = 30)
     fun testFolderPathWithReservedName() {
         testOnlyOnServer(NextcloudVersion.nextcloud_30)
 
@@ -158,7 +157,7 @@ class FileNameValidatorTests : AbstractOnServerIT() {
     }
 
     @Test
-    @SinceServer(ServerVersion.NEXTCLOUD_30)
+    @SinceServer(majorVersion = 30)
     fun testFilePathWithReservedName() {
         testOnlyOnServer(NextcloudVersion.nextcloud_30)
 
@@ -170,7 +169,7 @@ class FileNameValidatorTests : AbstractOnServerIT() {
     }
 
     @Test
-    @SinceServer(ServerVersion.NEXTCLOUD_30)
+    @SinceServer(majorVersion = 30)
     fun testFolderPathWithInvalidCharacter() {
         testOnlyOnServer(NextcloudVersion.nextcloud_30)
 
@@ -182,7 +181,7 @@ class FileNameValidatorTests : AbstractOnServerIT() {
     }
 
     @Test
-    @SinceServer(ServerVersion.NEXTCLOUD_30)
+    @SinceServer(majorVersion = 30)
     fun testFilePathWithInvalidCharacter() {
         testOnlyOnServer(NextcloudVersion.nextcloud_30)
 
@@ -212,7 +211,7 @@ class FileNameValidatorTests : AbstractOnServerIT() {
     }
 
     @Test
-    @SinceServer(ServerVersion.NEXTCLOUD_30)
+    @SinceServer(majorVersion = 30)
     fun testFilePathWithNestedFolder() {
         testOnlyOnServer(NextcloudVersion.nextcloud_30)
 
@@ -232,7 +231,7 @@ class FileNameValidatorTests : AbstractOnServerIT() {
     }
 
     @Test
-    @SinceServer(ServerVersion.NEXTCLOUD_30)
+    @SinceServer(majorVersion = 30)
     fun testOnlyFolderPathWithOneReservedName() {
         testOnlyOnServer(NextcloudVersion.nextcloud_30)
 

app/src/androidTest/java/com/nextcloud/utils/FileNameValidatorTests.kt

@@ -14,7 +14,6 @@
 import com.nextcloud.client.jobs.upload.FileUploadWorker;
 import com.nextcloud.client.network.ConnectivityManagerFactory;
 import com.nextcloud.client.network.ConnectivityService;
-import com.nextcloud.test.ServerVersion;
 import com.nextcloud.test.SinceServer;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.UploadsStorageManager;
@@ -323,7 +322,7 @@ public void testUploadOnWifiOnlyButMeteredWifi() {
     }
 
     @Test
-    @SinceServer(majorVersion = ServerVersion.NEXTCLOUD_27)
+    @SinceServer(majorVersion = 27)
     public void testCreationAndUploadTimestamp() throws IOException, AccountUtils.AccountNotFoundException {
         testOnlyOnServer(NextcloudVersion.nextcloud_27);
 
@@ -378,7 +377,7 @@ public void testCreationAndUploadTimestamp() throws IOException, AccountUtils.Ac
     }
 
     @Test
-    @SinceServer(majorVersion = ServerVersion.NEXTCLOUD_27)
+    @SinceServer(majorVersion = 27)
     public void testMetadata() throws IOException, AccountUtils.AccountNotFoundException {
         testOnlyOnServer(NextcloudVersion.nextcloud_27);