Skip to content

Commit

Permalink
refactor(buffer): use Buffer::assert_eq instead of self.assert_eq
Browse files Browse the repository at this point in the history
  • Loading branch information
@EdJoPaTo
EdJoPaTo committed May 3, 2024
1 parent d21f850 commit 26c73fa
Show file tree
Hide file tree
Showing 38 changed files with 1,419 additions and 1,176 deletions.
348 changes: 198 additions & 150 deletions examples/demo2/big_text.rs
View file

Large diffs are not rendered by default.

184 changes: 106 additions & 78 deletions src/backend/test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ impl TestBackend {
/// If the buffers are not equal, a panic occurs with a detailed error message
/// showing the differences between the expected and actual buffers.
#[track_caller]
#[deprecated = "use self.buffer().assert_eq(&expected)"]
#[deprecated = "use Buffer::assert_eq(backend.buffer(), &expected)"]
pub fn assert_buffer(&self, expected: &Buffer) {
self.buffer.assert_eq(expected);
Buffer::assert_eq(&self.buffer, expected);
}
}

Expand Down Expand Up @@ -360,12 +360,10 @@ mod tests {
backend.draw([(0, 0, &cell)].into_iter()).unwrap();
backend.draw([(0, 1, &cell)].into_iter()).unwrap();
backend.clear().unwrap();
backend.buffer().assert_eq(&Buffer::with_lines([
" ",
" ",
" ",
" ",
]));
Buffer::assert_eq(
backend.buffer(),
&Buffer::with_lines([" ", " ", " ", " "]),
);
}

#[test]
Expand All @@ -380,13 +378,16 @@ mod tests {
]);

backend.clear_region(ClearType::All).unwrap();
backend.buffer().assert_eq(&Buffer::with_lines([
" ",
" ",
" ",
" ",
" ",
]));
Buffer::assert_eq(
backend.buffer(),
&Buffer::with_lines([
" ",
" ",
" ",
" ",
" ",
]),
);
}

#[test]
Expand All @@ -402,13 +403,16 @@ mod tests {

backend.set_cursor(3, 2).unwrap();
backend.clear_region(ClearType::AfterCursor).unwrap();
backend.buffer().assert_eq(&Buffer::with_lines([
"aaaaaaaaaa",
"aaaaaaaaaa",
"aaaa ",
" ",
" ",
]));
Buffer::assert_eq(
backend.buffer(),
&Buffer::with_lines([
"aaaaaaaaaa",
"aaaaaaaaaa",
"aaaa ",
" ",
" ",
]),
);
}

#[test]
Expand All @@ -424,13 +428,16 @@ mod tests {

backend.set_cursor(5, 3).unwrap();
backend.clear_region(ClearType::BeforeCursor).unwrap();
backend.buffer().assert_eq(&Buffer::with_lines([
" ",
" ",
" ",
" aaaaa",
"aaaaaaaaaa",
]));
Buffer::assert_eq(
backend.buffer(),
&Buffer::with_lines([
" ",
" ",
" ",
" aaaaa",
"aaaaaaaaaa",
]),
);
}

#[test]
Expand All @@ -446,13 +453,16 @@ mod tests {

backend.set_cursor(3, 1).unwrap();
backend.clear_region(ClearType::CurrentLine).unwrap();
backend.buffer().assert_eq(&Buffer::with_lines([
"aaaaaaaaaa",
" ",
"aaaaaaaaaa",
"aaaaaaaaaa",
"aaaaaaaaaa",
]));
Buffer::assert_eq(
backend.buffer(),
&Buffer::with_lines([
"aaaaaaaaaa",
" ",
"aaaaaaaaaa",
"aaaaaaaaaa",
"aaaaaaaaaa",
]),
);
}

#[test]
Expand All @@ -468,13 +478,16 @@ mod tests {

backend.set_cursor(3, 0).unwrap();
backend.clear_region(ClearType::UntilNewLine).unwrap();
backend.buffer().assert_eq(&Buffer::with_lines([
"aaa ",
"aaaaaaaaaa",
"aaaaaaaaaa",
"aaaaaaaaaa",
"aaaaaaaaaa",
]));
Buffer::assert_eq(
backend.buffer(),
&Buffer::with_lines([
"aaa ",
"aaaaaaaaaa",
"aaaaaaaaaa",
"aaaaaaaaaa",
"aaaaaaaaaa",
]),
);
}

#[test]
Expand Down Expand Up @@ -506,13 +519,16 @@ mod tests {
assert_eq!(backend.get_cursor().unwrap(), (4, 4));

// As such the buffer should remain unchanged
backend.buffer().assert_eq(&Buffer::with_lines([
"aaaaaaaaaa",
"bbbbbbbbbb",
"cccccccccc",
"dddddddddd",
"eeeeeeeeee",
]));
Buffer::assert_eq(
backend.buffer(),
&Buffer::with_lines([
"aaaaaaaaaa",
"bbbbbbbbbb",
"cccccccccc",
"dddddddddd",
"eeeeeeeeee",
]),
);
}

#[test]
Expand Down Expand Up @@ -565,13 +581,16 @@ mod tests {
assert_eq!(backend.get_cursor().unwrap(), (1, 4));

// As such the buffer should remain unchanged
backend.buffer().assert_eq(&Buffer::with_lines([
"aaaaaaaaaa",
"bbbbbbbbbb",
"cccccccccc",
"dddddddddd",
"eeeeeeeeee",
]));
Buffer::assert_eq(
backend.buffer(),
&Buffer::with_lines([
"aaaaaaaaaa",
"bbbbbbbbbb",
"cccccccccc",
"dddddddddd",
"eeeeeeeeee",
]),
);
}

#[test]
Expand All @@ -590,13 +609,16 @@ mod tests {
backend.append_lines(3).unwrap();
assert_eq!(backend.get_cursor().unwrap(), (1, 4));

backend.buffer().assert_eq(&Buffer::with_lines([
"cccccccccc",
"dddddddddd",
"eeeeeeeeee",
" ",
" ",
]));
Buffer::assert_eq(
backend.buffer(),
&Buffer::with_lines([
"cccccccccc",
"dddddddddd",
"eeeeeeeeee",
" ",
" ",
]),
);
}

#[test]
Expand All @@ -615,13 +637,16 @@ mod tests {
backend.append_lines(5).unwrap();
assert_eq!(backend.get_cursor().unwrap(), (1, 4));

backend.buffer().assert_eq(&Buffer::with_lines([
" ",
" ",
" ",
" ",
" ",
]));
Buffer::assert_eq(
backend.buffer(),
&Buffer::with_lines([
" ",
" ",
" ",
" ",
" ",
]),
);
}

#[test]
Expand All @@ -640,13 +665,16 @@ mod tests {
backend.append_lines(5).unwrap();
assert_eq!(backend.get_cursor().unwrap(), (1, 4));

backend.buffer().assert_eq(&Buffer::with_lines([
"bbbbbbbbbb",
"cccccccccc",
"dddddddddd",
"eeeeeeeeee",
" ",
]));
Buffer::assert_eq(
backend.buffer(),
&Buffer::with_lines([
"bbbbbbbbbb",
"cccccccccc",
"dddddddddd",
"eeeeeeeeee",
" ",
]),
);
}

#[test]
Expand Down
4 changes: 2 additions & 2 deletions src/buffer/assert.rs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/// Assert that two buffers are equal by comparing their areas and content.
///
/// On panic, displays the areas or the content and a diff of the contents.
#[deprecated = "use actual.assert_eq(&expected)"]
#[deprecated = "use Buffer::assert_eq(&actual, &expected)"]
#[macro_export]
macro_rules! assert_buffer_eq {
($actual_expr:expr, $expected_expr:expr) => {
match (&$actual_expr, &$expected_expr) {
(actual, expected) => actual.assert_eq(expected),
(actual, expected) => Buffer::assert_eq(&actual, expected),
}
};
}
Expand Down
Loading

0 comments on commit 26c73fa

Please sign in to comment.