Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate OwncloudClient - DirectEditing #1273

Merged
merged 4 commits into from
Jun 11, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
DirectEditing - use NextcloudClient in test cases
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
ZetaTom authored and tobiasKaminsky committed Jun 11, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 4e0c7e09d54141bd7feb716bed9552c7869c7f76
Original file line number Diff line number Diff line change
@@ -7,21 +7,21 @@
*/
package com.nextcloud.android.lib.resources.directediting;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import com.owncloud.android.AbstractIT;
import com.owncloud.android.lib.common.operations.RemoteOperationResult;

import org.junit.Test;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

public class DirectEditingCreateFileRemoteOperationIT extends AbstractIT {
@Test
public void createEmptyFile() {
RemoteOperationResult<String> result = new DirectEditingCreateFileRemoteOperation("/test.md",
"text",
"textdocument")
.execute(client);
.execute(nextcloudClient);
assertTrue(result.isSuccess());

String url = result.getResultData();
@@ -35,7 +35,7 @@ public void createFileFromTemplate() {
"text",
"textdocument",
"1")
.execute(client);
.execute(nextcloudClient);
assertTrue(result.isSuccess());

String url = result.getResultData();
@@ -49,7 +49,7 @@ public void createFileWithSpecialCharacterFromTemplate() {
"text",
"textdocument",
"1")
.execute(client);
.execute(nextcloudClient);
assertTrue(result.isSuccess());

String url = result.getResultData();
Original file line number Diff line number Diff line change
@@ -7,27 +7,29 @@
*/
package com.nextcloud.android.lib.resources.directediting;

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

import com.owncloud.android.AbstractIT;
import com.owncloud.android.lib.common.TemplateList;
import com.owncloud.android.lib.common.operations.RemoteOperationResult;

import org.junit.Test;

import java.util.Objects;

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

public class DirectEditingObtainListOfTemplatesRemoteOperationIT extends AbstractIT {

@Test
public void testGetAll() {
RemoteOperationResult result = new DirectEditingObtainListOfTemplatesRemoteOperation("text",
RemoteOperationResult<TemplateList> result = new DirectEditingObtainListOfTemplatesRemoteOperation("text",
"textdocument")
.execute(client);
.execute(nextcloudClient);
assertTrue(result.isSuccess());

TemplateList templateList = (TemplateList) result.getResultData();

assertEquals("Empty file", templateList.getTemplates().get("empty").getTitle());
assertEquals("md", templateList.getTemplates().get("empty").getExtension());
assertEquals("Empty file", Objects.requireNonNull(templateList.getTemplates().get("empty")).getTitle());
assertEquals("md", Objects.requireNonNull(templateList.getTemplates().get("empty")).getExtension());
}
}
Original file line number Diff line number Diff line change
@@ -7,9 +7,6 @@
*/
package com.nextcloud.android.lib.resources.directediting;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import com.owncloud.android.AbstractIT;
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.resources.files.ReadFileRemoteOperation;
@@ -21,6 +18,9 @@

import java.io.IOException;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

public class DirectEditingOpenFileRemoteOperationIT extends AbstractIT {
@Test
public void openFile() throws IOException {
@@ -37,10 +37,11 @@ public void openFile() throws IOException {
TestCase.assertTrue(new ReadFileRemoteOperation(remotePath).execute(client).isSuccess());

// open file
RemoteOperationResult result = new DirectEditingOpenFileRemoteOperation(remotePath, "text").execute(client);
RemoteOperationResult<String> result = new DirectEditingOpenFileRemoteOperation(remotePath, "text")
.execute(nextcloudClient);
assertTrue(result.isSuccess());

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

assertFalse(url.isEmpty());
}
@@ -60,10 +61,11 @@ public void openFileWithSpecialChars() throws IOException {
TestCase.assertTrue(new ReadFileRemoteOperation(remotePath).execute(client).isSuccess());

// open file
RemoteOperationResult result = new DirectEditingOpenFileRemoteOperation(remotePath, "text").execute(client);
RemoteOperationResult<String> result = new DirectEditingOpenFileRemoteOperation(remotePath, "text")
.execute(nextcloudClient);
assertTrue(result.isSuccess());

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

assertFalse(url.isEmpty());
}
@@ -83,10 +85,11 @@ public void openFileWithSpecialChars2() throws IOException {
TestCase.assertTrue(new ReadFileRemoteOperation(remotePath).execute(client).isSuccess());

// open file
RemoteOperationResult result = new DirectEditingOpenFileRemoteOperation(remotePath, "text").execute(client);
RemoteOperationResult<String> result = new DirectEditingOpenFileRemoteOperation(remotePath, "text")
.execute(nextcloudClient);
assertTrue(result.isSuccess());

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

assertFalse(url.isEmpty());
}
@@ -98,7 +101,8 @@ public void openNonExistingFile() {
TestCase.assertFalse(new ReadFileRemoteOperation(remotePath).execute(client).isSuccess());

// open file
RemoteOperationResult result = new DirectEditingOpenFileRemoteOperation(remotePath, "text").execute(client);
RemoteOperationResult<String> result = new DirectEditingOpenFileRemoteOperation(remotePath, "text")
.execute(nextcloudClient);
assertFalse(result.isSuccess());
}
}