Skip to content

Commit 5e19295

Browse files
committed
JAVA-12359 Code Review Changes
1 parent ff47cc7 commit 5e19295

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
public class StringFilenameValidationUtils {
99

10-
public static final Character[] INVALID_WINDOWS_SPECIFIC_CHARS = {'"', '*', ':', '<', '>', '?', '\\', '|'};
10+
public static final Character[] INVALID_WINDOWS_SPECIFIC_CHARS = {'"', '*', '<', '>', '?', '|'};
1111
public static final Character[] INVALID_UNIX_SPECIFIC_CHARS = {'\000'};
1212

1313
public static final String REGEX_PATTERN = "^[A-za-z0-9.]{1,255}$";

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,12 @@ public void givenFilenameStringWithInvalidWindowsCharAndIsUnix_whenValidateUsing
8282
@MethodSource("filenamesWithInvalidWindowsChars")
8383
public void givenFilenameStringWithInvalidWindowsCharAndIsWindows_whenValidateUsingIO_thenRaiseException(
8484
String filename) {
85-
if (!filename.contains(":")) {
86-
assertThatThrownBy(() -> validateStringFilenameUsingIO(filename)).isInstanceOf(IOException.class)
87-
.extracting(Throwable::getMessage, InstanceOfAssertFactories.STRING)
88-
.containsAnyOf("The system cannot find the path specifie",
89-
"The filename, directory name, or volume label syntax is incorrect");
90-
if (!filename.contains("\\")) {
91-
assertThatThrownBy(() -> validateStringFilenameUsingNIO2(filename))
92-
.isInstanceOf(InvalidPathException.class).hasMessageContaining("Illegal char");
93-
}
94-
}
85+
assertThatThrownBy(() -> validateStringFilenameUsingIO(filename)).isInstanceOf(IOException.class)
86+
.extracting(Throwable::getMessage, InstanceOfAssertFactories.STRING)
87+
.containsAnyOf("The system cannot find the path specified",
88+
"The filename, directory name, or volume label syntax is incorrect");
89+
assertThatThrownBy(() -> validateStringFilenameUsingNIO2(filename)).isInstanceOf(InvalidPathException.class)
90+
.hasMessageContaining("Illegal char");
9591

9692
assertThat(validateStringFilenameUsingContains(filename)).isFalse();
9793
}

0 commit comments

Comments
 (0)