Merge pull request #8670 from nextcloud/fixSearchTests

Fix tests

scripts/runCombinedTest.sh

@@ -15,25 +15,26 @@ scripts/deleteOutdatedComments.sh "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAM
 
 scripts/wait_for_emulator.sh
 ./gradlew jacocoTestGplayDebugUnitTestReport 
-status=$?
+stat=$?
 
-if [ ! $status -eq 0 ]; then
+if [ ! $stat -eq 0 ]; then
     bash scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
 fi
 
 ./gradlew installGplayDebugAndroidTest
 scripts/wait_for_server.sh "server"
 ./gradlew createGplayDebugCoverageReport -Pcoverage -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.owncloud.android.utils.ScreenshotTest
-status=$?
+stat=$(( stat | $? ))
 
-if [ ! $status -eq 0 ]; then
+if [ ! $stat -eq 0 ]; then
     bash scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
 fi
 
 ./gradlew combinedTestReport
-status=$?
+stat=$(( stat | $? ))
 
 curl -o codecov.sh https://codecov.io/bash
 bash ./codecov.sh -t fc506ba4-33c3-43e4-a760-aada38c24fd5
 
-exit $status
+echo "Exit with: " $stat
+exit $stat

src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java

@@ -50,6 +50,7 @@ import java.util.List;
 import static com.owncloud.android.lib.resources.files.SearchRemoteOperation.SearchType.GALLERY_SEARCH;
 import static com.owncloud.android.lib.resources.files.SearchRemoteOperation.SearchType.PHOTO_SEARCH;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
@@ -76,8 +77,10 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
 
     @Test
     public void simpleTest() {
-        assertTrue(sut.getFileByPath("/").fileExists());
-        assertNull(sut.getFileByPath("/123123"));
+        OCFile file = sut.getFileByDecryptedRemotePath("/");
+        assertNotNull(file);
+        assertTrue(file.fileExists());
+        assertNull(sut.getFileByDecryptedRemotePath("/123123"));
     }
 
     @Test
@@ -112,9 +115,9 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
                        .execute(client).isSuccess());
 
         // sync
-        assertNull(sut.getFileByPath("/1/1/"));
+        assertNull(sut.getFileByDecryptedRemotePath("/1/1/"));
 
-        assertTrue(new RefreshFolderOperation(sut.getFileByPath("/"),
+        assertTrue(new RefreshFolderOperation(sut.getFileByDecryptedRemotePath("/"),
                                               System.currentTimeMillis() / 1000,
                                               false,
                                               false,
@@ -122,7 +125,7 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
                                               account,
                                               targetContext).execute(client).isSuccess());
 
-        assertTrue(new RefreshFolderOperation(sut.getFileByPath("/1/"),
+        assertTrue(new RefreshFolderOperation(sut.getFileByDecryptedRemotePath("/1/"),
                                               System.currentTimeMillis() / 1000,
                                               false,
                                               false,
@@ -130,7 +133,7 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
                                               account,
                                               targetContext).execute(client).isSuccess());
 
-        assertTrue(new RefreshFolderOperation(sut.getFileByPath("/1/1/"),
+        assertTrue(new RefreshFolderOperation(sut.getFileByDecryptedRemotePath("/1/1/"),
                                               System.currentTimeMillis() / 1000,
                                               false,
                                               false,
@@ -138,7 +141,7 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
                                               account,
                                               targetContext).execute(client).isSuccess());
 
-        assertEquals(3, sut.getFolderContent(sut.getFileByPath("/1/1/"), false).size());
+        assertEquals(3, sut.getFolderContent(sut.getFileByDecryptedRemotePath("/1/1/"), false).size());
     }
 
     /**
@@ -150,7 +153,7 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
         String remotePath = "/imageFile.png";
         VirtualFolderType virtualType = VirtualFolderType.GALLERY;
 
-        assertEquals(0, sut.getFolderContent(sut.getFileByPath("/"), false).size());
+        assertEquals(0, sut.getFolderContent(sut.getFileByDecryptedRemotePath("/"), false).size());
         assertEquals(1, sut.getAllFiles().size());
 
         File imageFile = getFile("imageFile.png");
@@ -160,18 +163,18 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
                                                  String.valueOf(System.currentTimeMillis() / 1000))
                        .execute(client).isSuccess());
 
-        assertNull(sut.getFileByPath(remotePath));
+        assertNull(sut.getFileByDecryptedRemotePath(remotePath));
 
         // search
         SearchRemoteOperation searchRemoteOperation = new SearchRemoteOperation("image/%",
                                                                                 PHOTO_SEARCH,
                                                                                 false);
 
-        RemoteOperationResult searchResult = searchRemoteOperation.execute(client);
+        RemoteOperationResult<List<RemoteFile>> searchResult = searchRemoteOperation.execute(client);
         TestCase.assertTrue(searchResult.isSuccess());
-        TestCase.assertEquals(1, searchResult.getData().size());
+        TestCase.assertEquals(1, searchResult.getResultData().size());
 
-        OCFile ocFile = FileStorageUtils.fillOCFile((RemoteFile) searchResult.getData().get(0));
+        OCFile ocFile = FileStorageUtils.fillOCFile(searchResult.getResultData().get(0));
         sut.saveFile(ocFile);
 
         List<ContentValues> contentValues = new ArrayList<>();
@@ -185,13 +188,13 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
 
         assertEquals(remotePath, ocFile.getRemotePath());
 
-        assertEquals(0, sut.getFolderContent(sut.getFileByPath("/"), false).size());
+        assertEquals(0, sut.getFolderContent(sut.getFileByDecryptedRemotePath("/"), false).size());
 
         assertEquals(1, sut.getVirtualFolderContent(virtualType, false).size());
         assertEquals(2, sut.getAllFiles().size());
 
         // update root
-        assertTrue(new RefreshFolderOperation(sut.getFileByPath("/"),
+        assertTrue(new RefreshFolderOperation(sut.getFileByDecryptedRemotePath("/"),
                                               System.currentTimeMillis() / 1000,
                                               false,
                                               false,
@@ -200,12 +203,12 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
                                               targetContext).execute(client).isSuccess());
 
 
-        assertEquals(1, sut.getFolderContent(sut.getFileByPath("/"), false).size());
+        assertEquals(1, sut.getFolderContent(sut.getFileByDecryptedRemotePath("/"), false).size());
         assertEquals(1, sut.getVirtualFolderContent(virtualType, false).size());
         assertEquals(2, sut.getAllFiles().size());
 
         assertEquals(sut.getVirtualFolderContent(virtualType, false).get(0),
-                     sut.getFolderContent(sut.getFileByPath("/"), false).get(0));
+                     sut.getFolderContent(sut.getFileByDecryptedRemotePath("/"), false).get(0));
     }
 
     /**
@@ -223,7 +226,7 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
         String imagePath = "/imageFile.png";
         VirtualFolderType virtualType = VirtualFolderType.GALLERY;
 
-        assertEquals(0, sut.getFolderContent(sut.getFileByPath("/"), false).size());
+        assertEquals(0, sut.getFolderContent(sut.getFileByDecryptedRemotePath("/"), false).size());
         assertEquals(1, sut.getAllFiles().size());
 
         File imageFile = getFile("imageFile.png");
@@ -234,7 +237,7 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
                        .execute(client).isSuccess());
 
         // Check that file does not yet exist in local database
-        assertNull(sut.getFileByPath(imagePath));
+        assertNull(sut.getFileByDecryptedRemotePath(imagePath));
 
         String videoPath = "/videoFile.mp4";
         File videoFile = getFile("videoFile.mp4");
@@ -245,19 +248,19 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
                        .execute(client).isSuccess());
 
         // Check that file does not yet exist in local database
-        assertNull(sut.getFileByPath(videoPath));
+        assertNull(sut.getFileByDecryptedRemotePath(videoPath));
 
         // search
         SearchRemoteOperation searchRemoteOperation = new SearchRemoteOperation("",
                                                                                 GALLERY_SEARCH,
                                                                                 false);
 
-        RemoteOperationResult searchResult = searchRemoteOperation.execute(client);
+        RemoteOperationResult<List<RemoteFile>> searchResult = searchRemoteOperation.execute(client);
         TestCase.assertTrue(searchResult.isSuccess());
-        TestCase.assertEquals(2, searchResult.getData().size());
+        TestCase.assertEquals(2, searchResult.getResultData().size());
 
         // newest file must be video path (as sorted by recently modified)
-        OCFile ocFile = FileStorageUtils.fillOCFile((RemoteFile) searchResult.getData().get(0));
+        OCFile ocFile = FileStorageUtils.fillOCFile( searchResult.getResultData().get(0));
         sut.saveFile(ocFile);
         assertEquals(videoPath, ocFile.getRemotePath());
 
@@ -269,7 +272,7 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
         contentValues.add(cv);
 
         // second is image file, as older
-        OCFile ocFile2 = FileStorageUtils.fillOCFile((RemoteFile) searchResult.getData().get(1));
+        OCFile ocFile2 = FileStorageUtils.fillOCFile(searchResult.getResultData().get(1));
         sut.saveFile(ocFile2);
         assertEquals(imagePath, ocFile2.getRemotePath());
 
@@ -281,13 +284,13 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
 
         sut.saveVirtuals(contentValues);
 
-        assertEquals(0, sut.getFolderContent(sut.getFileByPath("/"), false).size());
+        assertEquals(0, sut.getFolderContent(sut.getFileByDecryptedRemotePath("/"), false).size());
 
         assertEquals(2, sut.getVirtualFolderContent(virtualType, false).size());
         assertEquals(3, sut.getAllFiles().size());
 
         // update root
-        assertTrue(new RefreshFolderOperation(sut.getFileByPath("/"),
+        assertTrue(new RefreshFolderOperation(sut.getFileByDecryptedRemotePath("/"),
                                               System.currentTimeMillis() / 1000,
                                               false,
                                               false,
@@ -296,19 +299,19 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
                                               targetContext).execute(client).isSuccess());
 
 
-        assertEquals(2, sut.getFolderContent(sut.getFileByPath("/"), false).size());
+        assertEquals(2, sut.getFolderContent(sut.getFileByDecryptedRemotePath("/"), false).size());
         assertEquals(2, sut.getVirtualFolderContent(virtualType, false).size());
         assertEquals(3, sut.getAllFiles().size());
 
         assertEquals(sut.getVirtualFolderContent(virtualType, false).get(0),
-                     sut.getFolderContent(sut.getFileByPath("/"), false).get(0));
+                     sut.getFolderContent(sut.getFileByDecryptedRemotePath("/"), false).get(0));
     }
 
     @Test
     public void testSaveNewFile() {
         assertTrue(new CreateFolderRemoteOperation("/1/1/", true).execute(client).isSuccess());
 
-        assertTrue(new RefreshFolderOperation(sut.getFileByPath("/"),
+        assertTrue(new RefreshFolderOperation(sut.getFileByDecryptedRemotePath("/"),
                                               System.currentTimeMillis() / 1000,
                                               false,
                                               false,
@@ -316,7 +319,7 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
                                               account,
                                               targetContext).execute(client).isSuccess());
 
-        assertTrue(new RefreshFolderOperation(sut.getFileByPath("/1/"),
+        assertTrue(new RefreshFolderOperation(sut.getFileByDecryptedRemotePath("/1/"),
                                               System.currentTimeMillis() / 1000,
                                               false,
                                               false,
@@ -324,7 +327,7 @@ abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {
                                               account,
                                               targetContext).execute(client).isSuccess());
 
-        assertTrue(new RefreshFolderOperation(sut.getFileByPath("/1/1/"),
+        assertTrue(new RefreshFolderOperation(sut.getFileByDecryptedRemotePath("/1/1/"),
                                               System.currentTimeMillis() / 1000,
                                               false,
                                               false,