Skip to content

Commit 5422dd5

Browse files
oetroetr
committed
TMP: write out test paths explicitly
1 parent be1a252 commit 5422dd5

1 file changed

Lines changed: 47 additions & 60 deletions

File tree

‎sanitizers/src/test/java/com/code_intelligence/jazzer/sanitizers/FilePathTraversalTest.java‎

Lines changed: 47 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -34,97 +34,84 @@
3434

3535
public class FilePathTraversalTest {
3636

37-
static final Path ROOT = Paths.get("/");
38-
static final Path HOME = Paths.get("/home/user1");
39-
static final Path HOME2 = Paths.get("/home/user2");
40-
4137
static Stream<Arguments> pathsToRelative() {
4238
// CWD, target, expectedRelative, expectedAbsolute
4339
return Stream.of(
44-
// /home/user1 + test/A => test/A , /home/user1/test/A
4540
arguments(
46-
HOME,
47-
Paths.get("test", "A"),
48-
Paths.get("test", "A"),
49-
HOME.resolve(Paths.get("test", "A"))),
50-
// /home/user1 + ../A => ../A , /home/A
51-
arguments(HOME, Paths.get("..", "A"), Paths.get("..", "A"), Paths.get("/", "home", "A")),
52-
// / + /../test/me => test/me , /test/me
41+
Paths.get("/home/user1"),
42+
Paths.get("test/A"),
43+
Paths.get("test/A"),
44+
Paths.get("/home/user1/test/A")),
45+
arguments(
46+
Paths.get("/home/user1"), Paths.get("../A"), Paths.get("../A"), Paths.get("/home/A")),
5347
arguments(
54-
ROOT,
55-
ROOT.resolve(Paths.get("..", "test", "me")),
56-
Paths.get("test", "me"),
57-
Paths.get("/", "test", "me")),
58-
// /home/user1 + /test/me => ../../test/me , /home/test/me
48+
Paths.get("/"), Paths.get("/../test/me"), Paths.get("test/me"), Paths.get("/test/me")),
5949
arguments(
60-
HOME,
61-
Paths.get("/", "test", "me"),
62-
Paths.get("..", "..", "test", "me"),
63-
Paths.get("/", "test", "me")),
64-
// /home/user1 + /home/user2/A/B/C => ../user2/A/B/C , /home/user2/A/B/C
50+
Paths.get("/home/user1"),
51+
Paths.get("/test/me"),
52+
Paths.get("../../test/me"),
53+
Paths.get("/test/me")),
6554
arguments(
66-
HOME,
67-
HOME2.resolve(Paths.get("A", "B", "C")),
68-
Paths.get("..", "user2", "A", "B", "C"),
69-
HOME2.resolve(Paths.get("A", "B", "C"))),
70-
// /home/user1/Data + ../A/B/C => ../A/B/C , /home/user1/A/B/C
55+
Paths.get("/home/user1"),
56+
Paths.get("/home/user2/A/B/C"),
57+
Paths.get("../user2/A/B/C"),
58+
Paths.get("/home/user2/A/B/C")),
7159
arguments(
72-
HOME.resolve(Paths.get("Data")),
73-
Paths.get("..", "A", "B", "C"),
74-
Paths.get("..", "A", "B", "C"),
75-
HOME.resolve(Paths.get("A", "B", "C"))));
60+
Paths.get("/home/user1/Data"),
61+
Paths.get("../A/B/C"),
62+
Paths.get("../A/B/C"),
63+
Paths.get("/home/user1/A/B/C")));
7664
}
7765

7866
@ParameterizedTest
7967
@MethodSource("pathsToRelative")
8068
@DisabledOnOs(OS.WINDOWS)
81-
void toRelativeAndAbsolutePath_test(Path cwd, Path target, Path expectedRelative, Path expectedAbsolute) {
69+
void toRelativeAndAbsolutePath_test(
70+
Path cwd, Path target, Path expectedRelative, Path expectedAbsolute) {
8271
assertThat(toRelativePath(target, cwd)).isEqualTo(Optional.of(expectedRelative));
8372
assertThat(toAbsolutePath(target, cwd)).isEqualTo(Optional.of(expectedAbsolute));
8473
assertThat(expectedRelative.isAbsolute()).isFalse();
8574
assertThat(expectedAbsolute.isAbsolute()).isTrue();
8675
}
8776

88-
static final Path ROOT_WIN = Paths.get("C:\\");
89-
static final Path HOME_WIN = Paths.get("C:\\home\\user1");
90-
static final Path HOME2_WIN = Paths.get("C:\\home\\user2");
91-
9277
static Stream<Arguments> pathsToRelativeWin() {
9378
// CWD, target, expectedRelative, expectedAbsolute
9479
return Stream.of(
95-
// /home/user1 + test/A => test/A , /home/user1/test/A
9680
arguments(
97-
HOME_WIN,
81+
Paths.get("C:\\home\\user1"),
9882
Paths.get("test\\A"),
9983
Paths.get("test\\A"),
10084
Paths.get("C:\\home\\user1\\test\\A")),
101-
// /home/user1 + ../A => ../A , /home/A
10285
arguments(
103-
HOME_WIN, Paths.get("..", "A"), Paths.get("..", "A"), Paths.get("C:", "home", "A")),
104-
// / + /../test/me => test/me , /test/me
86+
Paths.get("C:\\home\\user1"),
87+
Paths.get("..\\A"),
88+
Paths.get("..\\A"),
89+
Paths.get("C:\\home\\A")),
90+
arguments(
91+
Paths.get("C:\\"),
92+
Paths.get("C:\\test\\me"),
93+
Paths.get("test\\me"),
94+
Paths.get("C:\\test\\me")),
10595
arguments(
106-
ROOT_WIN,
107-
ROOT.resolve(Paths.get("..", "test", "me")),
108-
Paths.get("test", "me"),
109-
Paths.get("/", "test", "me")),
110-
// /home/user1 + /test/me => ../../test/me , /home/test/me
96+
Paths.get("C:\\home\\user1"),
97+
Paths.get("C:\\test\\me"),
98+
Paths.get("..\\..\\test\\me"),
99+
Paths.get("C:\\test\\me")),
111100
arguments(
112-
HOME_WIN,
113-
Paths.get("/", "test", "me"),
114-
Paths.get("..", "..", "test", "me"),
115-
Paths.get("/", "test", "me")),
116-
// /home/user1 + /home/user2/A/B/C => ../user2/A/B/C , /home/user2/A/B/C
101+
Paths.get("C:\\home\\user1"),
102+
Paths.get("C:\\home\\user2\\A\\B\\C"),
103+
Paths.get("..\\user2\\A\\B\\C"),
104+
Paths.get("C:\\home\\user2\\A\\B\\C")),
117105
arguments(
118-
HOME_WIN,
119-
HOME2_WIN.resolve(Paths.get("A", "B", "C")),
120-
Paths.get("..", "user2", "A", "B", "C"),
121-
HOME2_WIN.resolve(Paths.get("A", "B", "C"))),
122-
// /home/user1/Data + ../A/B/C => ../A/B/C , /home/user1/A/B/C
106+
Paths.get("C:\\home\\user1\\Data"),
107+
Paths.get("..\\A\\B\\C"),
108+
Paths.get("..\\A\\B\\C"),
109+
Paths.get("C:\\A\\B\\C")),
123110
arguments(
124-
HOME_WIN.resolve(Paths.get("Data")),
125-
Paths.get("..", "A", "B", "C"),
126-
Paths.get("..", "A", "B", "C"),
127-
HOME_WIN.resolve(Paths.get("A", "B", "C"))));
111+
Paths.get("C:\\home\\user1"),
112+
Paths.get("D:\\A\\B\\C"),
113+
null,
114+
Paths.get("C:\\A\\B\\C")));
128115
}
129116

130117
@ParameterizedTest

0 commit comments

Comments
 (0)