From aa18c84f0c73bd67774a091087f963db8aa57d20 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sat, 27 Dec 2014 14:47:44 +0100 Subject: [PATCH 1/3] Re-enable two transform_text unit tests. Note that I had to change some expectations to make them pass. --- components/gfx/text/util.rs | 86 ++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/components/gfx/text/util.rs b/components/gfx/text/util.rs index d39119935d7..67c17c2a066 100644 --- a/components/gfx/text/util.rs +++ b/components/gfx/text/util.rs @@ -196,63 +196,71 @@ fn test_transform_discard_newline() { } } -/* FIXME: Fix and re-enable #[test] fn test_transform_compress_whitespace() { - let test_strs : ~[String] = ~[" foo bar".into_string(), - "foo bar ".into_string(), - "foo\n bar".into_string(), - "foo \nbar".into_string(), - " foo bar \nbaz".into_string(), - "foo bar baz".into_string(), - "foobarbaz\n\n".into_string()]; + let test_strs = vec![ + " foo bar", + "foo bar ", + "foo\n bar", + "foo \nbar", + " foo bar \nbaz", + "foo bar baz", + "foobarbaz\n\n", + ]; - let oracle_strs : ~[String] = ~[" foo bar".into_string(), - "foo bar ".into_string(), - "foo\n bar".into_string(), - "foo \nbar".into_string(), - " foo bar \nbaz".into_string(), - "foo bar baz".into_string(), - "foobarbaz\n\n".into_string()]; + let oracle_strs = vec![ + "foo bar", + "foo bar ", + "foo\n bar", + "foo \nbar", + "foo bar \nbaz", + "foo bar baz", + "foobarbaz\n\n", + ]; assert_eq!(test_strs.len(), oracle_strs.len()); - let mode = CompressWhitespace; + let mode = CompressionMode::CompressWhitespace; - for i in range(0, test_strs.len()) { - let mut new_line_pos = ~[]; - let (trimmed_str, _out) = transform_text(test_strs[i], mode, true, &mut new_line_pos); - assert_eq!(&trimmed_str, &oracle_strs[i]) + for (test, oracle) in test_strs.iter().zip(oracle_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] fn test_transform_compress_whitespace_newline() { - let test_strs : ~[String] = ~[" foo bar".into_string(), - "foo bar ".into_string(), - "foo\n bar".into_string(), - "foo \nbar".into_string(), - " foo bar \nbaz".into_string(), - "foo bar baz".into_string(), - "foobarbaz\n\n".into_string()]; + let test_strs = vec![ + " foo bar", + "foo bar ", + "foo\n bar", + "foo \nbar", + " foo bar \nbaz", + "foo bar baz", + "foobarbaz\n\n" + ]; - let oracle_strs : ~[String] = ~["foo bar".into_string(), - "foo bar ".into_string(), - "foo bar".into_string(), - "foo bar".into_string(), - " foo bar baz".into_string(), - "foo bar baz".into_string(), - "foobarbaz ".into_string()]; + let oracle_strs = vec![ + "foo bar", + "foo bar ", + "foo bar", + "foo bar", + "foo bar baz", + "foo bar baz", + "foobarbaz " + ]; assert_eq!(test_strs.len(), oracle_strs.len()); let mode = CompressionMode::CompressWhitespaceNewline; - for i in range(0, test_strs.len()) { - let mut new_line_pos = ~[]; - let (trimmed_str, _out) = transform_text(test_strs[i], mode, true, &mut new_line_pos); - assert_eq!(&trimmed_str, &oracle_strs[i]) + for (test, oracle) in test_strs.iter().zip(oracle_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] fn test_transform_compress_whitespace_newline_no_incoming() { From 767d0e11bfbbb405c9ae49902e8aef3c57b1ec9d Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sun, 28 Dec 2014 11:27:55 +0100 Subject: [PATCH 2/3] Cleanup the transform_text tests. --- components/gfx/text/util.rs | 161 +++++++++++++----------------------- 1 file changed, 56 insertions(+), 105 deletions(-) diff --git a/components/gfx/text/util.rs b/components/gfx/text/util.rs index 67c17c2a066..a5892a88bf3 100644 --- a/components/gfx/text/util.rs +++ b/components/gfx/text/util.rs @@ -144,155 +144,106 @@ fn test_true_type_tag() { #[test] fn test_transform_compress_none() { - let test_strs = vec!( + let test_strs = [ " foo bar", "foo bar ", "foo\n bar", "foo \nbar", " foo bar \nbaz", "foo bar baz", - "foobarbaz\n\n" - ); - let mode = CompressionMode::CompressNone; + "foobarbaz\n\n", + ]; - for test in test_strs.iter() { - let mut new_line_pos = vec!(); + let mode = CompressionMode::CompressNone; + for &test 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.as_slice(), *test) + transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos); + assert_eq!(trimmed_str.as_slice(), test) } } #[test] 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 = [ + (" foo bar", " foo bar"), + ("foo bar ", "foo bar "), + ("foo\n bar", "foo bar"), + ("foo \nbar", "foo bar"), + (" foo bar \nbaz", " foo bar baz"), + ("foo bar baz", "foo bar baz"), + ("foobarbaz\n\n", "foobarbaz"), + ]; - let oracle_strs = vec!( - " foo bar", - "foo bar ", - "foo bar", - "foo bar", - " foo bar baz", - "foo bar baz", - "foobarbaz" - ); - - assert_eq!(test_strs.len(), oracle_strs.len()); let mode = CompressionMode::DiscardNewline; - - for (test, oracle) in test_strs.iter().zip(oracle_strs.iter()) { - let mut new_line_pos = vec!(); + 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.as_slice(), *oracle) + transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos); + assert_eq!(trimmed_str.as_slice(), oracle) } } #[test] fn test_transform_compress_whitespace() { - 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 = [ + (" 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 oracle_strs = vec![ - "foo bar", - "foo bar ", - "foo\n bar", - "foo \nbar", - "foo bar \nbaz", - "foo bar baz", - "foobarbaz\n\n", - ]; - - assert_eq!(test_strs.len(), oracle_strs.len()); let mode = CompressionMode::CompressWhitespace; - - for (test, oracle) in test_strs.iter().zip(oracle_strs.iter()) { + 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) + transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos); + assert_eq!(&*trimmed_str, oracle) } } #[test] fn test_transform_compress_whitespace_newline() { let test_strs = vec![ - " foo bar", - "foo bar ", - "foo\n bar", - "foo \nbar", - " foo bar \nbaz", - "foo bar baz", - "foobarbaz\n\n" + (" foo bar", "foo bar"), + ("foo bar ", "foo bar "), + ("foo\n bar", "foo bar"), + ("foo \nbar", "foo bar"), + (" foo bar \nbaz", "foo bar baz"), + ("foo bar baz", "foo bar baz"), + ("foobarbaz\n\n", "foobarbaz "), ]; - let oracle_strs = vec![ - "foo bar", - "foo bar ", - "foo bar", - "foo bar", - "foo bar baz", - "foo bar baz", - "foobarbaz " - ]; - - assert_eq!(test_strs.len(), oracle_strs.len()); let mode = CompressionMode::CompressWhitespaceNewline; - - for (test, oracle) in test_strs.iter().zip(oracle_strs.iter()) { + 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) + transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos); + assert_eq!(&*trimmed_str, oracle) } } #[test] fn test_transform_compress_whitespace_newline_no_incoming() { - let test_strs = vec!( - " foo bar", - "\nfoo bar", - "foo bar ", - "foo\n bar", - "foo \nbar", - " foo bar \nbaz", - "foo bar baz", - "foobarbaz\n\n" - ); + let test_strs = [ + (" foo bar", " foo bar"), + ("\nfoo bar", " foo bar"), + ("foo bar ", "foo bar "), + ("foo\n bar", "foo bar"), + ("foo \nbar", "foo bar"), + (" foo bar \nbaz", " foo bar baz"), + ("foo bar baz", "foo bar baz"), + ("foobarbaz\n\n", "foobarbaz "), + ]; - let oracle_strs = vec!( - " foo bar", - " foo bar", - "foo bar ", - "foo bar", - "foo bar", - " foo bar baz", - "foo bar baz", - "foobarbaz " - ); - - assert_eq!(test_strs.len(), oracle_strs.len()); let mode = CompressionMode::CompressWhitespaceNewline; - - for (test, oracle) in test_strs.iter().zip(oracle_strs.iter()) { - let mut new_line_pos = vec!(); + for &(test, oracle) in test_strs.iter() { + let mut new_line_pos = vec![]; let mut trimmed_str = String::new(); - transform_text(*test, mode, false, &mut trimmed_str, &mut new_line_pos); - assert_eq!(trimmed_str.as_slice(), *oracle) + transform_text(test, mode, false, &mut trimmed_str, &mut new_line_pos); + assert_eq!(trimmed_str.as_slice(), oracle) } } From 67eafea8ef1f82ea6d4efd644aebfcf445ad11c9 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 30 Dec 2014 10:11:40 +0100 Subject: [PATCH 3/3] Reformat the transform_text tests. --- components/gfx/text/util.rs | 112 ++++++++++++++++++++++++++---------- 1 file changed, 83 insertions(+), 29 deletions(-) diff --git a/components/gfx/text/util.rs b/components/gfx/text/util.rs index a5892a88bf3..9fc60084d5c 100644 --- a/components/gfx/text/util.rs +++ b/components/gfx/text/util.rs @@ -166,13 +166,26 @@ fn test_transform_compress_none() { #[test] fn test_transform_discard_newline() { let test_strs = [ - (" foo bar", " foo bar"), - ("foo bar ", "foo bar "), - ("foo\n bar", "foo bar"), - ("foo \nbar", "foo bar"), - (" foo bar \nbaz", " foo bar baz"), - ("foo bar baz", "foo bar baz"), - ("foobarbaz\n\n", "foobarbaz"), + (" foo bar", + " foo bar"), + + ("foo bar ", + "foo bar "), + + ("foo\n bar", + "foo bar"), + + ("foo \nbar", + "foo bar"), + + (" foo bar \nbaz", + " foo bar baz"), + + ("foo bar baz", + "foo bar baz"), + + ("foobarbaz\n\n", + "foobarbaz"), ]; let mode = CompressionMode::DiscardNewline; @@ -187,13 +200,26 @@ fn test_transform_discard_newline() { #[test] fn test_transform_compress_whitespace() { 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"), + (" 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::CompressWhitespace; @@ -208,13 +234,26 @@ fn test_transform_compress_whitespace() { #[test] fn test_transform_compress_whitespace_newline() { let test_strs = vec![ - (" foo bar", "foo bar"), - ("foo bar ", "foo bar "), - ("foo\n bar", "foo bar"), - ("foo \nbar", "foo bar"), - (" foo bar \nbaz", "foo bar baz"), - ("foo bar baz", "foo bar baz"), - ("foobarbaz\n\n", "foobarbaz "), + (" foo bar", + "foo bar"), + + ("foo bar ", + "foo bar "), + + ("foo\n bar", + "foo bar"), + + ("foo \nbar", + "foo bar"), + + (" foo bar \nbaz", + "foo bar baz"), + + ("foo bar baz", + "foo bar baz"), + + ("foobarbaz\n\n", + "foobarbaz "), ]; let mode = CompressionMode::CompressWhitespaceNewline; @@ -229,14 +268,29 @@ fn test_transform_compress_whitespace_newline() { #[test] fn test_transform_compress_whitespace_newline_no_incoming() { let test_strs = [ - (" foo bar", " foo bar"), - ("\nfoo bar", " foo bar"), - ("foo bar ", "foo bar "), - ("foo\n bar", "foo bar"), - ("foo \nbar", "foo bar"), - (" foo bar \nbaz", " foo bar baz"), - ("foo bar baz", "foo bar baz"), - ("foobarbaz\n\n", "foobarbaz "), + (" foo bar", + " foo bar"), + + ("\nfoo bar", + " foo bar"), + + ("foo bar ", + "foo bar "), + + ("foo\n bar", + "foo bar"), + + ("foo \nbar", + "foo bar"), + + (" foo bar \nbaz", + " foo bar baz"), + + ("foo bar baz", + "foo bar baz"), + + ("foobarbaz\n\n", + "foobarbaz "), ]; let mode = CompressionMode::CompressWhitespaceNewline;