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

Factor out repeated code in EditorBuffer tests

This commit is contained in:
Matthew Gordon 2025-11-27 21:46:53 -04:00
parent 28ce802116
commit ea49d93e14
1 changed files with 34 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,12 @@ mod tests {
use std::io::{Read, Seek, SeekFrom, Write}; use std::io::{Read, Seek, SeekFrom, Write};
use tempfile::NamedTempFile; use tempfile::NamedTempFile;
fn test_command(editor_buffer: EditorBuffer, command: Command) -> EditorBuffer {
let result = editor_buffer.execute(command);
assert!(result.is_ok());
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 +179,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())); let target = 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 +196,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())); let target = test_command(target, Command::OpenFile(test_file.path().into()));
assert!(result.is_ok()); let target = 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))); let target = 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))); let target = 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 +217,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())); let target = test_command(target, Command::OpenFile(test_file.path().into()));
assert!(result.is_ok()); let target = test_command(target, Command::MoveCursorTo(Point::LineColumn(3, 0)));
let target = result.buffer; let target = 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 +239,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())); let target = test_command(target, Command::OpenFile(test_file.path().into()));
assert!(result.is_ok()); let target = test_command(target, Command::MoveCursorTo(Point::LineColumn(3, 1)));
let target = result.buffer; let target = 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 +261,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())); let target = test_command(target, Command::OpenFile(test_file.path().into()));
assert!(result.is_ok()); let target = test_command(target, Command::MoveCursorTo(Point::LineColumn(3, 2)));
let target = result.buffer; let target = 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 +283,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())); let target = test_command(target, Command::OpenFile(test_file.path().into()));
assert!(result.is_ok()); let target = test_command(target, Command::MoveCursorTo(Point::LineColumn(3, 11)));
let target = result.buffer; let target = 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 +308,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())); let target = test_command(target, Command::OpenFile(test_file.path().into()));
assert!(result.is_ok()); let target = test_command(target, Command::MoveCursorToLine(7));
let target = result.buffer; let target = test_command(target, Command::InsertChar('a'));
let result = target.execute(Command::MoveCursorToLine(7)); let target = test_command(target, Command::InsertChar('b'));
assert!(result.is_ok()); let target = test_command(target, Command::InsertChar('c'));
let target = result.buffer; let target = test_command(target, Command::InsertChar(' '));
let result = target.execute(Command::InsertChar('a')); let target = test_command(target, Command::InsertChar('1'));
assert!(result.is_ok()); let target = test_command(target, Command::InsertChar('2'));
let target = result.buffer; let target = test_command(target, Command::InsertChar('3'));
let result = target.execute(Command::InsertChar('b')); let target = 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()