cessen/led
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fully updated unit tests. All passing again.

Browse Source
This commit is contained in:
Nathan Vegdahl 2015-01-25 13:28:04 -08:00
parent 0557f5f6ce
commit 352e5370ce
2 changed files with 25 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/buffer/line.rs
View File

@ -761,34 +761,6 @@ mod tests {
assert!(tl2.ending == LineEnding::CRLF);
}
#[test]
fn grapheme_index_to_closest_vis_pos_1() {
let tl = Line::new_from_str("Hello!");
assert!(tl.grapheme_index_to_closest_vis_pos(0, TAB_WIDTH) == 0);
}
#[test]
fn grapheme_index_to_closest_vis_pos_2() {
let tl = Line::new_from_str("\tHello!");
assert!(tl.grapheme_index_to_closest_vis_pos(1, TAB_WIDTH) == TAB_WIDTH);
}
#[test]
fn vis_pos_to_closest_grapheme_index_1() {
let tl = Line::new_from_str("Hello!");
assert!(tl.vis_pos_to_closest_grapheme_index(0, TAB_WIDTH) == 0);
}
#[test]
fn vis_pos_to_closest_grapheme_index_2() {
let tl = Line::new_from_str("\tHello!");
assert!(tl.vis_pos_to_closest_grapheme_index(TAB_WIDTH, TAB_WIDTH) == 1);
}
//=========================================================================
// LineGraphemeIter tests

43
src/buffer/node.rs
View File

@ -976,16 +976,18 @@ impl<'a> Iterator for BufferNodeLineIter<'a> {
mod tests {
use super::BufferNode;
use super::super::line::LineEnding;
use super::super::line_formatter::TestLineFormatter;
#[test]
fn merge_line_with_next_recursive_1() {
let mut node = BufferNode::new();
node.insert_text("Hi\n there!", 0);
let f = TestLineFormatter::new();
let mut node = BufferNode::new(&f);
node.insert_text(&f, "Hi\n there!", 0);
assert!(node.grapheme_count == 10);
assert!(node.line_count == 2);
node.merge_line_with_next_recursive(0, None);
node.merge_line_with_next_recursive(&f, 0, None);
let mut iter = node.grapheme_iter();
@ -1006,13 +1008,14 @@ mod tests {
#[test]
fn merge_line_with_next_recursive_2() {
let mut node = BufferNode::new();
node.insert_text("Hi\n there\n people \nof the\n world!", 0);
let f = TestLineFormatter::new();
let mut node = BufferNode::new(&f);
node.insert_text(&f, "Hi\n there\n people \nof the\n world!", 0);
assert!(node.grapheme_count == 33);
assert!(node.line_count == 5);
node.merge_line_with_next_recursive(2, None);
node.merge_line_with_next_recursive(&f, 2, None);
let mut iter = node.grapheme_iter();
@ -1056,13 +1059,14 @@ mod tests {
#[test]
fn merge_line_with_next_recursive_3() {
let mut node = BufferNode::new();
node.insert_text("Hi\n there\n people \nof the\n world!", 0);
let f = TestLineFormatter::new();
let mut node = BufferNode::new(&f);
node.insert_text(&f, "Hi\n there\n people \nof the\n world!", 0);
assert!(node.grapheme_count == 33);
assert!(node.line_count == 5);
node.merge_line_with_next_recursive(0, None);
node.merge_line_with_next_recursive(&f, 0, None);
let mut iter = node.grapheme_iter();
@ -1106,13 +1110,14 @@ mod tests {
#[test]
fn pull_out_line_recursive_1() {
let mut node = BufferNode::new();
node.insert_text("Hi\n there\n people \nof the\n world!", 0);
let f = TestLineFormatter::new();
let mut node = BufferNode::new(&f);
node.insert_text(&f, "Hi\n there\n people \nof the\n world!", 0);
assert!(node.grapheme_count == 33);
assert!(node.line_count == 5);
let line = node.pull_out_line_recursive(0).unwrap();
let line = node.pull_out_line_recursive(&f, 0).unwrap();
assert!(line.as_str() == "Hi");
assert!(line.ending == LineEnding::LF);
@ -1156,13 +1161,14 @@ mod tests {
#[test]
fn pull_out_line_recursive_2() {
let mut node = BufferNode::new();
node.insert_text("Hi\n there\n people \nof the\n world!", 0);
let f = TestLineFormatter::new();
let mut node = BufferNode::new(&f);
node.insert_text(&f, "Hi\n there\n people \nof the\n world!", 0);
assert!(node.grapheme_count == 33);
assert!(node.line_count == 5);
let line = node.pull_out_line_recursive(2).unwrap();
let line = node.pull_out_line_recursive(&f, 2).unwrap();
assert!(line.as_str() == " people ");
assert!(line.ending == LineEnding::LF);
@ -1200,13 +1206,14 @@ mod tests {
#[test]
fn pull_out_line_recursive_3() {
let mut node = BufferNode::new();
node.insert_text("Hi\n there\n people \nof the\n world!", 0);
let f = TestLineFormatter::new();
let mut node = BufferNode::new(&f);
node.insert_text(&f, "Hi\n there\n people \nof the\n world!", 0);
assert!(node.grapheme_count == 33);
assert!(node.line_count == 5);
let line = node.pull_out_line_recursive(4).unwrap();
let line = node.pull_out_line_recursive(&f, 4).unwrap();
assert!(line.as_str() == " world!");
assert!(line.ending == LineEnding::None);