fix test

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/nextcloud/client/jobs/autoUpload/FileSystemRepository.kt

@@ -34,7 +34,7 @@ class FileSystemRepository(
         const val BATCH_SIZE = 50
     }
 
-    fun deleteAutoUploadEntityAndUploadEntity(syncedFolder: SyncedFolder, localPath: String, entity: FilesystemEntity) {
+    fun deleteAutoUploadAndUploadEntity(syncedFolder: SyncedFolder, localPath: String, entity: FilesystemEntity) {
         Log_OC.d(TAG, "deleting auto upload entity and upload entity")
 
         val file = File(localPath)
@@ -62,13 +62,13 @@ class FileSystemRepository(
                 val file = File(path)
                 if (!file.exists()) {
                     Log_OC.w(TAG, "Ignoring file for upload (doesn't exist): $path")
-                    deleteAutoUploadEntityAndUploadEntity(syncedFolder, path, entity)
+                    deleteAutoUploadAndUploadEntity(syncedFolder, path, entity)
                 } else if (!SyncedFolderUtils.isQualifiedFolder(file.parent)) {
                     Log_OC.w(TAG, "Ignoring file for upload (unqualified folder): $path")
-                    deleteAutoUploadEntityAndUploadEntity(syncedFolder, path, entity)
+                    deleteAutoUploadAndUploadEntity(syncedFolder, path, entity)
                 } else if (!SyncedFolderUtils.isFileNameQualifiedForAutoUpload(file.name)) {
                     Log_OC.w(TAG, "Ignoring file for upload (unqualified file): $path")
-                    deleteAutoUploadEntityAndUploadEntity(syncedFolder, path, entity)
+                    deleteAutoUploadAndUploadEntity(syncedFolder, path, entity)
                 } else {
                     Log_OC.d(TAG, "Adding path to upload: $path")
 
@@ -186,7 +186,7 @@ class FileSystemRepository(
             if (fileModified <= 0L) {
                 Log_OC.d(TAG, "file is deleted, skipping: $localPath")
                 entity?.let {
-                    deleteAutoUploadEntityAndUploadEntity(syncedFolder, localPath, entity)
+                    deleteAutoUploadAndUploadEntity(syncedFolder, localPath, entity)
                 }
                 return
             }

app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java

@@ -1049,7 +1049,7 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
                 try {
                     // request a shared lock instead of exclusive one, since we are just reading file
                     fileLock = channel.tryLock(0L, Long.MAX_VALUE, true);
-                    Log_OC.d(TAG ,"file locked");
+                    Log_OC.d(TAG ,"🔒" + "file locked");
                 } catch (OverlappingFileLockException e) {
                     // if another thread has the lock, current thread can still read the file.
                     Log_OC.e(TAG, "shared lock overlap detected; proceeding safely.");
@@ -1089,7 +1089,7 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
                     size = new File(mFile.getStoragePath()).length();
                 }
             } catch (Exception exception) {
-                Log_OC.e(TAG, "normalUpload, size cannot be determined from channel: " + exception);
+                Log_OC.e(TAG, "size cannot be determined from channel: " + exception);
                 size = new File(mFile.getStoragePath()).length();
             }
 
@@ -1149,7 +1149,7 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
             if (fileLock != null && fileLock.isValid()) {
                 try {
                     fileLock.release();
-                    Log_OC.d(TAG ,"file lock released");
+                    Log_OC.d(TAG ,"🔓" + "file lock released");
                 } catch (IOException ignored) {
                     Log_OC.e(TAG, "failed to unlock file with path " + mOriginalStoragePath);
                 }
@@ -1160,7 +1160,7 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
             if (channel != null) {
                 try {
                     channel.close();
-                    Log_OC.d(TAG ,"file channel closed");
+                    Log_OC.d(TAG ,"📢" + "file channel closed");
                 } catch (IOException ignored) {
                     Log_OC.e(TAG, "failed to close file channel");
                 }
@@ -1171,7 +1171,7 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
             if (fileInputStream != null) {
                 try {
                     fileInputStream.close();
-                    Log_OC.d(TAG ,"file input stream closed");
+                    Log_OC.d(TAG ,"📝" + "file input stream closed");
                 } catch (IOException ignored) {
                     Log_OC.e(TAG, "failed to close file input stream");
                 }
@@ -1181,7 +1181,7 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
 
             if (temporalFile != null && !originalFile.equals(temporalFile)) {
                 boolean isTempFileDeleted = temporalFile.delete();
-                Log_OC.d(TAG, "normalUpload, temp folder deletion: " + isTempFileDeleted);
+                Log_OC.d(TAG, "temp folder deletion: " + isTempFileDeleted);
             }
 
             if (result == null) {

app/src/test/java/com/owncloud/android/utils/AutoUploadHelperTest.kt

@@ -15,6 +15,7 @@ import com.nextcloud.client.preferences.SubFolderRule
 import com.nextcloud.utils.extensions.shouldSkipFile
 import com.owncloud.android.datamodel.MediaFolderType
 import com.owncloud.android.datamodel.SyncedFolder
+import com.owncloud.android.datamodel.UploadsStorageManager
 import io.mockk.clearAllMocks
 import io.mockk.mockk
 import org.junit.After
@@ -36,14 +37,15 @@ class AutoUploadHelperTest {
     private val mockContext: Context = mockk(relaxed = true)
 
     private lateinit var repo: FileSystemRepository
+    private val mockUploadsStorageManager: UploadsStorageManager = mockk(relaxed = true)
 
     @Before
     fun setup() {
         tempDir = Files.createTempDirectory("auto_upload_test_").toFile()
         tempDir.mkdirs()
         assertTrue("Failed to create temp directory", tempDir.exists())
 
-        repo = FileSystemRepository(mockDao, mockContext)
+        repo = FileSystemRepository(mockDao, mockUploadsStorageManager, mockContext)
     }
 
     @After