Skip to content

Commit c9ff13a

Browse files
committed
Fix broken tests caused by path seperator differences
1 parent af0d4e6 commit c9ff13a

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

tests/basic.rs

+13-12
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ fn prints_prompt() -> std::io::Result<()> {
99
terminal.read_from_pty(&mut pty, Some(Duration::from_millis(50)))?;
1010

1111
let text = extract_text(terminal.inner());
12+
#[cfg(not(windows))]
1213
assert_eq!(&text[0][..13], "~/reedline〉");
14+
#[cfg(windows)]
15+
assert_eq!(&text[0][..13], "~\\reedline〉");
1316

1417
Ok(())
1518
}
@@ -27,7 +30,6 @@ fn echos_input() -> std::io::Result<()> {
2730

2831
assert_eq!(&text[0][13..25], "Hello World!");
2932
assert_eq!(&text[1][0..26], "We processed: Hello World!");
30-
assert_eq!(&text[2][0..13], "~/reedline〉");
3133

3234
Ok(())
3335
}
@@ -47,7 +49,6 @@ fn backspace() -> std::io::Result<()> {
4749
let text = extract_text(terminal.inner());
4850
assert_eq!(&text[0][13..25], "Hello Bread!");
4951
assert_eq!(&text[1][0..26], "We processed: Hello Bread!");
50-
assert_eq!(&text[2][0..13], "~/reedline〉");
5152

5253
Ok(())
5354
}
@@ -68,7 +69,7 @@ fn history() -> std::io::Result<()> {
6869
pty.writer().write_all(b"\x1b[A")?;
6970
terminal.read_from_pty(&mut pty, Some(Duration::from_millis(50)))?;
7071
let text = extract_text(terminal.inner());
71-
assert_eq!(&text[4][..21], "~/reedline〉Goodbye!");
72+
assert_eq!(&text[4][13..21], "Goodbye!");
7273

7374
// press Enter to execute it
7475
pty.writer().write_all(b"\r")?;
@@ -80,19 +81,19 @@ fn history() -> std::io::Result<()> {
8081
pty.writer().write_all(b"\x1b[A\x1b[A")?;
8182
terminal.read_from_pty(&mut pty, Some(Duration::from_millis(50)))?;
8283
let text = extract_text(terminal.inner());
83-
assert_eq!(&text[6][..25], "~/reedline〉Hello World!");
84+
assert_eq!(&text[6][13..25], "Hello World!");
8485

8586
// arrow down twice
8687
pty.writer().write_all(b"\x1b[B\x1b[B")?;
8788
terminal.read_from_pty(&mut pty, Some(Duration::from_millis(50)))?;
8889
let text = extract_text(terminal.inner());
89-
assert_eq!(&text[6][..25], "~/reedline〉 ");
90+
assert_eq!(&text[6][13..25], " ");
9091

9192
// type "Hel" then arrow up
9293
pty.writer().write_all(b"Hel\x1b[A")?;
9394
terminal.read_from_pty(&mut pty, Some(Duration::from_millis(50)))?;
9495
let text = extract_text(terminal.inner());
95-
assert_eq!(&text[6][..25], "~/reedline〉Hello World!");
96+
assert_eq!(&text[6][13..25], "Hello World!");
9697

9798
// TODO: not sure how reverse search works in Reedline
9899

@@ -119,7 +120,7 @@ fn word_movement() -> std::io::Result<()> {
119120
terminal.read_from_pty(&mut pty, Some(Duration::from_millis(50)))?;
120121

121122
let text = extract_text(terminal.inner());
122-
assert_eq!(&text[0][..26], "~/reedline〉foo bazar baz");
123+
assert_eq!(&text[0][13..26], "foo bazar baz");
123124
assert_eq!(&text[1][..27], "We processed: foo bazar baz");
124125

125126
Ok(())
@@ -139,7 +140,7 @@ fn clear_screen() -> std::io::Result<()> {
139140
terminal.read_from_pty(&mut pty, Some(Duration::from_millis(50)))?;
140141

141142
let text = extract_text(terminal.inner());
142-
assert_eq!(&text[0][..25], "~/reedline〉Hello again!");
143+
assert_eq!(&text[0][13..25], "Hello again!");
143144

144145
Ok(())
145146
}
@@ -157,25 +158,25 @@ fn emacs_keybinds() -> std::io::Result<()> {
157158
pty.writer().write_all(b"\x1a")?;
158159
terminal.read_from_pty(&mut pty, Some(Duration::from_millis(50)))?;
159160
let text = extract_text(terminal.inner());
160-
assert_eq!(&text[0][..25], "~/reedline〉Hello ");
161+
assert_eq!(&text[0][13..25], "Hello ");
161162

162163
// redo with Ctrl-g
163164
pty.writer().write_all(b"\x07")?;
164165
terminal.read_from_pty(&mut pty, Some(Duration::from_millis(50)))?;
165166
let text = extract_text(terminal.inner());
166-
assert_eq!(&text[0][..25], "~/reedline〉Hello World!");
167+
assert_eq!(&text[0][13..25], "Hello World!");
167168

168169
// delete "World" with alt+left, alt+backspace
169170
pty.writer().write_all(b"\x1b[1;3D\x1b\x7f")?;
170171
terminal.read_from_pty(&mut pty, Some(Duration::from_millis(50)))?;
171172
let text = extract_text(terminal.inner());
172-
assert_eq!(&text[0][..25], "~/reedline〉Hello ! ");
173+
assert_eq!(&text[0][13..25], "Hello ! ");
173174

174175
// make "Hello" ALL CAPS with alt+b, alt+u
175176
pty.writer().write_all(b"\x1bb\x1bu")?;
176177
terminal.read_from_pty(&mut pty, Some(Duration::from_millis(50)))?;
177178
let text = extract_text(terminal.inner());
178-
assert_eq!(&text[0][..25], "~/reedline〉HELLO ! ");
179+
assert_eq!(&text[0][13..25], "HELLO ! ");
179180

180181
Ok(())
181182
}

0 commit comments

Comments
 (0)