Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit bb467350 authored by tobiasKaminsky's avatar tobiasKaminsky
Browse files

Switch to typed responses 



Signed-off-by: default avatartobiasKaminsky <tobias@kaminsky.me>
parent 494670d8

src/androidTest/java/com/nextcloud/android/lib/resources/directediting/DirectEditingCreateFileRemoteOperationTest.java

+14 −14
Original line number Diff line number Diff line
@@ -38,41 +38,41 @@ import static org.junit.Assert.assertTrue; 
public class DirectEditingCreateFileRemoteOperationTest extends AbstractIT {

    @Test

    public void createEmptyFile() {

        RemoteOperationResult result = new DirectEditingCreateFileRemoteOperation("/test.md",

        RemoteOperationResult<String> result = new DirectEditingCreateFileRemoteOperation("/test.md",

                                                                                          "text",

                                                                                          "textdocument")

                .execute(client);

        assertTrue(result.isSuccess());



        String url = (String) result.getSingleData();

        String url = result.getResultData();



        assertFalse(url.isEmpty());

    }



    @Test

    public void createFileFromTemplate() {

        RemoteOperationResult result = new DirectEditingCreateFileRemoteOperation("/test.md",

        RemoteOperationResult<String> result = new DirectEditingCreateFileRemoteOperation("/test.md",

                                                                                          "text",

                                                                                          "textdocument",

                                                                                          "1")

                .execute(client);

        assertTrue(result.isSuccess());



        String url = (String) result.getSingleData();

        String url = result.getResultData();



        assertFalse(url.isEmpty());

    }



    @Test

    public void createFileWithSpecialCharacterFromTemplate() {

        RemoteOperationResult result = new DirectEditingCreateFileRemoteOperation("/あ.md",

        RemoteOperationResult<String> result = new DirectEditingCreateFileRemoteOperation("/あ.md",

                                                                                          "text",

                                                                                          "textdocument",

                                                                                          "1")

                .execute(client);

        assertTrue(result.isSuccess());



        String url = (String) result.getSingleData();

        String url = result.getResultData();



        assertFalse(url.isEmpty());

    }

src/androidTest/java/com/nextcloud/lib/resources/users/GetUserInfoRemoteOperationTest.kt

+2 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ package com.nextcloud.lib.resources.users 
import androidx.test.platform.app.InstrumentationRegistry

import com.owncloud.android.AbstractIT

import com.owncloud.android.lib.common.OwnCloudBasicCredentials

import com.owncloud.android.lib.common.UserInfo

import com.owncloud.android.lib.resources.users.GetUserInfoRemoteOperation

import org.junit.After

import org.junit.Assert.assertEquals
@@ -43,7 +42,7 @@ class GetUserInfoRemoteOperationTest : AbstractIT() { 
        client.credentials = OwnCloudBasicCredentials("user1", "user1")

        val userInfoResult = GetUserInfoRemoteOperation().execute(client)

        assertTrue(userInfoResult.isSuccess)

        val userInfo = userInfoResult.data[0] as UserInfo

        val userInfo = userInfoResult.resultData



        assertEquals("User One", userInfo.getDisplayName())

        assertEquals("user1", userInfo.getId())
@@ -58,7 +57,7 @@ class GetUserInfoRemoteOperationTest : AbstractIT() { 
        client.credentials = OwnCloudBasicCredentials("user2", "user2")

        val userInfoResult = GetUserInfoRemoteOperation().execute(client)

        assertTrue(userInfoResult.isSuccess)

        val userInfo = userInfoResult.data[0] as UserInfo

        val userInfo = userInfoResult.resultData



        assertEquals("User Two", userInfo.getDisplayName())

        assertEquals("user2", userInfo.getId())

src/androidTest/java/com/owncloud/android/lib/common/operations/GetUserQuotaTest.java

+2 −3
Original line number Diff line number Diff line
@@ -45,11 +45,10 @@ public class GetUserQuotaTest extends AbstractIT { 


    @Test

    public void testGetUserQuota() {

        RemoteOperationResult result = new GetUserInfoRemoteOperation().execute(client);

        RemoteOperationResult<UserInfo> result = new GetUserInfoRemoteOperation().execute(client);

        assertTrue(result.isSuccess());

        assertTrue(result.getData() != null && result.getData().size() == 1);



        UserInfo userInfo = (UserInfo) result.getData().get(0);

        UserInfo userInfo = result.getResultData();

        Quota quota = userInfo.getQuota();

        assertTrue(quota.getFree() >= 0);

        assertTrue(quota.getUsed() >= 0);

src/androidTest/java/com/owncloud/android/lib/resources/users/SetUserInfoRemoteOperationTest.java

+19 −19
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ import static org.junit.Assert.assertTrue; 
public class SetUserInfoRemoteOperationTest extends AbstractIT {

    @Test

    public void testSetEmail() {

        RemoteOperationResult userInfo = new GetUserInfoRemoteOperation().execute(client);

        RemoteOperationResult<UserInfo> userInfo = new GetUserInfoRemoteOperation().execute(client);

        assertTrue(userInfo.isSuccess());

        String oldValue = ((UserInfo) userInfo.getData().get(0)).getEmail();

        String oldValue = userInfo.getResultData().getEmail();



        // set

        assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.EMAIL, "new@mail.com")
@@ -52,7 +52,7 @@ public class SetUserInfoRemoteOperationTest extends AbstractIT { 


        userInfo = new GetUserInfoRemoteOperation().execute(client);

        assertTrue(userInfo.isSuccess());

        assertEquals("new@mail.com", ((UserInfo) userInfo.getData().get(0)).email);

        assertEquals("new@mail.com", userInfo.getResultData().email);



        // reset

        assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.EMAIL, oldValue)
@@ -61,11 +61,11 @@ public class SetUserInfoRemoteOperationTest extends AbstractIT { 


    @Test

    public void testSetDisplayName() {

        RemoteOperationResult userInfo = new GetUserInfoRemoteOperation().execute(client);

        RemoteOperationResult<UserInfo> userInfo = new GetUserInfoRemoteOperation().execute(client);

        assertTrue(userInfo.isSuccess());



        String oldUserId = client.getUserId();

        assertEquals(client.getUserId(), ((UserInfo) userInfo.getData().get(0)).displayName);

        assertEquals(client.getUserId(), userInfo.getResultData().displayName);



        // set display name

        assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.DISPLAYNAME, "newName")
@@ -73,7 +73,7 @@ public class SetUserInfoRemoteOperationTest extends AbstractIT { 


        userInfo = new GetUserInfoRemoteOperation().execute(client);

        assertTrue(userInfo.isSuccess());

        assertEquals("newName", ((UserInfo) userInfo.getData().get(0)).displayName);

        assertEquals("newName", userInfo.getResultData().displayName);



        // reset

        assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.DISPLAYNAME, oldUserId)
@@ -86,9 +86,9 @@ public class SetUserInfoRemoteOperationTest extends AbstractIT { 
        assertTrue(result.isSuccess());

        OCCapability ocCapability = (OCCapability) result.getSingleData();



        RemoteOperationResult userInfo = new GetUserInfoRemoteOperation().execute(client);

        RemoteOperationResult<UserInfo> userInfo = new GetUserInfoRemoteOperation().execute(client);

        assertTrue(userInfo.isSuccess());

        String oldValue = ((UserInfo) userInfo.getData().get(0)).phone;

        String oldValue = userInfo.getResultData().phone;



        // set

        assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.PHONE, "+49555-12345")
@@ -98,9 +98,9 @@ public class SetUserInfoRemoteOperationTest extends AbstractIT { 
        assertTrue(userInfo.isSuccess());

        

        if (ocCapability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_21)) {

            assertEquals("+4955512345", ((UserInfo) userInfo.getData().get(0)).phone);

            assertEquals("+4955512345", userInfo.getResultData().phone);

        } else {

            assertEquals("+49555-12345", ((UserInfo) userInfo.getData().get(0)).phone);

            assertEquals("+49555-12345", userInfo.getResultData().phone);

        }



        // reset
@@ -110,9 +110,9 @@ public class SetUserInfoRemoteOperationTest extends AbstractIT { 


    @Test

    public void testSetAddress() {

        RemoteOperationResult userInfo = new GetUserInfoRemoteOperation().execute(client);

        RemoteOperationResult<UserInfo> userInfo = new GetUserInfoRemoteOperation().execute(client);

        assertTrue(userInfo.isSuccess());

        String oldValue = ((UserInfo) userInfo.getData().get(0)).address;

        String oldValue = userInfo.getResultData().address;



        // set

        assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.ADDRESS, "NoName Street 123")
@@ -120,7 +120,7 @@ public class SetUserInfoRemoteOperationTest extends AbstractIT { 


        userInfo = new GetUserInfoRemoteOperation().execute(client);

        assertTrue(userInfo.isSuccess());

        assertEquals("NoName Street 123", ((UserInfo) userInfo.getData().get(0)).address);

        assertEquals("NoName Street 123", userInfo.getResultData().address);



        // reset

        assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.ADDRESS, oldValue)
@@ -129,9 +129,9 @@ public class SetUserInfoRemoteOperationTest extends AbstractIT { 


    @Test

    public void testSetWebsite() {

        RemoteOperationResult userInfo = new GetUserInfoRemoteOperation().execute(client);

        RemoteOperationResult<UserInfo> userInfo = new GetUserInfoRemoteOperation().execute(client);

        assertTrue(userInfo.isSuccess());

        String oldValue = ((UserInfo) userInfo.getData().get(0)).website;

        String oldValue = userInfo.getResultData().website;



        // set

        assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.WEBSITE, "https://nextcloud.com")
@@ -139,7 +139,7 @@ public class SetUserInfoRemoteOperationTest extends AbstractIT { 


        userInfo = new GetUserInfoRemoteOperation().execute(client);

        assertTrue(userInfo.isSuccess());

        assertEquals("https://nextcloud.com", ((UserInfo) userInfo.getData().get(0)).website);

        assertEquals("https://nextcloud.com", userInfo.getResultData().website);



        // reset

        assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.WEBSITE, oldValue)
@@ -148,9 +148,9 @@ public class SetUserInfoRemoteOperationTest extends AbstractIT { 


    @Test

    public void testSetTwitter() {

        RemoteOperationResult userInfo = new GetUserInfoRemoteOperation().execute(client);

        RemoteOperationResult<UserInfo> userInfo = new GetUserInfoRemoteOperation().execute(client);

        assertTrue(userInfo.isSuccess());

        String oldValue = ((UserInfo) userInfo.getData().get(0)).twitter;

        String oldValue = userInfo.getResultData().twitter;



        // set

        assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.TWITTER, "@Nextclouders")
@@ -158,7 +158,7 @@ public class SetUserInfoRemoteOperationTest extends AbstractIT { 


        userInfo = new GetUserInfoRemoteOperation().execute(client);

        assertTrue(userInfo.isSuccess());

        assertEquals("@Nextclouders", ((UserInfo) userInfo.getData().get(0)).twitter);

        assertEquals("@Nextclouders", userInfo.getResultData().twitter);



        // reset

        assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.TWITTER, oldValue)

src/androidTest/java/com/owncloud/android/lib/resources/users/StatusIT.kt

+8 −10
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class StatusIT : AbstractIT() { 
        val result = GetStatusRemoteOperation().run(nextcloudClient)

        assertTrue("GetStatusRemoteOperation failed: " + result.logMessage, result.isSuccess)



        val status = result.singleData as Status

        val status = result.resultData

        assertTrue(status.message.isNullOrBlank())

    }
@@ -71,7 +71,7 @@ class StatusIT : AbstractIT() { 
            result1 = GetStatusRemoteOperation().run(nextcloudClient)

            assertTrue("GetStatusRemoteOperation failed: " + result1.logMessage, result1.isSuccess)



            val status = result1.singleData as Status

            val status = result1.resultData

            assertEquals(statusType, status.status)

        }
@@ -89,8 +89,7 @@ class StatusIT : AbstractIT() { 
            result.isSuccess

        )



        val statusesList: ArrayList<PredefinedStatus> =

            result.singleData as ArrayList<PredefinedStatus>

        val statusesList = result.resultData

        assertTrue(statusesList.isNotEmpty())

    }
@@ -116,8 +115,7 @@ class StatusIT : AbstractIT() { 
            result.isSuccess

        )



        val statusesList: ArrayList<PredefinedStatus> =

            result.singleData as ArrayList<PredefinedStatus>

        val statusesList: ArrayList<PredefinedStatus> = result.resultData

        val newCustomStatusMessage = statusesList[2]

        val clearAt = System.currentTimeMillis() / SECOND_IN_MILLIS + HOUR_IN_MINUTES
@@ -129,10 +127,10 @@ class StatusIT : AbstractIT() { 
        )



        // verify

        result = GetStatusRemoteOperation().run(nextcloudClient)

        assertTrue("GetStatusRemoteOperation failed: " + result.logMessage, result.isSuccess)

        val newResult = GetStatusRemoteOperation().run(nextcloudClient)

        assertTrue("GetStatusRemoteOperation failed: " + newResult.logMessage, newResult.isSuccess)



        val status = result.singleData as Status

        val status = newResult.resultData

        assertEquals(newCustomStatusMessage.message, status.message)

    }
@@ -156,7 +154,7 @@ class StatusIT : AbstractIT() { 
        result = GetStatusRemoteOperation().run(nextcloudClient)

        assertTrue("GetStatusRemoteOperation failed: " + result.logMessage, result.isSuccess)



        val status = result.singleData as Status

        val status = result.resultData

        assertEquals(message, status.message)

        assertEquals(statusIcon, status.icon)

        assertEquals(clearAt, status.clearAt)