Skip to content

Commit a199a0d

Browse files
garydgregorygarydgregory
committed
Extract constant
1 parent 9a9bab0 commit a199a0d

File tree

1 file changed

+72
-70
lines changed

1 file changed

+72
-70
lines changed

‎src/test/java/org/apache/commons/io/FilenameUtilsTest.java‎

Lines changed: 72 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
*/
4343
class FilenameUtilsTest {
4444

45+
private static final String DRIVE_C = "C:";
46+
4547
private static final String SEP = "" + File.separatorChar;
4648

4749
private static final boolean WINDOWS = File.separatorChar == '\\';
@@ -128,7 +130,7 @@ void testConcat() {
128130

129131
assertEquals(SEP + "c" + SEP + "d", FilenameUtils.concat("a/b/", "/c/d"));
130132
assertEquals("C:c" + SEP + "d", FilenameUtils.concat("a/b/", "C:c/d"));
131-
assertEquals("C:" + SEP + "c" + SEP + "d", FilenameUtils.concat("a/b/", "C:/c/d"));
133+
assertEquals(DRIVE_C + SEP + "c" + SEP + "d", FilenameUtils.concat("a/b/", "C:/c/d"));
132134
assertEquals("~" + SEP + "c" + SEP + "d", FilenameUtils.concat("a/b/", "~/c/d"));
133135
assertEquals("~user" + SEP + "c" + SEP + "d", FilenameUtils.concat("a/b/", "~user/c/d"));
134136
assertEquals("~" + SEP, FilenameUtils.concat("a/b/", "~"));
@@ -277,10 +279,10 @@ void testGetFullPath() {
277279
assertEquals("", FilenameUtils.getFullPath(""));
278280

279281
if (SystemUtils.IS_OS_WINDOWS) {
280-
assertEquals("C:", FilenameUtils.getFullPath("C:"));
282+
assertEquals(DRIVE_C, FilenameUtils.getFullPath(DRIVE_C));
281283
}
282284
if (SystemUtils.IS_OS_LINUX) {
283-
assertEquals("", FilenameUtils.getFullPath("C:"));
285+
assertEquals("", FilenameUtils.getFullPath(DRIVE_C));
284286
}
285287

286288
assertEquals("C:/", FilenameUtils.getFullPath("C:/"));
@@ -292,7 +294,7 @@ void testGetFullPath() {
292294

293295
assertEquals("a/b/", FilenameUtils.getFullPath("a/b/c.txt"));
294296
assertEquals("/a/b/", FilenameUtils.getFullPath("/a/b/c.txt"));
295-
assertEquals("C:", FilenameUtils.getFullPath("C:a"));
297+
assertEquals(DRIVE_C, FilenameUtils.getFullPath("C:a"));
296298
assertEquals("C:a/b/", FilenameUtils.getFullPath("C:a/b/c.txt"));
297299
assertEquals("C:/a/b/", FilenameUtils.getFullPath("C:/a/b/c.txt"));
298300
assertEquals("//server/a/b/", FilenameUtils.getFullPath("//server/a/b/c.txt"));
@@ -319,10 +321,10 @@ void testGetFullPathNoEndSeparator() {
319321
assertEquals("", FilenameUtils.getFullPathNoEndSeparator(""));
320322

321323
if (SystemUtils.IS_OS_WINDOWS) {
322-
assertEquals("C:", FilenameUtils.getFullPathNoEndSeparator("C:"));
324+
assertEquals(DRIVE_C, FilenameUtils.getFullPathNoEndSeparator(DRIVE_C));
323325
}
324326
if (SystemUtils.IS_OS_LINUX) {
325-
assertEquals("", FilenameUtils.getFullPathNoEndSeparator("C:"));
327+
assertEquals("", FilenameUtils.getFullPathNoEndSeparator(DRIVE_C));
326328
}
327329

328330
assertEquals("C:/", FilenameUtils.getFullPathNoEndSeparator("C:/"));
@@ -334,7 +336,7 @@ void testGetFullPathNoEndSeparator() {
334336

335337
assertEquals("a/b", FilenameUtils.getFullPathNoEndSeparator("a/b/c.txt"));
336338
assertEquals("/a/b", FilenameUtils.getFullPathNoEndSeparator("/a/b/c.txt"));
337-
assertEquals("C:", FilenameUtils.getFullPathNoEndSeparator("C:a"));
339+
assertEquals(DRIVE_C, FilenameUtils.getFullPathNoEndSeparator("C:a"));
338340
assertEquals("C:a/b", FilenameUtils.getFullPathNoEndSeparator("C:a/b/c.txt"));
339341
assertEquals("C:/a/b", FilenameUtils.getFullPathNoEndSeparator("C:/a/b/c.txt"));
340342
assertEquals("//server/a/b", FilenameUtils.getFullPathNoEndSeparator("//server/a/b/c.txt"));
@@ -390,7 +392,7 @@ void testGetPath() {
390392
assertNull(FilenameUtils.getPath("//a"));
391393

392394
assertEquals("", FilenameUtils.getPath(""));
393-
assertEquals("", FilenameUtils.getPath("C:"));
395+
assertEquals("", FilenameUtils.getPath(DRIVE_C));
394396
assertEquals("", FilenameUtils.getPath("C:/"));
395397
assertEquals("", FilenameUtils.getPath("//server/"));
396398
assertEquals("", FilenameUtils.getPath("~"));
@@ -432,7 +434,7 @@ void testGetPathNoEndSeparator() {
432434
assertNull(FilenameUtils.getPathNoEndSeparator("//a"));
433435

434436
assertEquals("", FilenameUtils.getPathNoEndSeparator(""));
435-
assertEquals("", FilenameUtils.getPathNoEndSeparator("C:"));
437+
assertEquals("", FilenameUtils.getPathNoEndSeparator(DRIVE_C));
436438
assertEquals("", FilenameUtils.getPathNoEndSeparator("C:/"));
437439
assertEquals("", FilenameUtils.getPathNoEndSeparator("//server/"));
438440
assertEquals("", FilenameUtils.getPathNoEndSeparator("~"));
@@ -469,10 +471,10 @@ void testGetPrefix() {
469471
assertEquals("\\", FilenameUtils.getPrefix("\\"));
470472

471473
if (SystemUtils.IS_OS_WINDOWS) {
472-
assertEquals("C:", FilenameUtils.getPrefix("C:"));
474+
assertEquals(DRIVE_C, FilenameUtils.getPrefix(DRIVE_C));
473475
}
474476
if (SystemUtils.IS_OS_LINUX) {
475-
assertEquals("", FilenameUtils.getPrefix("C:"));
477+
assertEquals("", FilenameUtils.getPrefix(DRIVE_C));
476478
}
477479

478480
assertEquals("C:\\", FilenameUtils.getPrefix("C:\\"));
@@ -519,10 +521,10 @@ void testGetPrefixLength() {
519521
assertEquals(1, FilenameUtils.getPrefixLength("\\"));
520522

521523
if (SystemUtils.IS_OS_WINDOWS) {
522-
assertEquals(2, FilenameUtils.getPrefixLength("C:"));
524+
assertEquals(2, FilenameUtils.getPrefixLength(DRIVE_C));
523525
}
524526
if (SystemUtils.IS_OS_LINUX) {
525-
assertEquals(0, FilenameUtils.getPrefixLength("C:"));
527+
assertEquals(0, FilenameUtils.getPrefixLength(DRIVE_C));
526528
}
527529

528530
assertEquals(3, FilenameUtils.getPrefixLength("C:\\"));
@@ -758,7 +760,7 @@ void testNormalize() {
758760

759761
assertEquals("a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("a\\b/c.txt"));
760762
assertEquals("" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("\\a\\b/c.txt"));
761-
assertEquals("C:" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("C:\\a\\b/c.txt"));
763+
assertEquals(DRIVE_C + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("C:\\a\\b/c.txt"));
762764
assertEquals("" + SEP + "" + SEP + "server" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("\\\\server\\a\\b/c.txt"));
763765
assertEquals("~" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("~\\a\\b/c.txt"));
764766
assertEquals("~user" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("~user\\a\\b/c.txt"));
@@ -841,41 +843,41 @@ void testNormalize() {
841843
assertEquals("~user" + SEP, FilenameUtils.normalize("~user/"));
842844
assertEquals("~user" + SEP, FilenameUtils.normalize("~user"));
843845

844-
assertEquals("C:" + SEP + "a", FilenameUtils.normalize("C:/a"));
845-
assertEquals("C:" + SEP + "a" + SEP, FilenameUtils.normalize("C:/a/"));
846-
assertEquals("C:" + SEP + "a" + SEP + "c", FilenameUtils.normalize("C:/a/b/../c"));
847-
assertEquals("C:" + SEP + "c", FilenameUtils.normalize("C:/a/b/../../c"));
846+
assertEquals(DRIVE_C + SEP + "a", FilenameUtils.normalize("C:/a"));
847+
assertEquals(DRIVE_C + SEP + "a" + SEP, FilenameUtils.normalize("C:/a/"));
848+
assertEquals(DRIVE_C + SEP + "a" + SEP + "c", FilenameUtils.normalize("C:/a/b/../c"));
849+
assertEquals(DRIVE_C + SEP + "c", FilenameUtils.normalize("C:/a/b/../../c"));
848850
assertNull(FilenameUtils.normalize("C:/a/b/../../../c"));
849-
assertEquals("C:" + SEP + "a" + SEP, FilenameUtils.normalize("C:/a/b/.."));
850-
assertEquals("C:" + SEP + "", FilenameUtils.normalize("C:/a/b/../.."));
851+
assertEquals(DRIVE_C + SEP + "a" + SEP, FilenameUtils.normalize("C:/a/b/.."));
852+
assertEquals(DRIVE_C + SEP + "", FilenameUtils.normalize("C:/a/b/../.."));
851853
assertNull(FilenameUtils.normalize("C:/a/b/../../.."));
852-
assertEquals("C:" + SEP + "a" + SEP + "d", FilenameUtils.normalize("C:/a/b/../c/../d"));
853-
assertEquals("C:" + SEP + "a" + SEP + "b" + SEP + "d", FilenameUtils.normalize("C:/a/b//d"));
854-
assertEquals("C:" + SEP + "a" + SEP + "b" + SEP, FilenameUtils.normalize("C:/a/b/././."));
855-
assertEquals("C:" + SEP + "a", FilenameUtils.normalize("C:/./a"));
856-
assertEquals("C:" + SEP + "", FilenameUtils.normalize("C:/./"));
857-
assertEquals("C:" + SEP + "", FilenameUtils.normalize("C:/."));
854+
assertEquals(DRIVE_C + SEP + "a" + SEP + "d", FilenameUtils.normalize("C:/a/b/../c/../d"));
855+
assertEquals(DRIVE_C + SEP + "a" + SEP + "b" + SEP + "d", FilenameUtils.normalize("C:/a/b//d"));
856+
assertEquals(DRIVE_C + SEP + "a" + SEP + "b" + SEP, FilenameUtils.normalize("C:/a/b/././."));
857+
assertEquals(DRIVE_C + SEP + "a", FilenameUtils.normalize("C:/./a"));
858+
assertEquals(DRIVE_C + SEP + "", FilenameUtils.normalize("C:/./"));
859+
assertEquals(DRIVE_C + SEP + "", FilenameUtils.normalize("C:/."));
858860
assertNull(FilenameUtils.normalize("C:/../a"));
859861
assertNull(FilenameUtils.normalize("C:/.."));
860-
assertEquals("C:" + SEP + "", FilenameUtils.normalize("C:/"));
862+
assertEquals(DRIVE_C + SEP + "", FilenameUtils.normalize("C:/"));
861863

862-
assertEquals("C:" + "a", FilenameUtils.normalize("C:a"));
863-
assertEquals("C:" + "a" + SEP, FilenameUtils.normalize("C:a/"));
864-
assertEquals("C:" + "a" + SEP + "c", FilenameUtils.normalize("C:a/b/../c"));
865-
assertEquals("C:" + "c", FilenameUtils.normalize("C:a/b/../../c"));
864+
assertEquals(DRIVE_C + "a", FilenameUtils.normalize("C:a"));
865+
assertEquals(DRIVE_C + "a" + SEP, FilenameUtils.normalize("C:a/"));
866+
assertEquals(DRIVE_C + "a" + SEP + "c", FilenameUtils.normalize("C:a/b/../c"));
867+
assertEquals(DRIVE_C + "c", FilenameUtils.normalize("C:a/b/../../c"));
866868
assertNull(FilenameUtils.normalize("C:a/b/../../../c"));
867-
assertEquals("C:" + "a" + SEP, FilenameUtils.normalize("C:a/b/.."));
868-
assertEquals("C:" + "", FilenameUtils.normalize("C:a/b/../.."));
869+
assertEquals(DRIVE_C + "a" + SEP, FilenameUtils.normalize("C:a/b/.."));
870+
assertEquals(DRIVE_C + "", FilenameUtils.normalize("C:a/b/../.."));
869871
assertNull(FilenameUtils.normalize("C:a/b/../../.."));
870-
assertEquals("C:" + "a" + SEP + "d", FilenameUtils.normalize("C:a/b/../c/../d"));
871-
assertEquals("C:" + "a" + SEP + "b" + SEP + "d", FilenameUtils.normalize("C:a/b//d"));
872-
assertEquals("C:" + "a" + SEP + "b" + SEP, FilenameUtils.normalize("C:a/b/././."));
873-
assertEquals("C:" + "a", FilenameUtils.normalize("C:./a"));
874-
assertEquals("C:" + "", FilenameUtils.normalize("C:./"));
875-
assertEquals("C:" + "", FilenameUtils.normalize("C:."));
872+
assertEquals(DRIVE_C + "a" + SEP + "d", FilenameUtils.normalize("C:a/b/../c/../d"));
873+
assertEquals(DRIVE_C + "a" + SEP + "b" + SEP + "d", FilenameUtils.normalize("C:a/b//d"));
874+
assertEquals(DRIVE_C + "a" + SEP + "b" + SEP, FilenameUtils.normalize("C:a/b/././."));
875+
assertEquals(DRIVE_C + "a", FilenameUtils.normalize("C:./a"));
876+
assertEquals(DRIVE_C + "", FilenameUtils.normalize("C:./"));
877+
assertEquals(DRIVE_C + "", FilenameUtils.normalize("C:."));
876878
assertNull(FilenameUtils.normalize("C:../a"));
877879
assertNull(FilenameUtils.normalize("C:.."));
878-
assertEquals("C:" + "", FilenameUtils.normalize("C:"));
880+
assertEquals(DRIVE_C + "", FilenameUtils.normalize(DRIVE_C));
879881

880882
assertEquals(SEP + SEP + "server" + SEP + "a", FilenameUtils.normalize("//server/a"));
881883
assertEquals(SEP + SEP + "server" + SEP + "a" + SEP, FilenameUtils.normalize("//server/a/"));
@@ -948,8 +950,8 @@ void testNormalizeFromJavaDoc() {
948950
assertEquals("bar", FilenameUtils.normalize("foo" + SEP + ".." + SEP + "bar"));
949951
assertEquals(SEP + SEP + "server" + SEP + "bar", FilenameUtils.normalize(SEP + SEP + "server" + SEP + "foo" + SEP + ".." + SEP + "bar"));
950952
assertNull(FilenameUtils.normalize(SEP + SEP + "server" + SEP + ".." + SEP + "bar"));
951-
assertEquals("C:" + SEP + "bar", FilenameUtils.normalize("C:" + SEP + "foo" + SEP + ".." + SEP + "bar"));
952-
assertNull(FilenameUtils.normalize("C:" + SEP + ".." + SEP + "bar"));
953+
assertEquals(DRIVE_C + SEP + "bar", FilenameUtils.normalize(DRIVE_C + SEP + "foo" + SEP + ".." + SEP + "bar"));
954+
assertNull(FilenameUtils.normalize(DRIVE_C + SEP + ".." + SEP + "bar"));
953955
assertEquals("~" + SEP + "bar" + SEP, FilenameUtils.normalize("~" + SEP + "foo" + SEP + ".." + SEP + "bar" + SEP));
954956
assertNull(FilenameUtils.normalize("~" + SEP + ".." + SEP + "bar"));
955957

@@ -969,11 +971,11 @@ void testNormalizeNoEndSeparator() {
969971

970972
assertEquals("a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("a\\b/c.txt"));
971973
assertEquals("" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("\\a\\b/c.txt"));
972-
assertEquals("C:" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("C:\\a\\b/c.txt"));
974+
assertEquals(DRIVE_C + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("C:\\a\\b/c.txt"));
973975
assertEquals("" + SEP + "" + SEP + "server" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("\\\\server\\a\\b/c.txt"));
974976
assertEquals("~" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("~\\a\\b/c.txt"));
975977
assertEquals("~user" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("~user\\a\\b/c.txt"));
976-
assertEquals("C:" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("C:\\\\a\\\\b\\\\c.txt"));
978+
assertEquals(DRIVE_C + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("C:\\\\a\\\\b\\\\c.txt"));
977979

978980
assertEquals("a" + SEP + "c", FilenameUtils.normalizeNoEndSeparator("a/b/../c"));
979981
assertEquals("c", FilenameUtils.normalizeNoEndSeparator("a/b/../../c"));
@@ -1053,41 +1055,41 @@ void testNormalizeNoEndSeparator() {
10531055
assertEquals("~user" + SEP, FilenameUtils.normalizeNoEndSeparator("~user/"));
10541056
assertEquals("~user" + SEP, FilenameUtils.normalizeNoEndSeparator("~user"));
10551057

1056-
assertEquals("C:" + SEP + "a", FilenameUtils.normalizeNoEndSeparator("C:/a"));
1057-
assertEquals("C:" + SEP + "a", FilenameUtils.normalizeNoEndSeparator("C:/a/"));
1058-
assertEquals("C:" + SEP + "a" + SEP + "c", FilenameUtils.normalizeNoEndSeparator("C:/a/b/../c"));
1059-
assertEquals("C:" + SEP + "c", FilenameUtils.normalizeNoEndSeparator("C:/a/b/../../c"));
1058+
assertEquals(DRIVE_C + SEP + "a", FilenameUtils.normalizeNoEndSeparator("C:/a"));
1059+
assertEquals(DRIVE_C + SEP + "a", FilenameUtils.normalizeNoEndSeparator("C:/a/"));
1060+
assertEquals(DRIVE_C + SEP + "a" + SEP + "c", FilenameUtils.normalizeNoEndSeparator("C:/a/b/../c"));
1061+
assertEquals(DRIVE_C + SEP + "c", FilenameUtils.normalizeNoEndSeparator("C:/a/b/../../c"));
10601062
assertNull(FilenameUtils.normalizeNoEndSeparator("C:/a/b/../../../c"));
1061-
assertEquals("C:" + SEP + "a", FilenameUtils.normalizeNoEndSeparator("C:/a/b/.."));
1062-
assertEquals("C:" + SEP + "", FilenameUtils.normalizeNoEndSeparator("C:/a/b/../.."));
1063+
assertEquals(DRIVE_C + SEP + "a", FilenameUtils.normalizeNoEndSeparator("C:/a/b/.."));
1064+
assertEquals(DRIVE_C + SEP + "", FilenameUtils.normalizeNoEndSeparator("C:/a/b/../.."));
10631065
assertNull(FilenameUtils.normalizeNoEndSeparator("C:/a/b/../../.."));
1064-
assertEquals("C:" + SEP + "a" + SEP + "d", FilenameUtils.normalizeNoEndSeparator("C:/a/b/../c/../d"));
1065-
assertEquals("C:" + SEP + "a" + SEP + "b" + SEP + "d", FilenameUtils.normalizeNoEndSeparator("C:/a/b//d"));
1066-
assertEquals("C:" + SEP + "a" + SEP + "b", FilenameUtils.normalizeNoEndSeparator("C:/a/b/././."));
1067-
assertEquals("C:" + SEP + "a", FilenameUtils.normalizeNoEndSeparator("C:/./a"));
1068-
assertEquals("C:" + SEP + "", FilenameUtils.normalizeNoEndSeparator("C:/./"));
1069-
assertEquals("C:" + SEP + "", FilenameUtils.normalizeNoEndSeparator("C:/."));
1066+
assertEquals(DRIVE_C + SEP + "a" + SEP + "d", FilenameUtils.normalizeNoEndSeparator("C:/a/b/../c/../d"));
1067+
assertEquals(DRIVE_C + SEP + "a" + SEP + "b" + SEP + "d", FilenameUtils.normalizeNoEndSeparator("C:/a/b//d"));
1068+
assertEquals(DRIVE_C + SEP + "a" + SEP + "b", FilenameUtils.normalizeNoEndSeparator("C:/a/b/././."));
1069+
assertEquals(DRIVE_C + SEP + "a", FilenameUtils.normalizeNoEndSeparator("C:/./a"));
1070+
assertEquals(DRIVE_C + SEP + "", FilenameUtils.normalizeNoEndSeparator("C:/./"));
1071+
assertEquals(DRIVE_C + SEP + "", FilenameUtils.normalizeNoEndSeparator("C:/."));
10701072
assertNull(FilenameUtils.normalizeNoEndSeparator("C:/../a"));
10711073
assertNull(FilenameUtils.normalizeNoEndSeparator("C:/.."));
1072-
assertEquals("C:" + SEP + "", FilenameUtils.normalizeNoEndSeparator("C:/"));
1074+
assertEquals(DRIVE_C + SEP + "", FilenameUtils.normalizeNoEndSeparator("C:/"));
10731075

1074-
assertEquals("C:" + "a", FilenameUtils.normalizeNoEndSeparator("C:a"));
1075-
assertEquals("C:" + "a", FilenameUtils.normalizeNoEndSeparator("C:a/"));
1076-
assertEquals("C:" + "a" + SEP + "c", FilenameUtils.normalizeNoEndSeparator("C:a/b/../c"));
1077-
assertEquals("C:" + "c", FilenameUtils.normalizeNoEndSeparator("C:a/b/../../c"));
1076+
assertEquals(DRIVE_C + "a", FilenameUtils.normalizeNoEndSeparator("C:a"));
1077+
assertEquals(DRIVE_C + "a", FilenameUtils.normalizeNoEndSeparator("C:a/"));
1078+
assertEquals(DRIVE_C + "a" + SEP + "c", FilenameUtils.normalizeNoEndSeparator("C:a/b/../c"));
1079+
assertEquals(DRIVE_C + "c", FilenameUtils.normalizeNoEndSeparator("C:a/b/../../c"));
10781080
assertNull(FilenameUtils.normalizeNoEndSeparator("C:a/b/../../../c"));
1079-
assertEquals("C:" + "a", FilenameUtils.normalizeNoEndSeparator("C:a/b/.."));
1080-
assertEquals("C:" + "", FilenameUtils.normalizeNoEndSeparator("C:a/b/../.."));
1081+
assertEquals(DRIVE_C + "a", FilenameUtils.normalizeNoEndSeparator("C:a/b/.."));
1082+
assertEquals(DRIVE_C + "", FilenameUtils.normalizeNoEndSeparator("C:a/b/../.."));
10811083
assertNull(FilenameUtils.normalizeNoEndSeparator("C:a/b/../../.."));
1082-
assertEquals("C:" + "a" + SEP + "d", FilenameUtils.normalizeNoEndSeparator("C:a/b/../c/../d"));
1083-
assertEquals("C:" + "a" + SEP + "b" + SEP + "d", FilenameUtils.normalizeNoEndSeparator("C:a/b//d"));
1084-
assertEquals("C:" + "a" + SEP + "b", FilenameUtils.normalizeNoEndSeparator("C:a/b/././."));
1085-
assertEquals("C:" + "a", FilenameUtils.normalizeNoEndSeparator("C:./a"));
1086-
assertEquals("C:" + "", FilenameUtils.normalizeNoEndSeparator("C:./"));
1087-
assertEquals("C:" + "", FilenameUtils.normalizeNoEndSeparator("C:."));
1084+
assertEquals(DRIVE_C + "a" + SEP + "d", FilenameUtils.normalizeNoEndSeparator("C:a/b/../c/../d"));
1085+
assertEquals(DRIVE_C + "a" + SEP + "b" + SEP + "d", FilenameUtils.normalizeNoEndSeparator("C:a/b//d"));
1086+
assertEquals(DRIVE_C + "a" + SEP + "b", FilenameUtils.normalizeNoEndSeparator("C:a/b/././."));
1087+
assertEquals(DRIVE_C + "a", FilenameUtils.normalizeNoEndSeparator("C:./a"));
1088+
assertEquals(DRIVE_C + "", FilenameUtils.normalizeNoEndSeparator("C:./"));
1089+
assertEquals(DRIVE_C + "", FilenameUtils.normalizeNoEndSeparator("C:."));
10881090
assertNull(FilenameUtils.normalizeNoEndSeparator("C:../a"));
10891091
assertNull(FilenameUtils.normalizeNoEndSeparator("C:.."));
1090-
assertEquals("C:" + "", FilenameUtils.normalizeNoEndSeparator("C:"));
1092+
assertEquals(DRIVE_C + "", FilenameUtils.normalizeNoEndSeparator(DRIVE_C));
10911093

10921094
assertEquals(SEP + SEP + "server" + SEP + "a", FilenameUtils.normalizeNoEndSeparator("//server/a"));
10931095
assertEquals(SEP + SEP + "server" + SEP + "a", FilenameUtils.normalizeNoEndSeparator("//server/a/"));

0 commit comments

Comments
 (0)