Skip to content

Commit c136c2e

Browse files
committed
use NextcloudVersion
Signed-off-by: alperozturk <[email protected]>
1 parent 3006898 commit c136c2e

File tree

1 file changed

+9
-28
lines changed

1 file changed

+9
-28
lines changed

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

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package com.nextcloud.utils
88

99
import com.nextcloud.utils.extensions.checkWCFRestrictions
1010
import com.owncloud.android.lib.resources.status.CapabilityBooleanType
11+
import com.owncloud.android.lib.resources.status.NextcloudVersion
1112
import com.owncloud.android.lib.resources.status.OCCapability
1213
import org.junit.Assert.assertFalse
1314
import org.junit.Assert.assertTrue
@@ -16,67 +17,47 @@ import org.junit.Test
1617
@Suppress("MagicNumber")
1718
class CheckWCFRestrictionsTests {
1819

19-
private val version29 = Triple(29, 0, 0)
20-
private val version30 = Triple(30, 0, 0)
21-
private val version31 = Triple(31, 0, 0)
22-
private val version32 = Triple(32, 0, 0)
23-
private val version33 = Triple(33, 0, 0)
24-
2520
private fun createCapability(
26-
version: Triple<Int, Int, Int>,
21+
version: NextcloudVersion,
2722
isWCFEnabled: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN
2823
): OCCapability = OCCapability().apply {
29-
this.versionMayor = version.first
30-
this.versionMinor = version.second
31-
this.versionMicro = version.third
24+
this.versionMayor = version.majorVersionNumber
3225
this.isWCFEnabled = isWCFEnabled
3326
}
3427

3528
@Test
3629
fun testReturnsFalseForVersionsOlderThan30() {
37-
val capability = createCapability(version29)
30+
val capability = createCapability(NextcloudVersion.nextcloud_29)
3831
assertFalse(capability.checkWCFRestrictions())
3932
}
4033

4134
@Test
4235
fun testReturnsTrueForVersion30WhenWCFAlwaysEnabled() {
43-
val capability = createCapability(version30)
36+
val capability = createCapability(NextcloudVersion.nextcloud_30)
4437
assertTrue(capability.checkWCFRestrictions())
4538
}
4639

4740
@Test
4841
fun testReturnsTrueForVersion31WhenWCFAlwaysEnabled() {
49-
val capability = createCapability(version31)
42+
val capability = createCapability(NextcloudVersion.nextcloud_31)
5043
assertTrue(capability.checkWCFRestrictions())
5144
}
5245

5346
@Test
5447
fun testReturnsTrueForVersion32WhenWCFEnabled() {
55-
val capability = createCapability(version32, CapabilityBooleanType.TRUE)
48+
val capability = createCapability(NextcloudVersion.nextcloud_32, CapabilityBooleanType.TRUE)
5649
assertTrue(capability.checkWCFRestrictions())
5750
}
5851

5952
@Test
6053
fun testReturnsFalseForVersion32WhenWCFDisabled() {
61-
val capability = createCapability(version32, CapabilityBooleanType.FALSE)
54+
val capability = createCapability(NextcloudVersion.nextcloud_32, CapabilityBooleanType.FALSE)
6255
assertFalse(capability.checkWCFRestrictions())
6356
}
6457

6558
@Test
6659
fun testReturnsFalseForVersion32WhenWCFIsUnknown() {
67-
val capability = createCapability(version32)
68-
assertFalse(capability.checkWCFRestrictions())
69-
}
70-
71-
@Test
72-
fun testReturnsTrueForNewerVersionWhenWCFEnabled() {
73-
val capability = createCapability(version33, CapabilityBooleanType.TRUE)
74-
assertTrue(capability.checkWCFRestrictions())
75-
}
76-
77-
@Test
78-
fun testReturnsFalseForNewerVersionWhenWCFDisabled() {
79-
val capability = createCapability(version33, CapabilityBooleanType.FALSE)
60+
val capability = createCapability(NextcloudVersion.nextcloud_32)
8061
assertFalse(capability.checkWCFRestrictions())
8162
}
8263
}

0 commit comments

Comments
 (0)