Skip to content

Commit c468198

Browse files
committed
fix(test) AutoRenameTests don't fail on stable server anymore
The test-stable failed in the skipAutoRenameWhenWCFDisabled test, while test-master succeeded. This is due to the different server versions. At the time of writing, stable is using version 30 and master is using version 32. The WCF handling differs per version, as detailed in the OCCapabilityExtensions.kt file. Hence the test needs to adjust the server version. While we are on it, we are testing the three different cases Signed-off-by: Philipp Hasper <vcs@hasper.info>
1 parent f0ee559 commit c468198

1 file changed

Lines changed: 24 additions & 2 deletions

File tree

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

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
22
* Nextcloud - Android Client
33
*
4+
* SPDX-FileCopyrightText: 2026 Philipp Hasper <vcs@hasper.info>
45
* SPDX-FileCopyrightText: 2024 Alper Ozturk <alper.ozturk@nextcloud.com>
56
* SPDX-License-Identifier: AGPL-3.0-or-later
67
*/
@@ -243,11 +244,32 @@ class AutoRenameTests : AbstractOnServerIT() {
243244

244245
@Test
245246
fun skipAutoRenameWhenWCFDisabled() {
247+
var capability = capability
248+
val filename = " readme.txt "
249+
250+
// Nextcloud 32+: Respects the isWCFEnabled flag
246251
capability = capability.apply {
252+
versionMayor = NextcloudVersion.nextcloud_32.majorVersionNumber
247253
isWCFEnabled = CapabilityBooleanType.FALSE
248254
}
249-
val filename = " readme.txt "
250-
val result = AutoRename.rename(filename, capability, isFolderPath = true)
255+
var result = AutoRename.rename(filename, capability, isFolderPath = true)
256+
assert(result == filename) { "Expected $filename but got $result" }
257+
258+
// Nextcloud 30-31+: Always applies WCF restrictions, even if flag is set to false
259+
capability = capability.apply {
260+
versionMayor = NextcloudVersion.nextcloud_30.majorVersionNumber
261+
isWCFEnabled = CapabilityBooleanType.FALSE
262+
}
263+
result = AutoRename.rename(filename, capability, isFolderPath = true)
264+
val expectedWCFFilename = "readme.txt"
265+
assert(result == expectedWCFFilename) { "Expected $expectedWCFFilename but got $result" }
266+
267+
// Nextcloud <30: No WCF restrictions, even if flag is set to true
268+
capability = capability.apply {
269+
versionMayor = NextcloudVersion.nextcloud_29.majorVersionNumber
270+
isWCFEnabled = CapabilityBooleanType.TRUE
271+
}
272+
result = AutoRename.rename(filename, capability, isFolderPath = true)
251273
assert(result == filename) { "Expected $filename but got $result" }
252274
}
253275
}

0 commit comments

Comments
 (0)