Browse Source

Fix tests

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 11 tháng trước cách đây
mục cha
commit
d22beb6c5b

+ 5 - 5
app/src/androidTest/java/com/nextcloud/utils/FileNameValidatorTests.kt

@@ -27,11 +27,11 @@ class FileNameValidatorTests : AbstractIT() {
         capability = capability.apply {
             forbiddenFilenamesJson =
                 """["CON", "PRN", "AUX", "NUL", "COM0", "COM1", "COM2", "COM3", "COM4", 
-                    "COM5", "COM6", "COM7", "COM8", "COM9", "COM¹", "COM²", "COM³", 
-                    "LPT0", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", 
-                    "LPT8", "LPT9", "LPT¹", "LPT²", "LPT³"]"""
-            forbiddenFilenameExtensionJson = """"[".filepart",".part"]"""
-            forbiddenFilenameCharactersJson = """["\\[<>:\"/\\\\|?*\\]","\\[/<>|:&\\]"]"""
+            "COM5", "COM6", "COM7", "COM8", "COM9", "COM¹", "COM²", "COM³", 
+            "LPT0", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", 
+            "LPT8", "LPT9", "LPT¹", "LPT²", "LPT³"]"""
+            forbiddenFilenameExtensionJson = """[".filepart",".part"]"""
+            forbiddenFilenameCharactersJson = """["<", ">", ":", "\\\\", "/", "|", "?", "*", "&"]"""
         }
     }
 

+ 1 - 3
app/src/main/java/com/nextcloud/utils/fileNameValidator/FileNameValidator.kt

@@ -113,9 +113,7 @@ object FileNameValidator {
         capability.forbiddenFilenameCharactersJson?.let {
             val forbiddenFilenameCharacters = capability.forbiddenFilenameCharacters()
 
-            val invalidCharacter = forbiddenFilenameCharacters.find { forbiddenSuffix ->
-                name.endsWith(forbiddenSuffix, ignoreCase = true)
-            }
+            val invalidCharacter = forbiddenFilenameCharacters.firstOrNull { name.contains(it) }
 
             if (invalidCharacter == null) return null