Skip to content

Commit 8a9afa1

Browse files
fix tests
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
1 parent 7f61654 commit 8a9afa1

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,13 @@ private void checkCapability(OCCapability capability, String userId) {
166166
@Test
167167
public void testClientIntegration() {
168168
// get capabilities
169-
RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
169+
RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
170170
assertTrue(result.isSuccess());
171-
assertNotNull(result.getSingleData());
171+
assertNotNull(result.getResultData());
172172

173-
OCCapability capability = (OCCapability) result.getSingleData();
173+
OCCapability capability = result.getResultData();
174174

175-
assertEquals(5, capability.getClientIntegrationEndpoints(Type.CONTEXT_MENU, "").size());
176-
assertEquals(2, capability.getClientIntegrationEndpoints(Type.CREATE_NEW, "").size());
175+
assertEquals(1, capability.getClientIntegrationEndpoints(Type.CONTEXT_MENU, "application/pdf").size());
176+
assertEquals(0, capability.getClientIntegrationEndpoints(Type.CREATE_NEW, "").size());
177177
}
178178
}

library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ data class Endpoint(
2121
@SerializedName("mimetype_filters")
2222
val mimetypeFilter: String?,
2323
val params: Map<String, String>?,
24-
val icon: String?,
25-
val filter: String?
24+
val icon: String?
2625
) : Parcelable

library/src/main/java/com/owncloud/android/lib/resources/status/E2EVersion.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ enum class E2EVersion(
1414
V1_1("1.1"),
1515
V1_2("1.2"),
1616
V2_0("2.0"),
17+
V2_1("2.1"),
1718
UNKNOWN("");
1819

1920
companion object {
2021
@JvmStatic
21-
fun fromValue(v: String): E2EVersion = E2EVersion.values().firstOrNull { it.value == v } ?: UNKNOWN
22+
fun fromValue(v: String): E2EVersion = entries.firstOrNull { it.value == v } ?: UNKNOWN
2223
}
2324
}

library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class OCCapability {
144144
val endpoints =
145145
apps.values
146146
.filter { it.version <= CLIENT_INTEGRATION_VERSION }
147-
.map { mapHooks(it, hook) }
147+
.mapNotNull { mapHooks(it, hook) }
148148
.flatMap { it.toList() }
149149
.filter { filterMimetype(mimetype, it.mimetypeFilter) }
150150

0 commit comments

Comments
 (0)