iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JAVA-12359 Code Review Changes

This commit is contained in:
anuragkumawat 2022-06-20 20:55:14 +05:30
parent ca3fe06a56
commit 675e33fbab
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core-java-modules/core-java-string-operations-3/src/main/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUtils.java
View File

@ -7,7 +7,7 @@ import java.util.Arrays;
public class StringFilenameValidationUtils { public class StringFilenameValidationUtils {
public static final Character[] INVALID_WINDOWS_SPECIFIC_CHARS = {'"', '*', ':', '<', '>', '?', '\\', '|'}; public static final Character[] INVALID_WINDOWS_SPECIFIC_CHARS = {'"', '*', '<', '>', '?', '|'};
public static final Character[] INVALID_UNIX_SPECIFIC_CHARS = {'\000'}; public static final Character[] INVALID_UNIX_SPECIFIC_CHARS = {'\000'};
public static final String REGEX_PATTERN = "^[A-za-z0-9.]{1,255}$"; public static final String REGEX_PATTERN = "^[A-za-z0-9.]{1,255}$";

10
core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java
View File

@ -82,16 +82,12 @@ public class StringFilenameValidationUnitTest {
@MethodSource("filenamesWithInvalidWindowsChars") @MethodSource("filenamesWithInvalidWindowsChars")
public void givenFilenameStringWithInvalidWindowsCharAndIsWindows_whenValidateUsingIO_thenRaiseException( public void givenFilenameStringWithInvalidWindowsCharAndIsWindows_whenValidateUsingIO_thenRaiseException(
String filename) { String filename) {
if (!filename.contains(":")) {
assertThatThrownBy(() -> validateStringFilenameUsingIO(filename)).isInstanceOf(IOException.class) assertThatThrownBy(() -> validateStringFilenameUsingIO(filename)).isInstanceOf(IOException.class)
.extracting(Throwable::getMessage, InstanceOfAssertFactories.STRING) .extracting(Throwable::getMessage, InstanceOfAssertFactories.STRING)
.containsAnyOf("The system cannot find the path specifie", .containsAnyOf("The system cannot find the path specified",
"The filename, directory name, or volume label syntax is incorrect"); "The filename, directory name, or volume label syntax is incorrect");
if (!filename.contains("\\")) { assertThatThrownBy(() -> validateStringFilenameUsingNIO2(filename)).isInstanceOf(InvalidPathException.class)
assertThatThrownBy(() -> validateStringFilenameUsingNIO2(filename)) .hasMessageContaining("Illegal char");
.isInstanceOf(InvalidPathException.class).hasMessageContaining("Illegal char");
}
}
assertThat(validateStringFilenameUsingContains(filename)).isFalse(); assertThat(validateStringFilenameUsingContains(filename)).isFalse();
} }