Merge pull request #781 from nextcloud/backport/780/stable-2.8

[stable-2.8] Enhance tests for master server
nextcloud · Dec 10, 2021 · 7ad15f8 · 7ad15f8
2 parents c7c1ae1 + ff6ab37
commit 7ad15f8
Show file tree

Hide file tree

Showing 27 changed files with 115 additions and 111 deletions.
diff --git a/...EditingCreateFileRemoteOperationTest.java → ...ctEditingCreateFileRemoteOperationIT.java b/...EditingCreateFileRemoteOperationTest.java → ...ctEditingCreateFileRemoteOperationIT.java
@@ -27,20 +27,20 @@
 
 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 DirectEditingCreateFileRemoteOperationTest extends AbstractIT {
+public class DirectEditingCreateFileRemoteOperationIT extends AbstractIT {
     @Test
     public void createEmptyFile() {
         RemoteOperationResult<String> result = new DirectEditingCreateFileRemoteOperation("/test.md",
-                                                                                          "text",
-                                                                                          "textdocument")
+                "text",
+                "textdocument")
                 .execute(client);
         assertTrue(result.isSuccess());
 

diff --git a/...inListOfTemplatesRemoteOperationTest.java → ...tainListOfTemplatesRemoteOperationIT.java b/...inListOfTemplatesRemoteOperationTest.java → ...tainListOfTemplatesRemoteOperationIT.java
@@ -27,16 +27,16 @@
 
 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class DirectEditingObtainListOfTemplatesRemoteOperationTest extends AbstractIT {
+public class DirectEditingObtainListOfTemplatesRemoteOperationIT extends AbstractIT {
 
     @Test
     public void testGetAll() {

diff --git a/...rectEditingObtainRemoteOperationTest.java → ...DirectEditingObtainRemoteOperationIT.java b/...rectEditingObtainRemoteOperationTest.java → ...DirectEditingObtainRemoteOperationIT.java
@@ -23,6 +23,11 @@
 
 package com.nextcloud.android.lib.resources.directediting;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import com.owncloud.android.AbstractIT;
 import com.owncloud.android.lib.common.Creator;
 import com.owncloud.android.lib.common.DirectEditing;
@@ -31,12 +36,7 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-public class DirectEditingObtainRemoteOperationTest extends AbstractIT {
+public class DirectEditingObtainRemoteOperationIT extends AbstractIT {
 
     @Test
     public void testGetAll() {

diff --git a/...ctEditingOpenFileRemoteOperationTest.java → ...rectEditingOpenFileRemoteOperationIT.java b/...ctEditingOpenFileRemoteOperationTest.java → ...rectEditingOpenFileRemoteOperationIT.java
@@ -27,6 +27,9 @@
 
 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;
@@ -38,17 +41,14 @@
 
 import java.io.IOException;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class DirectEditingOpenFileRemoteOperationTest extends AbstractIT {
+public class DirectEditingOpenFileRemoteOperationIT extends AbstractIT {
     @Test
     public void openFile() throws IOException {
         // create file
         String filePath = createFile("text");
         String remotePath = "/text.md";
-        TestCase.assertTrue(new UploadFileRemoteOperation(filePath, remotePath, "text/markdown", "123")
-                                    .execute(client).isSuccess());
+        TestCase.assertTrue(new UploadFileRemoteOperation(filePath, remotePath, "text/markdown", "1464818400")
+                .execute(client).isSuccess());
 
         TestCase.assertTrue(new ReadFileRemoteOperation(remotePath).execute(client).isSuccess());
 
@@ -66,7 +66,7 @@ public void openFileWithSpecialChars() throws IOException {
         // create file
         String filePath = createFile("text");
         String remotePath = "/äää.md";
-        TestCase.assertTrue(new UploadFileRemoteOperation(filePath, remotePath, "text/markdown", "123")
+        TestCase.assertTrue(new UploadFileRemoteOperation(filePath, remotePath, "text/markdown", "1464818400")
                 .execute(client).isSuccess());
 
         TestCase.assertTrue(new ReadFileRemoteOperation(remotePath).execute(client).isSuccess());
@@ -85,7 +85,7 @@ public void openFileWithSpecialChars2() throws IOException {
         // create file
         String filePath = createFile("text");
         String remotePath = "/あ.md";
-        TestCase.assertTrue(new UploadFileRemoteOperation(filePath, remotePath, "text/markdown", "123")
+        TestCase.assertTrue(new UploadFileRemoteOperation(filePath, remotePath, "text/markdown", "1464818400")
                 .execute(client).isSuccess());
 
         TestCase.assertTrue(new ReadFileRemoteOperation(remotePath).execute(client).isSuccess());

diff --git a/...rch/SearchProvidersRemoteOperationTest.kt → ...earch/SearchProvidersRemoteOperationIT.kt b/...rch/SearchProvidersRemoteOperationTest.kt → ...earch/SearchProvidersRemoteOperationIT.kt
@@ -32,7 +32,7 @@ import org.junit.Assert.assertTrue
 import org.junit.Assume.assumeTrue
 import org.junit.Test
 
-class SearchProvidersRemoteOperationTest : AbstractIT() {
+class SearchProvidersRemoteOperationIT : AbstractIT() {
     @Test
     fun getSearchProviders() {
         // only on NC20+

diff --git a/...nerateAppPasswordRemoteOperationTest.java → ...GenerateAppPasswordRemoteOperationIT.java b/...nerateAppPasswordRemoteOperationTest.java → ...GenerateAppPasswordRemoteOperationIT.java
@@ -27,6 +27,10 @@
 
 package com.nextcloud.android.lib.resources.users;
 
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertNotEquals;
+
 import android.text.TextUtils;
 
 import com.owncloud.android.AbstractIT;
@@ -37,11 +41,7 @@
 
 import org.junit.Test;
 
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertNotEquals;
-
-public class GenerateAppPasswordRemoteOperationTest extends AbstractIT {
+public class GenerateAppPasswordRemoteOperationIT extends AbstractIT {
 
     @Test
     public void generateAppPassword() {

diff --git a/...paceDirectEditingRemoteOperationTest.java → ...kspaceDirectEditingRemoteOperationIT.java b/...paceDirectEditingRemoteOperationTest.java → ...kspaceDirectEditingRemoteOperationIT.java
@@ -21,6 +21,9 @@
 
 package com.nextcloud.android.lib.richWorkspace;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import android.webkit.URLUtil;
 
 import com.owncloud.android.AbstractIT;
@@ -33,10 +36,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-public class RichWorkspaceDirectEditingRemoteOperationTest extends AbstractIT {
+public class RichWorkspaceDirectEditingRemoteOperationIT extends AbstractIT {
 
     @Test
     public void getEditLinkForRoot() {

diff --git a/...s/users/GetUserInfoRemoteOperationTest.kt → ...ces/users/GetUserInfoRemoteOperationIT.kt b/...s/users/GetUserInfoRemoteOperationTest.kt → ...ces/users/GetUserInfoRemoteOperationIT.kt
@@ -36,7 +36,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
 
-class GetUserInfoRemoteOperationTest : AbstractIT() {
+class GetUserInfoRemoteOperationIT : AbstractIT() {
     @Test
     fun testGetUserNoQuota() {
         nextcloudClient.credentials = Credentials.basic("user1", "user1")

diff --git a/src/androidTest/java/com/owncloud/android/AbstractIT.java b/src/androidTest/java/com/owncloud/android/AbstractIT.java
@@ -26,6 +26,8 @@
  */
 package com.owncloud.android;
 
+import static junit.framework.TestCase.assertTrue;
+
 import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
@@ -66,17 +68,16 @@
 
 import okhttp3.Credentials;
 
-import static junit.framework.TestCase.assertTrue;
-
 /**
  * Common base for all integration tests
  */
 
 public abstract class AbstractIT {
     @Rule
     public RetryTestRule retryTestRule = new RetryTestRule();
-    
+
     private static final int BUFFER_SIZE = 1024;
+    public static final String RANDOM_MTIME = "1464818400";
 
     public static OwnCloudClient client;
     protected static NextcloudClient nextcloudClient;

diff --git a/.../com/owncloud/android/DeleteFileTest.java → ...va/com/owncloud/android/DeleteFileIT.java b/.../com/owncloud/android/DeleteFileTest.java → ...va/com/owncloud/android/DeleteFileIT.java
@@ -26,6 +26,8 @@
  */
 package com.owncloud.android;
 
+import static org.junit.Assert.assertTrue;
+
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.resources.files.CreateFolderRemoteOperation;
 import com.owncloud.android.lib.resources.files.RemoveFileRemoteOperation;
@@ -37,13 +39,11 @@
 
 import java.io.File;
 
-import static org.junit.Assert.assertTrue;
-
 /**
  * Class to test Delete a File Operation
  */
 
-public class DeleteFileTest extends AbstractIT {
+public class DeleteFileIT extends AbstractIT {
     /* Folder data to delete. */
     private static final String FOLDER_PATH = "/folderToDelete";
 

diff --git a/...ib/common/operations/CreateShareTest.java → .../lib/common/operations/CreateShareIT.java b/...ib/common/operations/CreateShareTest.java → .../lib/common/operations/CreateShareIT.java
@@ -26,6 +26,10 @@
  */
 package com.owncloud.android.lib.common.operations;
 
+import static org.junit.Assert.assertEquals;
+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.ResultCode;
 import com.owncloud.android.lib.resources.files.UploadFileRemoteOperation;
@@ -37,14 +41,10 @@
 
 import java.io.File;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 /**
  * Test create share
  */
-public class CreateShareTest extends AbstractIT {
+public class CreateShareIT extends AbstractIT {
     private static final String NON_EXISTENT_FILE = "/nonExistentFile.txt";
     private static final String serverUri2 = "server2";
 

diff --git a/.../lib/common/operations/GetSharesTest.java → ...id/lib/common/operations/GetSharesIT.java b/.../lib/common/operations/GetSharesTest.java → ...id/lib/common/operations/GetSharesIT.java
@@ -26,6 +26,9 @@
  */
 package com.owncloud.android.lib.common.operations;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import com.owncloud.android.AbstractIT;
 import com.owncloud.android.lib.resources.files.CreateFolderRemoteOperation;
 import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
@@ -37,25 +40,22 @@
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 /**
  * Class to test Get Shares Operation
  *
  * @author masensio
  */
 
-public class GetSharesTest extends AbstractIT {
-    @Test    
+public class GetSharesIT extends AbstractIT {
+    @Test
     public void testGetShares() {
         assertTrue(new CreateFolderRemoteOperation("/1/", true).execute(client).isSuccess());
         assertTrue(new CreateShareRemoteOperation("/1/",
-                                                  ShareType.PUBLIC_LINK,
-                                                  "",
-                                                  false,
-                                                  "",
-                                                  1).execute(client).isSuccess());
+                ShareType.PUBLIC_LINK,
+                "",
+                false,
+                "",
+                1).execute(client).isSuccess());
 
         assertTrue(new CreateFolderRemoteOperation("/2/", true).execute(client).isSuccess());
         assertTrue(new CreateShareRemoteOperation("/2/",

diff --git a/...b/common/operations/GetUserQuotaTest.java → ...lib/common/operations/GetUserQuotaIT.java b/...b/common/operations/GetUserQuotaTest.java → ...lib/common/operations/GetUserQuotaIT.java
@@ -26,22 +26,22 @@
  */
 package com.owncloud.android.lib.common.operations;
 
+import static org.junit.Assert.assertTrue;
+
 import com.owncloud.android.AbstractIT;
 import com.owncloud.android.lib.common.Quota;
 import com.owncloud.android.lib.common.UserInfo;
 import com.owncloud.android.lib.resources.users.GetUserInfoRemoteOperation;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertTrue;
-
 
 /**
  * Class to test Get User Quota
  *
  * @author Bartosz Przybylski
  */
-public class GetUserQuotaTest extends AbstractIT {
+public class GetUserQuotaIT extends AbstractIT {
 
     @Test
     public void testGetUserQuota() {

diff --git a/...ib/common/operations/RemoveShareTest.java → .../lib/common/operations/RemoveShareIT.java b/...ib/common/operations/RemoveShareTest.java → .../lib/common/operations/RemoveShareIT.java
@@ -26,6 +26,8 @@
  */
 package com.owncloud.android.lib.common.operations;
 
+import static org.junit.Assert.assertTrue;
+
 import com.owncloud.android.AbstractIT;
 import com.owncloud.android.lib.resources.files.UploadFileRemoteOperation;
 import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
@@ -39,9 +41,7 @@
 import java.io.IOException;
 import java.util.List;
 
-import static org.junit.Assert.assertTrue;
-
-public class RemoveShareTest extends AbstractIT {
+public class RemoveShareIT extends AbstractIT {
     private static final String FILE_TO_UNSHARE = "/fileToUnshare.txt";
 
     /**

diff --git a/...roidTest/java/com/owncloud/android/lib/resources/comments/CommentFileRemoteOperationIT.kt b/...roidTest/java/com/owncloud/android/lib/resources/comments/CommentFileRemoteOperationIT.kt
@@ -39,7 +39,7 @@ class CommentFileRemoteOperationIT : AbstractIT() {
         val filePath: String = createFile("commentFile")
         val remotePath = "/commentFile.txt"
         assertTrue(
-            UploadFileRemoteOperation(filePath, remotePath, "image/jpg", "123")
+            UploadFileRemoteOperation(filePath, remotePath, "image/jpg", RANDOM_MTIME)
                 .execute(client).isSuccess
         )
 

diff --git a/...ee/UpdateMetadataRemoteOperationTest.java → ...e2ee/UpdateMetadataRemoteOperationIT.java b/...ee/UpdateMetadataRemoteOperationTest.java → ...e2ee/UpdateMetadataRemoteOperationIT.java
@@ -22,6 +22,12 @@
 
 package com.owncloud.android.lib.resources.e2ee;
 
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assume.assumeTrue;
+
 import android.text.TextUtils;
 
 import com.owncloud.android.AbstractIT;
@@ -37,13 +43,7 @@
 
 import org.junit.Test;
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assume.assumeTrue;
-
-public class UpdateMetadataRemoteOperationTest extends AbstractIT {
+public class UpdateMetadataRemoteOperationIT extends AbstractIT {
     @Test
     public void uploadAndModify() {
         // tests only for NC19+