matthew
/
ged
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: matthew:28ce80211681c7a9c4ae8301523ebe6e6b76455a
Branches Tags
matthew:main
..
compare: matthew:98143ddc55a33c2ac2015521dae1086f9fa1bcc7
Branches Tags
matthew:main

2 Commits
28ce802116 ... 98143ddc55

Author SHA1 Message Date
Matthew Gordon 98143ddc55 More test refactoring 2025-11-27 22:39:22 -04:00
Matthew Gordon ea49d93e14 Factor out repeated code in EditorBuffer tests 2025-11-27 21:46:53 -04:00
1 changed files with 36 additions and 80 deletions
Show Stats Expand all files Collapse all files

116
core/src/editor_buffer/mod.rs
View File

@ -142,6 +142,14 @@ mod tests {
use std::io::{Read, Seek, SeekFrom, Write}; use std::io::{Read, Seek, SeekFrom, Write};
use tempfile::NamedTempFile; use tempfile::NamedTempFile;
macro_rules! test_command {
( $editor_buffer:ident, $command:expr ) => {
let result = $editor_buffer.execute($command);
assert!(result.is_ok());
let $editor_buffer = result.buffer;
}
}
fn create_simple_test_file() -> NamedTempFile { fn create_simple_test_file() -> NamedTempFile {
let inner = || { let inner = || {
let mut file = NamedTempFile::new()?; let mut file = NamedTempFile::new()?;
@ -173,8 +181,8 @@ mod tests {
.read_to_string(&mut expected_contents) .read_to_string(&mut expected_contents)
.expect("Reading text file"); .expect("Reading text file");
let target = EditorBuffer::new(); let target = EditorBuffer::new();
let result = target.execute(Command::OpenFile(test_file.path().into())); test_command!(target, Command::OpenFile(test_file.path().into()));
let found_contents: String = result.buffer.buffer.iter_chars().collect(); let found_contents: String = target.buffer.iter_chars().collect();
assert_eq!(expected_contents, found_contents); assert_eq!(expected_contents, found_contents);
} }
@ -190,20 +198,12 @@ mod tests {
fn move_cursor_to_point_in_file() { fn move_cursor_to_point_in_file() {
let test_file = create_simple_test_file(); let test_file = create_simple_test_file();
let target = EditorBuffer::new(); let target = EditorBuffer::new();
let result = target.execute(Command::OpenFile(test_file.path().into())); test_command!(target, Command::OpenFile(test_file.path().into()));
assert!(result.is_ok()); test_command!(target, Command::MoveCursorTo(Point::LineColumn(0, 5)));
let target = result.buffer;
let result = target.execute(Command::MoveCursorTo(Point::LineColumn(0, 5)));
assert!(result.is_ok());
let target = result.buffer;
assert_eq!(Point::LineColumn(0, 5), target.get_cursor_position()); assert_eq!(Point::LineColumn(0, 5), target.get_cursor_position());
let result = target.execute(Command::MoveCursorTo(Point::LineColumn(3, 11))); test_command!(target, Command::MoveCursorTo(Point::LineColumn(3, 11)));
assert!(result.is_ok());
let target = result.buffer;
assert_eq!(Point::LineColumn(3, 11), target.get_cursor_position()); assert_eq!(Point::LineColumn(3, 11), target.get_cursor_position());
let result = target.execute(Command::MoveCursorTo(Point::LineColumn(3, 0))); test_command!(target, Command::MoveCursorTo(Point::LineColumn(3, 0)));
assert!(result.is_ok());
let target = result.buffer;
assert_eq!(Point::LineColumn(3, 0), target.get_cursor_position()); assert_eq!(Point::LineColumn(3, 0), target.get_cursor_position());
} }
@ -219,15 +219,9 @@ mod tests {
expected_lines[2] = "Xbíth a menmasam fri seilgg"; expected_lines[2] = "Xbíth a menmasam fri seilgg";
let expected_lines = expected_lines; let expected_lines = expected_lines;
let target = EditorBuffer::new(); let target = EditorBuffer::new();
let result = target.execute(Command::OpenFile(test_file.path().into())); test_command!(target, Command::OpenFile(test_file.path().into()));
assert!(result.is_ok()); test_command!(target, Command::MoveCursorTo(Point::LineColumn(3, 0)));
let target = result.buffer; test_command!(target, Command::InsertChar('X'));
let result = target.execute(Command::MoveCursorTo(Point::LineColumn(3, 0)));
assert!(result.is_ok());
let target = result.buffer;
let result = target.execute(Command::InsertChar('X'));
assert!(result.is_ok());
let target = result.buffer;
let found_lines: Vec<String> = target let found_lines: Vec<String> = target
.buffer .buffer
.iter_chars() .iter_chars()
@ -247,15 +241,9 @@ mod tests {
expected_lines[2] = "bXíth a menmasam fri seilgg"; expected_lines[2] = "bXíth a menmasam fri seilgg";
let expected_lines = expected_lines; let expected_lines = expected_lines;
let target = EditorBuffer::new(); let target = EditorBuffer::new();
let result = target.execute(Command::OpenFile(test_file.path().into())); test_command!(target, Command::OpenFile(test_file.path().into()));
assert!(result.is_ok()); test_command!(target, Command::MoveCursorTo(Point::LineColumn(3, 1)));
let target = result.buffer; test_command!(target, Command::InsertChar('X'));
let result = target.execute(Command::MoveCursorTo(Point::LineColumn(3, 1)));
assert!(result.is_ok());
let target = result.buffer;
let result = target.execute(Command::InsertChar('X'));
assert!(result.is_ok());
let target = result.buffer;
let found_lines: Vec<String> = target let found_lines: Vec<String> = target
.buffer .buffer
.iter_chars() .iter_chars()
@ -275,15 +263,9 @@ mod tests {
expected_lines[2] = "bíXth a menmasam fri seilgg"; expected_lines[2] = "bíXth a menmasam fri seilgg";
let expected_lines = expected_lines; let expected_lines = expected_lines;
let target = EditorBuffer::new(); let target = EditorBuffer::new();
let result = target.execute(Command::OpenFile(test_file.path().into())); test_command!(target, Command::OpenFile(test_file.path().into()));
assert!(result.is_ok()); test_command!(target, Command::MoveCursorTo(Point::LineColumn(3, 2)));
let target = result.buffer; test_command!(target, Command::InsertChar('X'));
let result = target.execute(Command::MoveCursorTo(Point::LineColumn(3, 2)));
assert!(result.is_ok());
let target = result.buffer;
let result = target.execute(Command::InsertChar('X'));
assert!(result.is_ok());
let target = result.buffer;
let found_lines: Vec<String> = target let found_lines: Vec<String> = target
.buffer .buffer
.iter_chars() .iter_chars()
@ -303,15 +285,9 @@ mod tests {
expected_lines[2] = "bíth a menmXasam fri seilgg"; expected_lines[2] = "bíth a menmXasam fri seilgg";
let expected_lines = expected_lines; let expected_lines = expected_lines;
let target = EditorBuffer::new(); let target = EditorBuffer::new();
let result = target.execute(Command::OpenFile(test_file.path().into())); test_command!(target, Command::OpenFile(test_file.path().into()));
assert!(result.is_ok()); test_command!(target, Command::MoveCursorTo(Point::LineColumn(3, 11)));
let target = result.buffer; test_command!(target, Command::InsertChar('X'));
let result = target.execute(Command::MoveCursorTo(Point::LineColumn(3, 11)));
assert!(result.is_ok());
let target = result.buffer;
let result = target.execute(Command::InsertChar('X'));
assert!(result.is_ok());
let target = result.buffer;
let found_lines: Vec<String> = target let found_lines: Vec<String> = target
.buffer .buffer
.iter_chars() .iter_chars()
@ -334,36 +310,16 @@ mod tests {
expected_lines.insert(6, "abc 123".into()); expected_lines.insert(6, "abc 123".into());
let target = EditorBuffer::new(); let target = EditorBuffer::new();
let result = target.execute(Command::OpenFile(test_file.path().into())); test_command!(target, Command::OpenFile(test_file.path().into()));
assert!(result.is_ok()); test_command!(target, Command::MoveCursorToLine(7));
let target = result.buffer; test_command!(target, Command::InsertChar('a'));
let result = target.execute(Command::MoveCursorToLine(7)); test_command!(target, Command::InsertChar('b'));
assert!(result.is_ok()); test_command!(target, Command::InsertChar('c'));
let target = result.buffer; test_command!(target, Command::InsertChar(' '));
let result = target.execute(Command::InsertChar('a')); test_command!(target, Command::InsertChar('1'));
assert!(result.is_ok()); test_command!(target, Command::InsertChar('2'));
let target = result.buffer; test_command!(target, Command::InsertChar('3'));
let result = target.execute(Command::InsertChar('b')); test_command!(target, Command::InsertChar('\n'));
assert!(result.is_ok());
let target = result.buffer;
let result = target.execute(Command::InsertChar('c'));
assert!(result.is_ok());
let target = result.buffer;
let result = target.execute(Command::InsertChar(' '));
assert!(result.is_ok());
let target = result.buffer;
let result = target.execute(Command::InsertChar('1'));
assert!(result.is_ok());
let target = result.buffer;
let result = target.execute(Command::InsertChar('2'));
assert!(result.is_ok());
let target = result.buffer;
let result = target.execute(Command::InsertChar('3'));
assert!(result.is_ok());
let target = result.buffer;
let result = target.execute(Command::InsertChar('\n'));
assert!(result.is_ok());
let target = result.buffer;
let found_lines: Vec<String> = target let found_lines: Vec<String> = target
.buffer .buffer
.iter_chars() .iter_chars()