Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-24 00:54:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use Vec in transform_text tests.

Browse source
This commit is contained in:
Ms2ger 2014-05-06 20:32:20 +02:00
parent 2d3ed83ba6
commit b38066a541
1 changed files with 56 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

104
src/components/gfx/text/util.rs
View file

@ -138,49 +138,53 @@ fn test_true_type_tag() {
#[test] #[test]
fn test_transform_compress_none() { fn test_transform_compress_none() {
let test_strs = vec!(
let test_strs : ~[~str] = ~[" foo bar".to_owned(), " foo bar",
"foo bar ".to_owned(), "foo bar ",
"foo\n bar".to_owned(), "foo\n bar",
"foo \nbar".to_owned(), "foo \nbar",
" foo bar \nbaz".to_owned(), " foo bar \nbaz",
"foo bar baz".to_owned(), "foo bar baz",
"foobarbaz\n\n".to_owned()]; "foobarbaz\n\n"
);
let mode = CompressNone; let mode = CompressNone;
for i in range(0, test_strs.len()) { for test in test_strs.iter() {
let mut new_line_pos = vec!(); let mut new_line_pos = vec!();
let (trimmed_str, _out) = transform_text(test_strs[i], mode, true, &mut new_line_pos); let (trimmed_str, _out) = transform_text(*test, mode, true, &mut new_line_pos);
assert_eq!(&trimmed_str, &test_strs[i]) assert_eq!(trimmed_str.as_slice(), *test)
} }
} }
#[test] #[test]
fn test_transform_discard_newline() { fn test_transform_discard_newline() {
let test_strs = vec!(
" foo bar",
"foo bar ",
"foo\n bar",
"foo \nbar",
" foo bar \nbaz",
"foo bar baz",
"foobarbaz\n\n"
);
let test_strs : ~[~str] = ~[" foo bar".to_owned(), let oracle_strs = vec!(
"foo bar ".to_owned(), " foo bar",
"foo\n bar".to_owned(), "foo bar ",
"foo \nbar".to_owned(), "foo bar",
" foo bar \nbaz".to_owned(), "foo bar",
"foo bar baz".to_owned(), " foo bar baz",
"foobarbaz\n\n".to_owned()]; "foo bar baz",
"foobarbaz"
let oracle_strs : ~[~str] = ~[" foo bar".to_owned(), );
"foo bar ".to_owned(),
"foo bar".to_owned(),
"foo bar".to_owned(),
" foo bar baz".to_owned(),
"foo bar baz".to_owned(),
"foobarbaz".to_owned()];
assert_eq!(test_strs.len(), oracle_strs.len()); assert_eq!(test_strs.len(), oracle_strs.len());
let mode = DiscardNewline; let mode = DiscardNewline;
for i in range(0, test_strs.len()) { for (test, oracle) in test_strs.iter().zip(oracle_strs.iter()) {
let mut new_line_pos = vec!(); let mut new_line_pos = vec!();
let (trimmed_str, _out) = transform_text(test_strs[i], mode, true, &mut new_line_pos); let (trimmed_str, _out) = transform_text(*test, mode, true, &mut new_line_pos);
assert_eq!(&trimmed_str, &oracle_strs[i]) assert_eq!(trimmed_str.as_slice(), *oracle)
} }
} }
@ -244,30 +248,34 @@ fn test_transform_compress_whitespace_newline() {
#[test] #[test]
fn test_transform_compress_whitespace_newline_no_incoming() { fn test_transform_compress_whitespace_newline_no_incoming() {
let test_strs : ~[~str] = ~[" foo bar".to_owned(), let test_strs = vec!(
"\nfoo bar".to_owned(), " foo bar",
"foo bar ".to_owned(), "\nfoo bar",
"foo\n bar".to_owned(), "foo bar ",
"foo \nbar".to_owned(), "foo\n bar",
" foo bar \nbaz".to_owned(), "foo \nbar",
"foo bar baz".to_owned(), " foo bar \nbaz",
"foobarbaz\n\n".to_owned()]; "foo bar baz",
"foobarbaz\n\n"
);
let oracle_strs : ~[~str] = ~[" foo bar".to_owned(), let oracle_strs = vec!(
" foo bar".to_owned(), " foo bar",
"foo bar ".to_owned(), " foo bar",
"foo bar".to_owned(), "foo bar ",
"foo bar".to_owned(), "foo bar",
" foo bar baz".to_owned(), "foo bar",
"foo bar baz".to_owned(), " foo bar baz",
"foobarbaz ".to_owned()]; "foo bar baz",
"foobarbaz "
);
assert_eq!(test_strs.len(), oracle_strs.len()); assert_eq!(test_strs.len(), oracle_strs.len());
let mode = CompressWhitespaceNewline; let mode = CompressWhitespaceNewline;
for i in range(0, test_strs.len()) { for (test, oracle) in test_strs.iter().zip(oracle_strs.iter()) {
let mut new_line_pos = vec!(); let mut new_line_pos = vec!();
let (trimmed_str, _out) = transform_text(test_strs[i], mode, false, &mut new_line_pos); let (trimmed_str, _out) = transform_text(*test, mode, false, &mut new_line_pos);
assert_eq!(&trimmed_str, &oracle_strs[i]) assert_eq!(trimmed_str.as_slice(), *oracle)
} }
} }