From eb99dd8a43ed4b051d4c43b47810f9d6c882d6fe Mon Sep 17 00:00:00 2001 From: Abdourahamane Boinaidi Date: Tue, 24 Oct 2023 11:48:58 +0200 Subject: [PATCH] fix: Update unit test for apiV3 --- .../com/infomaniak/drive/ApiRepositoryTest.kt | 2 +- .../com/infomaniak/drive/FileControllerTest.kt | 16 ++++++++++++++-- .../infomaniak/drive/data/api/ApiRepository.kt | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/src/androidTest/java/com/infomaniak/drive/ApiRepositoryTest.kt b/app/src/androidTest/java/com/infomaniak/drive/ApiRepositoryTest.kt index fcea034f5e..c67884614a 100644 --- a/app/src/androidTest/java/com/infomaniak/drive/ApiRepositoryTest.kt +++ b/app/src/androidTest/java/com/infomaniak/drive/ApiRepositoryTest.kt @@ -228,7 +228,7 @@ class ApiRepositoryTest : KDriveTest() { @DisplayName("Retrieve shared remote file") fun mySharedFileTest() { val order = File.SortType.BIGGER - assertApiResponseData(getMySharedFiles(okHttpClient, userDrive.driveId, order, 1)) + assertApiResponseData(getMySharedFiles(okHttpClient, userDrive.driveId, order, null)) } @Nested diff --git a/app/src/androidTest/java/com/infomaniak/drive/FileControllerTest.kt b/app/src/androidTest/java/com/infomaniak/drive/FileControllerTest.kt index d34390306d..de603f89e3 100644 --- a/app/src/androidTest/java/com/infomaniak/drive/FileControllerTest.kt +++ b/app/src/androidTest/java/com/infomaniak/drive/FileControllerTest.kt @@ -274,13 +274,25 @@ class FileControllerTest : KDriveTest() { private fun getAndSaveRemoteRootFiles(): Pair>? { // Get and save remote root files in realm db test - return getFilesFromCacheOrDownload(Utils.ROOT_ID, 1, true, userDrive = userDrive, customRealm = realm).also { + return getFilesFromCacheOrDownload( + Utils.ROOT_ID, + loadNextPage = false, + ignoreCache = true, + userDrive = userDrive, + customRealm = realm + ).also { assertNotNull(it, "remote root files cannot be null") } } private fun getLocalRootFiles() = - getFilesFromCacheOrDownload(Utils.ROOT_ID, 1, false, userDrive = userDrive, customRealm = realm) + getFilesFromCacheOrDownload( + Utils.ROOT_ID, + loadNextPage = false, + ignoreCache = false, + userDrive = userDrive, + customRealm = realm + ) private fun createAndStoreOfficeFile(transaction: ((remoteFile: File) -> Unit)? = null): File { val remoteFile = createFileForTest() diff --git a/app/src/main/java/com/infomaniak/drive/data/api/ApiRepository.kt b/app/src/main/java/com/infomaniak/drive/data/api/ApiRepository.kt index 32174d08e7..42979ca664 100644 --- a/app/src/main/java/com/infomaniak/drive/data/api/ApiRepository.kt +++ b/app/src/main/java/com/infomaniak/drive/data/api/ApiRepository.kt @@ -446,6 +446,7 @@ object ApiRepository : ApiRepositoryCore() { } private fun pagination(page: Int, perPage: Int = PER_PAGE) = "page=$page&per_page=$perPage" + private fun loadCursor(cursor: String?, perPage: Int = PER_PAGE): String { return "limit=$perPage${if (cursor == null) "" else "&cursor=$cursor"}" }