mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix broken unit tests

Browse source 
Signed-off-by: Dean Birch <dean.birch0@gmail.com>
This commit is contained in:
Dean Birch 2023-08-01 21:30:50 +01:00 committed by tobiasKaminsky
parent a687ca68d3
commit d30980ddee
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/src/test/java/com/nextcloud/client/utils/FileStorageUtilsTest.kt
View file

@ -21,6 +21,7 @@
package com.nextcloud.client.utils package com.nextcloud.client.utils
import com.nextcloud.client.preferences.SubFolderRule
import com.owncloud.android.utils.FileStorageUtils import com.owncloud.android.utils.FileStorageUtils
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Test import org.junit.Test
@ -35,6 +36,7 @@ class FileStorageUtilsTest {
val syncedFolderRemotePath = "/Camera" val syncedFolderRemotePath = "/Camera"
val subFolderByDate = false val subFolderByDate = false
val dateTaken = 123123123L val dateTaken = 123123123L
val subFolderRule = SubFolderRule.YEAR_MONTH
val result = FileStorageUtils.getInstantUploadFilePath( val result = FileStorageUtils.getInstantUploadFilePath(
file, file,
@ -42,7 +44,8 @@ class FileStorageUtilsTest {
syncedFolderRemotePath, syncedFolderRemotePath,
syncedFolderLocalPath, syncedFolderLocalPath,
dateTaken, dateTaken,
subFolderByDate subFolderByDate,
subFolderRule
) )
val expected = "/Camera/subfolder/file.jpg" val expected = "/Camera/subfolder/file.jpg"
@ -56,6 +59,7 @@ class FileStorageUtilsTest {
val syncedFolderRemotePath = "/Camera" val syncedFolderRemotePath = "/Camera"
val subFolderByDate = false val subFolderByDate = false
val dateTaken = 123123123L val dateTaken = 123123123L
val subFolderRule = SubFolderRule.YEAR_MONTH
val result = FileStorageUtils.getInstantUploadFilePath( val result = FileStorageUtils.getInstantUploadFilePath(
file, file,
@ -63,7 +67,8 @@ class FileStorageUtilsTest {
syncedFolderRemotePath, syncedFolderRemotePath,
syncedFolderLocalPath, syncedFolderLocalPath,
dateTaken, dateTaken,
subFolderByDate subFolderByDate,
subFolderRule
) )
val expected = "/Camera/file.jpg" val expected = "/Camera/file.jpg"
@ -77,6 +82,7 @@ class FileStorageUtilsTest {
val syncedFolderRemotePath = "/Camera" val syncedFolderRemotePath = "/Camera"
val subFolderByDate = true val subFolderByDate = true
val dateTaken = 0L val dateTaken = 0L
var subFolderRule = SubFolderRule.YEAR_MONTH
val result = FileStorageUtils.getInstantUploadFilePath( val result = FileStorageUtils.getInstantUploadFilePath(
file, file,
@ -84,7 +90,8 @@ class FileStorageUtilsTest {
syncedFolderRemotePath, syncedFolderRemotePath,
syncedFolderLocalPath, syncedFolderLocalPath,
dateTaken, dateTaken,
subFolderByDate subFolderByDate,
subFolderRule
) )
val expected = "/Camera/file.jpg" val expected = "/Camera/file.jpg"
@ -98,6 +105,7 @@ class FileStorageUtilsTest {
val syncedFolderRemotePath = "/Camera" val syncedFolderRemotePath = "/Camera"
val subFolderByDate = false val subFolderByDate = false
val dateTaken = 123123123L val dateTaken = 123123123L
var subFolderRule = SubFolderRule.YEAR_MONTH
val result = FileStorageUtils.getInstantUploadFilePath( val result = FileStorageUtils.getInstantUploadFilePath(
file, file,
@ -105,7 +113,8 @@ class FileStorageUtilsTest {
syncedFolderRemotePath, syncedFolderRemotePath,
syncedFolderLocalPath, syncedFolderLocalPath,
dateTaken, dateTaken,
subFolderByDate subFolderByDate,
subFolderRule
) )
val expected = "/Camera/file.jpg" val expected = "/Camera/file.jpg"
@ -119,6 +128,7 @@ class FileStorageUtilsTest {
val syncedFolderRemotePath = "/Camera" val syncedFolderRemotePath = "/Camera"
val subFolderByDate = true val subFolderByDate = true
val dateTaken = 1569918628000L val dateTaken = 1569918628000L
val subFolderRule = SubFolderRule.YEAR_MONTH
val result = FileStorageUtils.getInstantUploadFilePath( val result = FileStorageUtils.getInstantUploadFilePath(
file, file,
@ -126,7 +136,8 @@ class FileStorageUtilsTest {
syncedFolderRemotePath, syncedFolderRemotePath,
syncedFolderLocalPath, syncedFolderLocalPath,
dateTaken, dateTaken,
subFolderByDate subFolderByDate,
subFolderRule
) )
val expected = "/Camera/2019/10/file.jpg" val expected = "/Camera/2019/10/file.jpg"
@ -140,6 +151,7 @@ class FileStorageUtilsTest {
val syncedFolderRemotePath = "/Camera" val syncedFolderRemotePath = "/Camera"
val subFolderByDate = false val subFolderByDate = false
val dateTaken = 123123123L val dateTaken = 123123123L
var subFolderRule = SubFolderRule.YEAR_MONTH
val result = FileStorageUtils.getInstantUploadFilePath( val result = FileStorageUtils.getInstantUploadFilePath(
file, file,
@ -147,7 +159,8 @@ class FileStorageUtilsTest {
syncedFolderRemotePath, syncedFolderRemotePath,
syncedFolderLocalPath, syncedFolderLocalPath,
dateTaken, dateTaken,
subFolderByDate subFolderByDate,
subFolderRule
) )
val expected = "/Camera/subfolder/file.jpg" val expected = "/Camera/subfolder/file.jpg"
@ -161,6 +174,7 @@ class FileStorageUtilsTest {
val syncedFolderRemotePath = "/Camera" val syncedFolderRemotePath = "/Camera"
val subFolderByDate = true val subFolderByDate = true
val dateTaken = 1569918628000L val dateTaken = 1569918628000L
var subFolderRule = SubFolderRule.YEAR_MONTH
val result = FileStorageUtils.getInstantUploadFilePath( val result = FileStorageUtils.getInstantUploadFilePath(
file, file,
@ -168,7 +182,8 @@ class FileStorageUtilsTest {
syncedFolderRemotePath, syncedFolderRemotePath,
syncedFolderLocalPath, syncedFolderLocalPath,
dateTaken, dateTaken,
subFolderByDate subFolderByDate,
subFolderRule
) )
val expected = "/Camera/2019/10/subfolder/file.jpg" val expected = "/Camera/2019/10/subfolder/file.jpg"