nlopess Sat May 6 11:19:37 2006 UTC
Modified files:
/php-src/ext/tidy/tests 010.phpt 011.phpt 012.phpt
Log:
fix tests in Unicode mode
http://cvs.php.net/viewcvs.cgi/php-src/ext/tidy/tests/010.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/tidy/tests/010.phpt
diff -u php-src/ext/tidy/tests/010.phpt:1.5 php-src/ext/tidy/tests/010.phpt:1.6
--- php-src/ext/tidy/tests/010.phpt:1.5 Sat Apr 2 22:57:42 2005
+++ php-src/ext/tidy/tests/010.phpt Sat May 6 11:19:37 2006
@@ -315,3 +315,307 @@
}
}
}
+--UEXPECT--
+object(tidyNode)#2 (8) {
+ [u"value"]=>
+ string(94) "<html>
+<head>
+<title></title>
+</head>
+<body bgcolor="#FFFFFF" alink="#000000">
+</body>
+</html>"
+ [u"name"]=>
+ string(0) ""
+ [u"type"]=>
+ int(0)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(1)
+ [u"proprietary"]=>
+ bool(false)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ array(1) {
+ [0]=>
+ &object(tidyNode)#3 (9) {
+ [u"value"]=>
+ string(94) "<html>
+<head>
+<title></title>
+</head>
+<body bgcolor="#FFFFFF" alink="#000000">
+</body>
+</html>"
+ [u"name"]=>
+ string(4) "html"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(1)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(48)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ array(2) {
+ [0]=>
+ &object(tidyNode)#4 (9) {
+ [u"value"]=>
+ string(31) "<head>
+<title></title>
+</head>
+"
+ [u"name"]=>
+ string(4) "head"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(7)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(46)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ array(1) {
+ [0]=>
+ &object(tidyNode)#5 (9) {
+ [u"value"]=>
+ string(16) "<title></title>
+"
+ [u"name"]=>
+ string(5) "title"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(57)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(111)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+ }
+ }
+ }
+ [1]=>
+ &object(tidyNode)#6 (9) {
+ [u"value"]=>
+ string(49) "<body bgcolor="#FFFFFF" alink="#000000">
+</body>
+"
+ [u"name"]=>
+ string(4) "body"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(7)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(16)
+ [u"attribute"]=>
+ array(2) {
+ [u"bgcolor"]=>
+ string(7) "#FFFFFF"
+ [u"alink"]=>
+ string(7) "#000000"
+ }
+ [u"child"]=>
+ NULL
+ }
+ }
+ }
+ }
+}
+object(tidyNode)#2 (9) {
+ [u"value"]=>
+ string(49) "<body bgcolor="#FFFFFF" alink="#000000">
+</body>
+"
+ [u"name"]=>
+ string(4) "body"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(7)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(16)
+ [u"attribute"]=>
+ array(2) {
+ [u"bgcolor"]=>
+ string(7) "#FFFFFF"
+ [u"alink"]=>
+ string(7) "#000000"
+ }
+ [u"child"]=>
+ NULL
+}
+object(tidyNode)#2 (9) {
+ [u"value"]=>
+ string(94) "<html>
+<head>
+<title></title>
+</head>
+<body bgcolor="#FFFFFF" alink="#000000">
+</body>
+</html>"
+ [u"name"]=>
+ string(4) "html"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(1)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(48)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ array(2) {
+ [0]=>
+ &object(tidyNode)#3 (9) {
+ [u"value"]=>
+ string(31) "<head>
+<title></title>
+</head>
+"
+ [u"name"]=>
+ string(4) "head"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(7)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(46)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ array(1) {
+ [0]=>
+ &object(tidyNode)#6 (9) {
+ [u"value"]=>
+ string(16) "<title></title>
+"
+ [u"name"]=>
+ string(5) "title"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(57)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(111)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+ }
+ }
+ }
+ [1]=>
+ &object(tidyNode)#4 (9) {
+ [u"value"]=>
+ string(49) "<body bgcolor="#FFFFFF" alink="#000000">
+</body>
+"
+ [u"name"]=>
+ string(4) "body"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(7)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(16)
+ [u"attribute"]=>
+ array(2) {
+ [u"bgcolor"]=>
+ string(7) "#FFFFFF"
+ [u"alink"]=>
+ string(7) "#000000"
+ }
+ [u"child"]=>
+ NULL
+ }
+ }
+}
+object(tidyNode)#2 (9) {
+ [u"value"]=>
+ string(31) "<head>
+<title></title>
+</head>
+"
+ [u"name"]=>
+ string(4) "head"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(7)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(46)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ array(1) {
+ [0]=>
+ &object(tidyNode)#4 (9) {
+ [u"value"]=>
+ string(16) "<title></title>
+"
+ [u"name"]=>
+ string(5) "title"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(57)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(111)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+ }
+ }
+}
http://cvs.php.net/viewcvs.cgi/php-src/ext/tidy/tests/011.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/tidy/tests/011.phpt
diff -u php-src/ext/tidy/tests/011.phpt:1.3 php-src/ext/tidy/tests/011.phpt:1.4
--- php-src/ext/tidy/tests/011.phpt:1.3 Wed May 19 08:45:23 2004
+++ php-src/ext/tidy/tests/011.phpt Sat May 6 11:19:37 2006
@@ -19,4 +19,13 @@
string(7) "#000000"
}
Attrib 'bgcolor': #FFFFFF
-Attrib 'alink': #000000
\ No newline at end of file
+Attrib 'alink': #000000
+--UEXPECT--
+array(2) {
+ [u"bgcolor"]=>
+ string(7) "#FFFFFF"
+ [u"alink"]=>
+ string(7) "#000000"
+}
+Attrib 'bgcolor': #FFFFFF
+Attrib 'alink': #000000
http://cvs.php.net/viewcvs.cgi/php-src/ext/tidy/tests/012.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/tidy/tests/012.phpt
diff -u php-src/ext/tidy/tests/012.phpt:1.6 php-src/ext/tidy/tests/012.phpt:1.7
--- php-src/ext/tidy/tests/012.phpt:1.6 Sat Apr 2 22:57:42 2005
+++ php-src/ext/tidy/tests/012.phpt Sat May 6 11:19:37 2006
@@ -471,3 +471,444 @@
["child"]=>
NULL
}
+--UEXPECT--
+bool(true)
+object(tidyNode)#3 (9) {
+ [u"value"]=>
+ string(31) "<head>
+<title></title>
+</head>
+"
+ [u"name"]=>
+ string(4) "head"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(7)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(46)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ array(1) {
+ [0]=>
+ &object(tidyNode)#4 (9) {
+ [u"value"]=>
+ string(16) "<title></title>
+"
+ [u"name"]=>
+ string(5) "title"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(87)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(111)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+ }
+ }
+}
+bool(true)
+object(tidyNode)#4 (9) {
+ [u"value"]=>
+ string(16) "<title></title>
+"
+ [u"name"]=>
+ string(5) "title"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(87)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(111)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+}
+object(tidyNode)#5 (9) {
+ [u"value"]=>
+ string(80) "<body bgcolor="#FFFFFF" alink="#000000">
+<b>Hi</b><i>Bye<u>Test</u></i>
+</body>
+"
+ [u"name"]=>
+ string(4) "body"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(7)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(16)
+ [u"attribute"]=>
+ array(2) {
+ [u"bgcolor"]=>
+ string(7) "#FFFFFF"
+ [u"alink"]=>
+ string(7) "#000000"
+ }
+ [u"child"]=>
+ array(2) {
+ [0]=>
+ &object(tidyNode)#6 (9) {
+ [u"value"]=>
+ string(9) "<b>Hi</b>"
+ [u"name"]=>
+ string(1) "b"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(43)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(8)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ array(1) {
+ [0]=>
+ &object(tidyNode)#7 (8) {
+ [u"value"]=>
+ string(2) "Hi"
+ [u"name"]=>
+ string(0) ""
+ [u"type"]=>
+ int(4)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(46)
+ [u"proprietary"]=>
+ bool(false)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+ }
+ }
+ }
+ [1]=>
+ &object(tidyNode)#8 (9) {
+ [u"value"]=>
+ string(21) "<i>Bye<u>Test</u></i>"
+ [u"name"]=>
+ string(1) "i"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(52)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(49)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ array(2) {
+ [0]=>
+ &object(tidyNode)#9 (8) {
+ [u"value"]=>
+ string(3) "Bye"
+ [u"name"]=>
+ string(0) ""
+ [u"type"]=>
+ int(4)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(55)
+ [u"proprietary"]=>
+ bool(false)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+ }
+ [1]=>
+ &object(tidyNode)#10 (9) {
+ [u"value"]=>
+ string(11) "<u>Test</u>"
+ [u"name"]=>
+ string(1) "u"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(58)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(114)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ array(1) {
+ [0]=>
+ &object(tidyNode)#11 (8) {
+ [u"value"]=>
+ string(4) "Test"
+ [u"name"]=>
+ string(0) ""
+ [u"type"]=>
+ int(4)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(61)
+ [u"proprietary"]=>
+ bool(false)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+ }
+ }
+ }
+ }
+ }
+ }
+}
+bool(true)
+object(tidyNode)#6 (9) {
+ [u"value"]=>
+ string(9) "<b>Hi</b>"
+ [u"name"]=>
+ string(1) "b"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(43)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(8)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ array(1) {
+ [0]=>
+ &object(tidyNode)#7 (8) {
+ [u"value"]=>
+ string(2) "Hi"
+ [u"name"]=>
+ string(0) ""
+ [u"type"]=>
+ int(4)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(46)
+ [u"proprietary"]=>
+ bool(false)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+ }
+ }
+}
+bool(true)
+object(tidyNode)#7 (8) {
+ [u"value"]=>
+ string(2) "Hi"
+ [u"name"]=>
+ string(0) ""
+ [u"type"]=>
+ int(4)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(46)
+ [u"proprietary"]=>
+ bool(false)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+}
+object(tidyNode)#8 (9) {
+ [u"value"]=>
+ string(21) "<i>Bye<u>Test</u></i>"
+ [u"name"]=>
+ string(1) "i"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(52)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(49)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ array(2) {
+ [0]=>
+ &object(tidyNode)#9 (8) {
+ [u"value"]=>
+ string(3) "Bye"
+ [u"name"]=>
+ string(0) ""
+ [u"type"]=>
+ int(4)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(55)
+ [u"proprietary"]=>
+ bool(false)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+ }
+ [1]=>
+ &object(tidyNode)#10 (9) {
+ [u"value"]=>
+ string(11) "<u>Test</u>"
+ [u"name"]=>
+ string(1) "u"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(58)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(114)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ array(1) {
+ [0]=>
+ &object(tidyNode)#11 (8) {
+ [u"value"]=>
+ string(4) "Test"
+ [u"name"]=>
+ string(0) ""
+ [u"type"]=>
+ int(4)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(61)
+ [u"proprietary"]=>
+ bool(false)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+ }
+ }
+ }
+ }
+}
+bool(true)
+object(tidyNode)#9 (8) {
+ [u"value"]=>
+ string(3) "Bye"
+ [u"name"]=>
+ string(0) ""
+ [u"type"]=>
+ int(4)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(55)
+ [u"proprietary"]=>
+ bool(false)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+}
+object(tidyNode)#10 (9) {
+ [u"value"]=>
+ string(11) "<u>Test</u>"
+ [u"name"]=>
+ string(1) "u"
+ [u"type"]=>
+ int(5)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(58)
+ [u"proprietary"]=>
+ bool(false)
+ [u"id"]=>
+ int(114)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ array(1) {
+ [0]=>
+ &object(tidyNode)#11 (8) {
+ [u"value"]=>
+ string(4) "Test"
+ [u"name"]=>
+ string(0) ""
+ [u"type"]=>
+ int(4)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(61)
+ [u"proprietary"]=>
+ bool(false)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+ }
+ }
+}
+bool(true)
+object(tidyNode)#11 (8) {
+ [u"value"]=>
+ string(4) "Test"
+ [u"name"]=>
+ string(0) ""
+ [u"type"]=>
+ int(4)
+ [u"line"]=>
+ int(1)
+ [u"column"]=>
+ int(61)
+ [u"proprietary"]=>
+ bool(false)
+ [u"attribute"]=>
+ NULL
+ [u"child"]=>
+ NULL
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
