Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4487 : Ms2ger/servo/gfx-test, r=jdm

Browse source 
Note that I had to change some expectations to make them pass.
This commit is contained in:
bors-servo 2014-12-30 09:03:45 -07:00
commit 5d8ec54959
1 changed files with 113 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

213
components/gfx/text/util.rs
View file

@ -144,147 +144,160 @@ fn test_true_type_tag() {
#[test] #[test]
fn test_transform_compress_none() { fn test_transform_compress_none() {
let test_strs = vec!( let test_strs = [
" foo bar", " foo bar",
"foo bar ", "foo bar ",
"foo\n bar", "foo\n bar",
"foo \nbar", "foo \nbar",
" foo bar \nbaz", " foo bar \nbaz",
"foo bar baz", "foo bar baz",
"foobarbaz\n\n" "foobarbaz\n\n",
); ];
let mode = CompressionMode::CompressNone;
for test in test_strs.iter() { let mode = CompressionMode::CompressNone;
let mut new_line_pos = vec!(); for &test in test_strs.iter() {
let mut new_line_pos = vec![];
let mut trimmed_str = String::new(); let mut trimmed_str = String::new();
transform_text(*test, mode, true, &mut trimmed_str, &mut new_line_pos); transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos);
assert_eq!(trimmed_str.as_slice(), *test) assert_eq!(trimmed_str.as_slice(), test)
} }
} }
#[test] #[test]
fn test_transform_discard_newline() { fn test_transform_discard_newline() {
let test_strs = vec!( let test_strs = [
" foo bar", (" foo bar",
"foo bar ", " foo bar"),
"foo\n bar",
"foo \nbar",
" foo bar \nbaz",
"foo bar baz",
"foobarbaz\n\n"
);
let oracle_strs = vec!( ("foo bar ",
" foo bar", "foo bar "),
"foo bar ",
"foo bar", ("foo\n bar",
"foo bar", "foo bar"),
" foo bar baz",
"foo bar baz", ("foo \nbar",
"foobarbaz" "foo bar"),
);
(" foo bar \nbaz",
" foo bar baz"),
("foo bar baz",
"foo bar baz"),
("foobarbaz\n\n",
"foobarbaz"),
];
assert_eq!(test_strs.len(), oracle_strs.len());
let mode = CompressionMode::DiscardNewline; let mode = CompressionMode::DiscardNewline;
for &(test, oracle) in test_strs.iter() {
for (test, oracle) in test_strs.iter().zip(oracle_strs.iter()) { let mut new_line_pos = vec![];
let mut new_line_pos = vec!();
let mut trimmed_str = String::new(); let mut trimmed_str = String::new();
transform_text(*test, mode, true, &mut trimmed_str, &mut new_line_pos); transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos);
assert_eq!(trimmed_str.as_slice(), *oracle) assert_eq!(trimmed_str.as_slice(), oracle)
} }
} }
/* FIXME: Fix and re-enable
#[test] #[test]
fn test_transform_compress_whitespace() { fn test_transform_compress_whitespace() {
let test_strs : ~[String] = ~[" foo bar".into_string(), let test_strs = [
"foo bar ".into_string(), (" foo bar",
"foo\n bar".into_string(), "foo bar"),
"foo \nbar".into_string(),
" foo bar \nbaz".into_string(),
"foo bar baz".into_string(),
"foobarbaz\n\n".into_string()];
let oracle_strs : ~[String] = ~[" foo bar".into_string(), ("foo bar ",
"foo bar ".into_string(), "foo bar "),
"foo\n bar".into_string(),
"foo \nbar".into_string(),
" foo bar \nbaz".into_string(),
"foo bar baz".into_string(),
"foobarbaz\n\n".into_string()];
assert_eq!(test_strs.len(), oracle_strs.len()); ("foo\n bar",
let mode = CompressWhitespace; "foo\n bar"),
for i in range(0, test_strs.len()) { ("foo \nbar",
let mut new_line_pos = ~[]; "foo \nbar"),
let (trimmed_str, _out) = transform_text(test_strs[i], mode, true, &mut new_line_pos);
assert_eq!(&trimmed_str, &oracle_strs[i]) (" foo bar \nbaz",
"foo bar \nbaz"),
("foo bar baz",
"foo bar baz"),
("foobarbaz\n\n",
"foobarbaz\n\n"),
];
let mode = CompressionMode::CompressWhitespace;
for &(test, oracle) in test_strs.iter() {
let mut new_line_pos = vec![];
let mut trimmed_str = String::new();
transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos);
assert_eq!(&*trimmed_str, oracle)
} }
} }
#[test] #[test]
fn test_transform_compress_whitespace_newline() { fn test_transform_compress_whitespace_newline() {
let test_strs : ~[String] = ~[" foo bar".into_string(), let test_strs = vec![
"foo bar ".into_string(), (" foo bar",
"foo\n bar".into_string(), "foo bar"),
"foo \nbar".into_string(),
" foo bar \nbaz".into_string(),
"foo bar baz".into_string(),
"foobarbaz\n\n".into_string()];
let oracle_strs : ~[String] = ~["foo bar".into_string(), ("foo bar ",
"foo bar ".into_string(), "foo bar "),
"foo bar".into_string(),
"foo bar".into_string(), ("foo\n bar",
" foo bar baz".into_string(), "foo bar"),
"foo bar baz".into_string(),
"foobarbaz ".into_string()]; ("foo \nbar",
"foo bar"),
(" foo bar \nbaz",
"foo bar baz"),
("foo bar baz",
"foo bar baz"),
("foobarbaz\n\n",
"foobarbaz "),
];
assert_eq!(test_strs.len(), oracle_strs.len());
let mode = CompressionMode::CompressWhitespaceNewline; let mode = CompressionMode::CompressWhitespaceNewline;
for &(test, oracle) in test_strs.iter() {
for i in range(0, test_strs.len()) { let mut new_line_pos = vec![];
let mut new_line_pos = ~[]; let mut trimmed_str = String::new();
let (trimmed_str, _out) = transform_text(test_strs[i], mode, true, &mut new_line_pos); transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos);
assert_eq!(&trimmed_str, &oracle_strs[i]) assert_eq!(&*trimmed_str, oracle)
} }
} }
*/
#[test] #[test]
fn test_transform_compress_whitespace_newline_no_incoming() { fn test_transform_compress_whitespace_newline_no_incoming() {
let test_strs = vec!( let test_strs = [
" foo bar", (" foo bar",
"\nfoo bar", " foo bar"),
"foo bar ",
"foo\n bar",
"foo \nbar",
" foo bar \nbaz",
"foo bar baz",
"foobarbaz\n\n"
);
let oracle_strs = vec!( ("\nfoo bar",
" foo bar", " foo bar"),
" foo bar",
"foo bar ", ("foo bar ",
"foo bar", "foo bar "),
"foo bar",
" foo bar baz", ("foo\n bar",
"foo bar baz", "foo bar"),
"foobarbaz "
); ("foo \nbar",
"foo bar"),
(" foo bar \nbaz",
" foo bar baz"),
("foo bar baz",
"foo bar baz"),
("foobarbaz\n\n",
"foobarbaz "),
];
assert_eq!(test_strs.len(), oracle_strs.len());
let mode = CompressionMode::CompressWhitespaceNewline; let mode = CompressionMode::CompressWhitespaceNewline;
for &(test, oracle) in test_strs.iter() {
for (test, oracle) in test_strs.iter().zip(oracle_strs.iter()) { let mut new_line_pos = vec![];
let mut new_line_pos = vec!();
let mut trimmed_str = String::new(); let mut trimmed_str = String::new();
transform_text(*test, mode, false, &mut trimmed_str, &mut new_line_pos); transform_text(test, mode, false, &mut trimmed_str, &mut new_line_pos);
assert_eq!(trimmed_str.as_slice(), *oracle) assert_eq!(trimmed_str.as_slice(), oracle)
} }
} }