merge of 'e21407ef4302ab906f6a89a28cc2055e7c2d6d70'

Fri, 31 Jul 2009 14:40:03 +0000

author
Marcus Lundblad <malu@pidgin.im>
date
Fri, 31 Jul 2009 14:40:03 +0000
changeset 28044
9d48a4bd7ee2
parent 28043
e21407ef4302 (current diff)
parent 28042
fdfd28802533 (diff)
child 28045
dca626985d99
child 28046
8b6fcc2c95b3
child 32442
ed2cf0613832

merge of 'e21407ef4302ab906f6a89a28cc2055e7c2d6d70'
and 'fdfd2880253352dfd70d15245277dfad19b8c876'

--- a/libpurple/tests/test_yahoo_util.c	Fri Jul 31 10:04:43 2009 +0000
+++ b/libpurple/tests/test_yahoo_util.c	Fri Jul 31 14:40:03 2009 +0000
@@ -18,15 +18,24 @@
 	assert_string_equal_free("plain", yahoo_codes_to_html("plain"));
 
 	/* bold/italic/underline */
-	assert_string_equal_free("<b>bold", yahoo_codes_to_html("\x1B[1mbold"));
-	assert_string_equal_free("<i>italic", yahoo_codes_to_html("\x1B[2mitalic"));
-	assert_string_equal_free("<u>underline", yahoo_codes_to_html("\x1B[4munderline"));
-	assert_string_equal_free("<b>bold</b> <i>italic</i> <u>underline", yahoo_codes_to_html("\x1B[1mbold\x1B[x1m \x1B[2mitalic\x1B[x2m \x1B[4munderline"));
+	assert_string_equal_free("<b>bold",
+			yahoo_codes_to_html("\x1B[1mbold"));
+	assert_string_equal_free("<i>italic",
+			yahoo_codes_to_html("\x1B[2mitalic"));
+	assert_string_equal_free("<u>underline",
+			yahoo_codes_to_html("\x1B[4munderline"));
+	assert_string_equal_free("<b>bold</b> <i>italic</i> <u>underline",
+			yahoo_codes_to_html("\x1B[1mbold\x1B[x1m \x1B[2mitalic\x1B[x2m \x1B[4munderline"));
 
 	/* font color and size */
-	assert_string_equal_free("<span style=\"color: #0000FF\">blue", yahoo_codes_to_html("\x1B[31mblue"));
-	assert_string_equal_free("<font size=\"4\" absz=\"15\">test", yahoo_codes_to_html("<font size=\"15\">test"));
-	assert_string_equal_free("<span style=\"color: #FF0080\"><font size=\"4\" absz=\"15\">test", yahoo_codes_to_html("\x1B[35m<font size=\"15\">test"));
+	assert_string_equal_free("<span style=\"color: #0000FF\">blue",
+			yahoo_codes_to_html("\x1B[31mblue"));
+	assert_string_equal_free("<span style=\"color: #70ea15\">test",
+			yahoo_codes_to_html("\x1B[#70ea15mtest"));
+	assert_string_equal_free("<font size=\"4\" absz=\"15\">test",
+			yahoo_codes_to_html("<font size=\"15\">test"));
+	assert_string_equal_free("<span style=\"color: #FF0080\"><font size=\"4\" absz=\"15\">test",
+			yahoo_codes_to_html("\x1B[35m<font size=\"15\">test"));
 }
 END_TEST
 

mercurial