File tree Expand file tree Collapse file tree 3 files changed +7
-19
lines changed
androidTest/java/com/owncloud/android
main/java/com/owncloud/android/lib/resources/status
test/java/com/owncloud/android/lib/resources/status Expand file tree Collapse file tree 3 files changed +7
-19
lines changed Original file line number Diff line number Diff line change @@ -58,12 +58,7 @@ public void testGetRemoteCapabilitiesOperationEtag() {
58
58
assertTrue (resultEtag .getData () != null && resultEtag .getData ().size () == 1 );
59
59
60
60
OCCapability sameCapability = (OCCapability ) resultEtag .getData ().get (0 );
61
-
62
- if (capability .getVersion ().isNewerOrEqual (OwnCloudVersion .nextcloud_19 )) {
63
- assertEquals (capability , sameCapability );
64
- } else {
65
- assertEquals (capability .getEtag (), sameCapability .getEtag ());
66
- }
61
+ assertEquals (capability .getEtag (), sameCapability .getEtag ());
67
62
68
63
checkCapability (capability , client .getUserId ());
69
64
}
@@ -96,12 +91,7 @@ public void testGetRemoteCapabilitiesOperationEtagWithNextcloudClient() {
96
91
assertTrue (resultEtag .getData () != null && resultEtag .getData ().size () == 1 );
97
92
98
93
OCCapability sameCapability = (OCCapability ) resultEtag .getData ().get (0 );
99
-
100
- if (capability .getVersion ().isNewerOrEqual (OwnCloudVersion .nextcloud_19 )) {
101
- assertEquals (capability , sameCapability );
102
- } else {
103
- assertEquals (capability .getEtag (), sameCapability .getEtag ());
104
- }
94
+ assertEquals (capability .getEtag (), sameCapability .getEtag ());
105
95
106
96
checkCapability (capability , nextcloudClient .getUserId ());
107
97
}
Original file line number Diff line number Diff line change 20
20
import androidx .annotation .NonNull ;
21
21
22
22
public class OwnCloudVersion implements Comparable <OwnCloudVersion >, Parcelable {
23
- public static final OwnCloudVersion nextcloud_18 = new OwnCloudVersion (0x12000000 ); // 18.0
24
- public static final OwnCloudVersion nextcloud_19 = new OwnCloudVersion (0x13000000 ); // 19.0
25
23
public static final OwnCloudVersion nextcloud_20 = new OwnCloudVersion (0x14000000 ); // 20.0
26
24
27
25
private static final int MAX_DOTS = 3 ;
Original file line number Diff line number Diff line change 16
16
public class OwnCloudVersionTest {
17
17
@ Test
18
18
public void testOwnCloudVersion () {
19
- OwnCloudVersion version = new OwnCloudVersion ("18 .0.0" );
20
-
21
- assertEquals (0 , version .compareTo (OwnCloudVersion . nextcloud_18 ));
19
+ OwnCloudVersion version = new OwnCloudVersion ("31 .0.0" );
20
+
21
+ assertEquals (0 , version .compareTo (NextcloudVersion . nextcloud_31 ));
22
22
23
- version = new OwnCloudVersion ("18 .99.99" );
23
+ version = new OwnCloudVersion ("31 .99.99" );
24
24
25
- assertEquals (0 , version .compareTo (new OwnCloudVersion (0x12636300 ))); // 18.99.99 in hex
25
+ assertEquals (0 , version .compareTo (new OwnCloudVersion (0x1F636300 ))); // 18.99.99 in hex
26
26
}
27
27
28
28
@ Test
You can’t perform that action at this time.
0 commit comments