diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.kt index 29875361..546bf05b 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.kt @@ -164,12 +164,5 @@ class GetRemoteShareesOperation // Arguments - constant values private const val VALUE_FORMAT = "json" private const val VALUE_ITEM_TYPE = "file" // to get the server search for users / groups - - // JSON Node names - const val NODE_VALUE = "value" - const val PROPERTY_LABEL = "label" - const val PROPERTY_SHARE_TYPE = "shareType" - const val PROPERTY_SHARE_WITH = "shareWith" - const val PROPERTY_SHARE_WITH_ADDITIONAL_INFO = "shareWithAdditionalInfo" } } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.kt index f63f6503..21e3835b 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.kt @@ -105,7 +105,6 @@ enum class ShareType constructor(val value: Int) { FEDERATED(6); companion object { - private val values = values(); - fun fromValue(value: Int) = values.firstOrNull { it.value == value } + fun fromValue(value: Int) = values().firstOrNull { it.value == value } } } diff --git a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponseTest.kt b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponseTest.kt index 65afe4d9..5bd48cf0 100644 --- a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponseTest.kt +++ b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponseTest.kt @@ -51,6 +51,12 @@ class ShareeResponseTest { response = loadResponses(EXAMPLE_RESPONSE_JSON, adapter)!! } + @Test + fun `check structure - ok - example response files exist`() { + val file = File(EXAMPLE_RESPONSE_JSON) + assertTrue(file.exists()) + } + @Test fun `check structure - ok - contains meta`() { assertEquals("OK", response.ocs.meta.message!!) @@ -115,7 +121,7 @@ class ShareeResponseTest { companion object { val RESOURCES_PATH = - "/home/schabi/Projects/owncloud-android/owncloud-android-library/owncloudComLibrary/src/test/resources/com.owncloud.android.lib.resources.sharees.responses" + "src/test/responses/com.owncloud.android.lib.resources.sharees.responses" val EXAMPLE_RESPONSE_JSON = "$RESOURCES_PATH/example_sharee_response.json" val EMPTY_RESPONSE_JSON = "$RESOURCES_PATH/empty_sharee_response.json" } diff --git a/owncloudComLibrary/src/test/resources/com.owncloud.android.lib.resources.sharees.responses/empty_sharee_response.json b/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.sharees.responses/empty_sharee_response.json similarity index 100% rename from owncloudComLibrary/src/test/resources/com.owncloud.android.lib.resources.sharees.responses/empty_sharee_response.json rename to owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.sharees.responses/empty_sharee_response.json diff --git a/owncloudComLibrary/src/test/resources/com.owncloud.android.lib.resources.sharees.responses/example_sharee_response.json b/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.sharees.responses/example_sharee_response.json similarity index 100% rename from owncloudComLibrary/src/test/resources/com.owncloud.android.lib.resources.sharees.responses/example_sharee_response.json rename to owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.sharees.responses/example_sharee_response.json