all to Kotlin

more tests

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

Author: tobiasKaminsky

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

@@ -83,6 +83,7 @@ public abstract class AbstractIT {
     public static OwnCloudClient client;
     public static OwnCloudClient client2;
     protected static NextcloudClient nextcloudClient;
+    protected static NextcloudClient nextcloudClientAdmin;
     protected static Context context;
     protected static Uri url;
 
@@ -122,6 +123,12 @@ public static void beforeAll() throws InterruptedException,
         String credentials = Credentials.basic(loginName, password);
         nextcloudClient = new NextcloudClient(url, userId, credentials, context);
 
+        nextcloudClientAdmin = new NextcloudClient(
+                url,
+                "admin",
+                Credentials.basic("admin", "admin"),
+                context);
+
         waitForServer(client, url);
         testConnection();
     }

library/src/androidTest/java/com/owncloud/android/lib/resources/notifications/DeleteAllNotificationsRemoteOperationIT.kt

@@ -0,0 +1,57 @@
+/* Nextcloud Android Library is available under MIT license
+ *
+ *   @author Tobias Kaminsky
+ *   Copyright (C) 2022 Tobias Kaminsky
+ *   Copyright (C) 2022 Nextcloud GmbH
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.resources.notifications
+
+import com.owncloud.android.AbstractIT
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class DeleteAllNotificationsRemoteOperationIT : AbstractIT() {
+    @Test
+    fun testDeleteAllNotification() {
+        // create one notification
+        assertTrue(
+            nextcloudClientAdmin.execute(
+                CreateNotificationRemoteOperation(
+                    nextcloudClient.userId,
+                    "test"
+                )
+            ).isSuccess
+        )
+
+        var result = nextcloudClient.execute(GetNotificationsRemoteOperation())
+        assertTrue(result.isSuccess)
+        assertTrue(result.resultData.isNotEmpty())
+
+        assertTrue(nextcloudClient.execute(DeleteAllNotificationsRemoteOperation()).isSuccess)
+
+        result = nextcloudClient.execute(GetNotificationsRemoteOperation())
+        assertTrue(result.isSuccess)
+        assertTrue(result.resultData.isEmpty())
+    }
+}

library/src/androidTest/java/com/owncloud/android/lib/resources/notifications/DeleteNotificationRemoteOperationIT.kt

@@ -0,0 +1,59 @@
+/* Nextcloud Android Library is available under MIT license
+ *
+ *   @author Tobias Kaminsky
+ *   Copyright (C) 2022 Tobias Kaminsky
+ *   Copyright (C) 2022 Nextcloud GmbH
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.resources.notifications
+
+import com.owncloud.android.AbstractIT
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class DeleteNotificationRemoteOperationIT : AbstractIT() {
+    @Test
+    fun deleteOneNotification() {
+        // create one notification
+        assertTrue(
+            nextcloudClientAdmin.execute(
+                CreateNotificationRemoteOperation(
+                    nextcloudClient.userId,
+                    "test"
+                )
+            ).isSuccess
+        )
+
+        val result = nextcloudClient.execute(GetNotificationsRemoteOperation())
+        assertTrue(result.isSuccess)
+        assertTrue(result.resultData.isNotEmpty())
+
+        val firstNotificationId = result.resultData.first().notificationId
+
+        assertTrue(DeleteNotificationRemoteOperation(firstNotificationId).execute(nextcloudClient).isSuccess)
+
+        val getResult = GetNotificationRemoteOperation(firstNotificationId).execute(nextcloudClient)
+        assertFalse(getResult.isSuccess)
+    }
+}

library/src/androidTest/java/com/owncloud/android/lib/resources/notifications/GetNotificationRemoteOperationIT.kt

@@ -0,0 +1,60 @@
+/* Nextcloud Android Library is available under MIT license
+ *
+ *   @author Tobias Kaminsky
+ *   Copyright (C) 2022 Tobias Kaminsky
+ *   Copyright (C) 2022 Nextcloud GmbH
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.resources.notifications
+
+import com.owncloud.android.AbstractIT
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class GetNotificationRemoteOperationIT : AbstractIT() {
+    @Test
+    fun testSingleNotification() {
+        // get all notifications
+        val resultAll = nextcloudClient.execute(GetNotificationsRemoteOperation())
+        assertTrue(resultAll.isSuccess)
+
+        val allNotifications = resultAll.resultData
+        val firstNotificationId = allNotifications.first().notificationId
+
+        // check one specific
+        val result = nextcloudClient.execute(GetNotificationRemoteOperation(firstNotificationId))
+        assertTrue(result.isSuccess)
+
+        val notification = result.resultData
+        assertNotNull(notification)
+        assertEquals(firstNotificationId, notification.notificationId)
+    }
+
+    @Test
+    fun testNonExisting() {
+        assertFalse(GetNotificationRemoteOperation(-1).execute(nextcloudClient).isSuccess)
+    }
+}

library/src/androidTest/java/com/owncloud/android/lib/resources/notifications/GetNotificationsRemoteOperationIT.kt

@@ -23,16 +23,24 @@ package com.owncloud.android.lib.resources.notifications
 
 import com.owncloud.android.AbstractIT
 import junit.framework.Assert.assertTrue
+import org.junit.Assert
 import org.junit.Test
 
 class GetNotificationsRemoteOperationIT : AbstractIT() {
     @Test
     fun testNotifications() {
+        // create one notification
+        Assert.assertTrue(
+            nextcloudClientAdmin.execute(
+                CreateNotificationRemoteOperation(
+                    nextcloudClient.userId,
+                    "test"
+                )
+            ).isSuccess
+        )
+
         val result = nextcloudClient.execute(GetNotificationsRemoteOperation())
         assertTrue(result.isSuccess)
-
-        val notifications = result.resultData
-
-        assertTrue(notifications.isNotEmpty())
+        assertTrue(result.resultData.isNotEmpty())
     }
 }

library/src/main/java/com/owncloud/android/lib/resources/notifications/CreateNotificationRemoteOperation.kt

@@ -0,0 +1,86 @@
+/* Nextcloud Android Library is available under MIT license
+ *
+ *   @author Tobias Kaminsky
+ *   Copyright (C) 2022 Tobias Kaminsky
+ *   Copyright (C) 2022 Nextcloud GmbH
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.resources.notifications
+
+import com.nextcloud.common.NextcloudClient
+import com.nextcloud.operations.PostMethod
+import com.owncloud.android.lib.common.operations.RemoteOperation
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import com.owncloud.android.lib.common.utils.Log_OC
+import com.owncloud.android.lib.resources.notifications.models.Notification
+import okhttp3.FormBody
+import org.apache.commons.httpclient.HttpStatus
+
+/**
+ * Provides the remote notifications from the server handling the following data structure accessible via the
+ * notifications endpoint at {@value OCS_ROUTE_LIST_V12_AND_UP}, specified at {@link
+ * "https://github.com/nextcloud/notifications/blob/master/docs/ocs-endpoint-v2.md"}.
+ */
+class CreateNotificationRemoteOperation(private val userId: String, private val message: String) :
+    RemoteOperation<Notification>() {
+    override fun run(client: NextcloudClient): RemoteOperationResult<Notification> {
+        var result: RemoteOperationResult<Notification>
+        val status: Int
+        var post: PostMethod? = null
+        val url =
+            client.baseUri.toString() + "/ocs/v2.php/apps/notifications/api/v2/admin_notifications/"
+
+        try {
+            val bodyRequest = FormBody
+                .Builder()
+                .add("shortMessage", message)
+                .build()
+
+            post = PostMethod(url + userId, true, bodyRequest)
+            status = client.execute(post)
+            val response = post.getResponseBodyAsString()
+            if (isSuccess(status)) {
+                result = RemoteOperationResult(true, post)
+                Log_OC.d(TAG, "Successful response: $response")
+            } else {
+                result = RemoteOperationResult(false, post)
+                Log_OC.e(TAG, "Failed response while getting user notifications ")
+                Log_OC.e(TAG, "*** status code: $status ; response message: $response")
+            }
+        } catch (e: Exception) {
+            result = RemoteOperationResult(e)
+            Log_OC.e(TAG, "Exception while getting remote notifications", e)
+        } finally {
+            post?.releaseConnection()
+        }
+        return result
+    }
+
+    private fun isSuccess(status: Int): Boolean {
+        return status == HttpStatus.SC_OK
+    }
+
+    companion object {
+        private val TAG = CreateNotificationRemoteOperation::class.java.simpleName
+    }
+}