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

Commit 588f79c1 authored by tobiasKaminsky's avatar tobiasKaminsky Committed by Álvaro Brey
Browse files

More changes

parent 7676dc13
Loading
Loading
Loading
Loading
+18 −6
Original line number Diff line number Diff line
@@ -47,8 +47,12 @@ public class DirectEditingOpenFileRemoteOperationIT extends AbstractIT {
        // create file
        String filePath = createFile("text");
        String remotePath = "/text.md";
        TestCase.assertTrue(new UploadFileRemoteOperation(filePath, remotePath, "text/markdown", "1464818400")
                .execute(client).isSuccess());
        TestCase.assertTrue(new UploadFileRemoteOperation(
                filePath,
                remotePath,
                "text/markdown",
                1464818400
        ).execute(client).isSuccess());

        TestCase.assertTrue(new ReadFileRemoteOperation(remotePath).execute(client).isSuccess());

@@ -66,8 +70,12 @@ public class DirectEditingOpenFileRemoteOperationIT extends AbstractIT {
        // create file
        String filePath = createFile("text");
        String remotePath = "/äää.md";
        TestCase.assertTrue(new UploadFileRemoteOperation(filePath, remotePath, "text/markdown", "1464818400")
                .execute(client).isSuccess());
        TestCase.assertTrue(new UploadFileRemoteOperation(
                filePath,
                remotePath,
                "text/markdown",
                1464818400
        ).execute(client).isSuccess());

        TestCase.assertTrue(new ReadFileRemoteOperation(remotePath).execute(client).isSuccess());

@@ -85,8 +93,12 @@ public class DirectEditingOpenFileRemoteOperationIT extends AbstractIT {
        // create file
        String filePath = createFile("text");
        String remotePath = "/あ.md";
        TestCase.assertTrue(new UploadFileRemoteOperation(filePath, remotePath, "text/markdown", "1464818400")
                .execute(client).isSuccess());
        TestCase.assertTrue(new UploadFileRemoteOperation(
                filePath,
                remotePath,
                "text/markdown",
                1464818400
        ).execute(client).isSuccess());

        TestCase.assertTrue(new ReadFileRemoteOperation(remotePath).execute(client).isSuccess());

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ class ToggleFileLockRemoteOperationIT : AbstractIT() {
        val filePath: String = createFile("text")
        val remotePath = "/text.md"
        assertTrue(
            UploadFileRemoteOperation(filePath, remotePath, "text/markdown", "1464818400")
            UploadFileRemoteOperation(filePath, remotePath, "text/markdown", 1464818400)
                .execute(client).isSuccess
        )
        val initialFile =
+4 −3
Original line number Diff line number Diff line
@@ -72,11 +72,12 @@ public class RichWorkspaceDirectEditingRemoteOperationIT extends AbstractIT {

        assertTrue(new CreateFolderRemoteOperation(folder, true).execute(client).isSuccess());

        RemoteOperationResult uploadResult = new UploadFileRemoteOperation(txtFile.getAbsolutePath(),
        RemoteOperationResult uploadResult = new UploadFileRemoteOperation(
                txtFile.getAbsolutePath(),
                filePath,
                "txt/plain",
                String.valueOf(System.currentTimeMillis() / MILLI_TO_SECOND))
                .execute(client);
                System.currentTimeMillis() / MILLI_TO_SECOND
        ).execute(client);

        assertTrue("Error uploading file " + filePath + ": " + uploadResult, uploadResult.isSuccess());

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public abstract class AbstractIT {
    public RetryTestRule retryTestRule = new RetryTestRule();

    private static final int BUFFER_SIZE = 1024;
    public static final String RANDOM_MTIME = "1464818400";
    public static final long RANDOM_MTIME = 1464818400L;
    public static final int MILLI_TO_SECOND = 1000;

    public static OwnCloudClient client;
+15 −10
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@
 */
package com.owncloud.android;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;

import android.util.Log;

import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -42,10 +46,6 @@ import org.junit.Test;

import java.io.File;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;

/**
 * Class to test CopyRemoteFileOperation
 */
@@ -188,7 +188,12 @@ public class CopyFileIT extends AbstractIT {
        File txtFile = getFile(ASSETS__TEXT_FILE_NAME);

        for (String filePath : FILES_IN_FIXTURE) {
            result = new UploadFileRemoteOperation(txtFile.getAbsolutePath(), filePath, "txt/plain", String.valueOf(System.currentTimeMillis() / 1000)).execute(client);
            result = new UploadFileRemoteOperation(
                    txtFile.getAbsolutePath(),
                    filePath,
                    "txt/plain",
                    System.currentTimeMillis() / 1000
            ).execute(client);

            assertTrue("Error uploading file " + filePath + ": " + result, result.isSuccess());
        }
Loading