diff options
Diffstat (limited to 'ext/dom/tests')
35 files changed, 27 insertions, 216 deletions
diff --git a/ext/dom/tests/DOMCharacterData_appendData_basic.phpt b/ext/dom/tests/DOMCharacterData_appendData_basic.phpt index ee590de80c..3612b2f016 100644 --- a/ext/dom/tests/DOMCharacterData_appendData_basic.phpt +++ b/ext/dom/tests/DOMCharacterData_appendData_basic.phpt @@ -32,4 +32,4 @@ CDATA Length (two appends): 8 CDATA Content: data><&" <?xml version="1.0"?> -<root><cdata><![CDATA[data><&"]]></cdata></root>
\ No newline at end of file +<root><cdata><![CDATA[data><&"]]></cdata></root> diff --git a/ext/dom/tests/DOMComment_appendData_basic.phpt b/ext/dom/tests/DOMComment_appendData_basic.phpt index c756f1665a..a5c21f0ad3 100644 --- a/ext/dom/tests/DOMComment_appendData_basic.phpt +++ b/ext/dom/tests/DOMComment_appendData_basic.phpt @@ -16,6 +16,6 @@ $dom->saveXML(); echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> -<!--test-comment-more-data-->
\ No newline at end of file +<!--test-comment-more-data--> diff --git a/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt b/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt index 89480f24ce..50b8a99f53 100644 --- a/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt +++ b/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt @@ -33,4 +33,4 @@ Comment Length (two appends): 8 Comment Content: data><&" <?xml version="1.0"?> -<root><comment><!--data><&"--></comment></root>
\ No newline at end of file +<root><comment><!--data><&"--></comment></root> diff --git a/ext/dom/tests/DOMComment_insertData_basic.phpt b/ext/dom/tests/DOMComment_insertData_basic.phpt index 5a4857d677..16fa55e40d 100644 --- a/ext/dom/tests/DOMComment_insertData_basic.phpt +++ b/ext/dom/tests/DOMComment_insertData_basic.phpt @@ -16,6 +16,6 @@ $dom->appendChild($comment); echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <!--test-inserted-comment--> diff --git a/ext/dom/tests/DOMComment_insertData_error1.phpt b/ext/dom/tests/DOMComment_insertData_error1.phpt index 56922ac518..bd72642e33 100644 --- a/ext/dom/tests/DOMComment_insertData_error1.phpt +++ b/ext/dom/tests/DOMComment_insertData_error1.phpt @@ -20,5 +20,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- Throws DOMException for -ve offset diff --git a/ext/dom/tests/DOMComment_insertData_error2.phpt b/ext/dom/tests/DOMComment_insertData_error2.phpt index d2affa89e7..73911cc368 100644 --- a/ext/dom/tests/DOMComment_insertData_error2.phpt +++ b/ext/dom/tests/DOMComment_insertData_error2.phpt @@ -20,5 +20,5 @@ try { } ?> ---EXPECTF-- -Throws DOMException for offset too large
\ No newline at end of file +--EXPECT-- +Throws DOMException for offset too large diff --git a/ext/dom/tests/DOMComment_replaceData_basic.phpt b/ext/dom/tests/DOMComment_replaceData_basic.phpt index 10bf677ff3..e58d24b6f5 100644 --- a/ext/dom/tests/DOMComment_replaceData_basic.phpt +++ b/ext/dom/tests/DOMComment_replaceData_basic.phpt @@ -22,7 +22,7 @@ $dom->appendChild($comment); echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <!--testreplacedcomment--> <?xml version="1.0"?> diff --git a/ext/dom/tests/DOMComment_replaceData_error1.phpt b/ext/dom/tests/DOMComment_replaceData_error1.phpt index 4ae4cb61da..16ea993e34 100644 --- a/ext/dom/tests/DOMComment_replaceData_error1.phpt +++ b/ext/dom/tests/DOMComment_replaceData_error1.phpt @@ -20,5 +20,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- Throws DOMException for -ve offest diff --git a/ext/dom/tests/DOMComment_replaceData_error2.phpt b/ext/dom/tests/DOMComment_replaceData_error2.phpt index 89614f9756..fbf59d76dc 100644 --- a/ext/dom/tests/DOMComment_replaceData_error2.phpt +++ b/ext/dom/tests/DOMComment_replaceData_error2.phpt @@ -20,5 +20,5 @@ try { } ?> ---EXPECTF-- -Throws DOMException for offest too large
\ No newline at end of file +--EXPECT-- +Throws DOMException for offest too large diff --git a/ext/dom/tests/DOMDocument_createAttribute_basic.phpt b/ext/dom/tests/DOMDocument_createAttribute_basic.phpt index 5205a3e30f..d5044471e1 100644 --- a/ext/dom/tests/DOMDocument_createAttribute_basic.phpt +++ b/ext/dom/tests/DOMDocument_createAttribute_basic.phpt @@ -21,4 +21,3 @@ echo $doc->saveXML(); --EXPECT-- <?xml version="1.0"?> <para hahaha=""/> - diff --git a/ext/dom/tests/DOMDocument_createAttribute_error.phpt b/ext/dom/tests/DOMDocument_createAttribute_error.phpt index 3b318d40d2..736e2f71f2 100644 --- a/ext/dom/tests/DOMDocument_createAttribute_error.phpt +++ b/ext/dom/tests/DOMDocument_createAttribute_error.phpt @@ -21,5 +21,5 @@ catch(Exception $e) { } ?> ---EXPECTF-- +--EXPECT-- PASS diff --git a/ext/dom/tests/DOMDocument_createAttribute_error1.phpt b/ext/dom/tests/DOMDocument_createAttribute_error1.phpt index 153b18b5a2..8f612fab3d 100644 --- a/ext/dom/tests/DOMDocument_createAttribute_error1.phpt +++ b/ext/dom/tests/DOMDocument_createAttribute_error1.phpt @@ -24,4 +24,3 @@ catch (DOMException $e) { ?> --EXPECT-- Test failed! - diff --git a/ext/dom/tests/DOMDocument_createAttribute_variation.phpt b/ext/dom/tests/DOMDocument_createAttribute_variation.phpt index f00493455c..d9631d8a4a 100644 --- a/ext/dom/tests/DOMDocument_createAttribute_variation.phpt +++ b/ext/dom/tests/DOMDocument_createAttribute_variation.phpt @@ -8,5 +8,5 @@ $attr = $dom->createAttribute('string'); echo get_class($attr); ?> ---EXPECTF-- +--EXPECT-- DOMAttr diff --git a/ext/dom/tests/DOMDocument_loadHTML_basic.phpt b/ext/dom/tests/DOMDocument_loadHTML_basic.phpt index 616d1d8371..839bd0f923 100644 --- a/ext/dom/tests/DOMDocument_loadHTML_basic.phpt +++ b/ext/dom/tests/DOMDocument_loadHTML_basic.phpt @@ -13,6 +13,6 @@ $doc = new DOMDocument(); $doc->loadHTML("<html><body><p>Test<br></p></body></html>"); echo $doc->saveHTML(); ?> ---EXPECTF-- +--EXPECT-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html><body><p>Test<br></p></body></html> diff --git a/ext/dom/tests/DOMDocument_save_basic.phpt b/ext/dom/tests/DOMDocument_save_basic.phpt index c7d1ead24b..bcad72dce5 100644 --- a/ext/dom/tests/DOMDocument_save_basic.phpt +++ b/ext/dom/tests/DOMDocument_save_basic.phpt @@ -28,6 +28,5 @@ echo 'Wrote: ' . $doc->save($temp_filename) . ' bytes'; // Wrote: 72 bytes $temp_filename = dirname(__FILE__)."/DomDocument_save_basic.tmp"; unlink($temp_filename); ?> ---EXPECTF-- +--EXPECT-- Wrote: 72 bytes - diff --git a/ext/dom/tests/DOMDocument_savexml_basic.phpt b/ext/dom/tests/DOMDocument_savexml_basic.phpt index 34dfcc365e..e03460248b 100644 --- a/ext/dom/tests/DOMDocument_savexml_basic.phpt +++ b/ext/dom/tests/DOMDocument_savexml_basic.phpt @@ -34,6 +34,6 @@ var_dump($result == $dom->saveXML()); unlink($filename); ---EXPECTF-- +--EXPECT-- int(151) -bool(true)
\ No newline at end of file +bool(true) diff --git a/ext/dom/tests/DOMNode_hasChildNodes.phpt b/ext/dom/tests/DOMNode_hasChildNodes.phpt index 406f8d14ce..e5c88b2dce 100644 --- a/ext/dom/tests/DOMNode_hasChildNodes.phpt +++ b/ext/dom/tests/DOMNode_hasChildNodes.phpt @@ -31,7 +31,7 @@ $dom->loadXML('<root><a/><b/></root>'); var_dump($dom->documentElement->hasChildNodes()); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <root/> Document has child nodes diff --git a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt index 3a6f6b4218..e303110bef 100644 --- a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt +++ b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt @@ -37,7 +37,7 @@ echo "Text has child nodes: "; var_dump($text->hasChildNodes()); ?> ---EXPECTF-- +--EXPECT-- Root has child nodes: bool(true) Title has child nodes: bool(true) -Text has child nodes: bool(false)
\ No newline at end of file +Text has child nodes: bool(false) diff --git a/ext/dom/tests/DOMNode_insertBefore.phpt b/ext/dom/tests/DOMNode_insertBefore.phpt index 85cd502b26..eb5db6fb16 100644 --- a/ext/dom/tests/DOMNode_insertBefore.phpt +++ b/ext/dom/tests/DOMNode_insertBefore.phpt @@ -21,7 +21,7 @@ $e2->parentNode->insertBefore($e1, $e2); echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <root/> Add new node B diff --git a/ext/dom/tests/DOMNode_normalize_basic.phpt b/ext/dom/tests/DOMNode_normalize_basic.phpt index 8ab9080f69..fce6b289bd 100644 --- a/ext/dom/tests/DOMNode_normalize_basic.phpt +++ b/ext/dom/tests/DOMNode_normalize_basic.phpt @@ -57,8 +57,8 @@ echo "Number of child nodes of title after normalizing title = "; var_dump($title->childNodes->length); ?> ---EXPECTF-- +--EXPECT-- Number of child nodes of title = int(1) Number of child nodes of title after adding second title = int(2) Number of child nodes of title after normalizing author = int(2) -Number of child nodes of title after normalizing title = int(1)
\ No newline at end of file +Number of child nodes of title after normalizing title = int(1) diff --git a/ext/dom/tests/DOMText_appendData_basic.phpt b/ext/dom/tests/DOMText_appendData_basic.phpt index 6a28a9ae45..b066b8c5e2 100644 --- a/ext/dom/tests/DOMText_appendData_basic.phpt +++ b/ext/dom/tests/DOMText_appendData_basic.phpt @@ -32,4 +32,4 @@ Text Length (two appends): 8 Text Content: data><&" <?xml version="1.0"?> -<root><text>data><&"</text></root>
\ No newline at end of file +<root><text>data><&"</text></root> diff --git a/ext/dom/tests/bug28817.phpt b/ext/dom/tests/bug28817.phpt index 1d04ff3f1c..e211350093 100644 --- a/ext/dom/tests/bug28817.phpt +++ b/ext/dom/tests/bug28817.phpt @@ -27,18 +27,6 @@ var_dump($z->p_variable); --EXPECTF-- array(4) { [0]=> - string(5) "bonus" - [1]=> - string(3) "vir" - [2]=> - string(6) "semper" - [3]=> - string(4) "tiro" -} -string(30) "Cessante causa cessat effectus" ---UEXPECTF-- -array(4) { - [0]=> unicode(5) "bonus" [1]=> unicode(3) "vir" diff --git a/ext/dom/tests/bug34276.phpt b/ext/dom/tests/bug34276.phpt index 712ae436da..6cdfa8cefc 100644 --- a/ext/dom/tests/bug34276.phpt +++ b/ext/dom/tests/bug34276.phpt @@ -35,14 +35,6 @@ print $dom->saveXML(); ?> --EXPECT-- bool(false) -string(0) "" -string(8) "attranew" -string(8) "attrbnew" -string(5) "attrc" -<?xml version="1.0" encoding="ISO-8859-1"?> -<foo xmlns="http://www.example.com/ns/foo" xmlns:fubar="http://www.example.com/ns/fubar" xmlns:default="http://www.example.com/ns/foo" attra="attra" default:attra="attranew" fubar:attrb="attrbnew" default:attrc="attrc"/> ---UEXPECT-- -bool(false) unicode(0) "" unicode(8) "attranew" unicode(8) "attrbnew" diff --git a/ext/dom/tests/bug37277.phpt b/ext/dom/tests/bug37277.phpt index 4c3b907196..fdae6dc789 100644 --- a/ext/dom/tests/bug37277.phpt +++ b/ext/dom/tests/bug37277.phpt @@ -22,4 +22,3 @@ print $dom2->saveXML(); <?xml version="1.0" encoding="UTF-8"?> <foo/> - diff --git a/ext/dom/tests/bug37456.phpt b/ext/dom/tests/bug37456.phpt index 904712f4b1..017416e0d8 100644 --- a/ext/dom/tests/bug37456.phpt +++ b/ext/dom/tests/bug37456.phpt @@ -19,4 +19,3 @@ print $attr->nodeValue; --EXPECT-- newval - diff --git a/ext/dom/tests/bug42082.phpt b/ext/dom/tests/bug42082.phpt index a48a9906f0..8afd8d70a0 100644 --- a/ext/dom/tests/bug42082.phpt +++ b/ext/dom/tests/bug42082.phpt @@ -20,17 +20,6 @@ object(DOMNodeList)#%d (0) { int(0) bool(true) bool(true) -string(0) "" -bool(true) -bool(true) -bool(false) -bool(false) ---UEXPECTF-- -object(DOMNodeList)#%d (0) { -} -int(0) -bool(true) -bool(true) unicode(0) "" bool(true) bool(true) diff --git a/ext/dom/tests/bug44648.phpt b/ext/dom/tests/bug44648.phpt index d04f590aca..6e61a817a6 100644 --- a/ext/dom/tests/bug44648.phpt +++ b/ext/dom/tests/bug44648.phpt @@ -42,4 +42,4 @@ Invalid Character Error Invalid Character Error Invalid Character Error Namespace Error -<root/>
\ No newline at end of file +<root/> diff --git a/ext/dom/tests/dom002.phpt b/ext/dom/tests/dom002.phpt index 3c6819ce03..d2706621d4 100644 --- a/ext/dom/tests/dom002.phpt +++ b/ext/dom/tests/dom002.phpt @@ -31,31 +31,6 @@ dump($dom->getElementsByTagNameNS('http://www.example.com/ns/fubar', 'bar')); dump($doc->getElementsByTagNameNS('http://www.example.com/ns/fubar', 'bar')); ?> --EXPECT-- -string(3) "bar" -string(5) "test1" -string(3) "bar" -string(5) "test2" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" -string(3) "bar" -string(5) "test1" -string(3) "bar" -string(5) "test2" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" ---UEXPECT-- unicode(3) "bar" unicode(5) "test1" unicode(3) "bar" diff --git a/ext/dom/tests/dom002u.phpt b/ext/dom/tests/dom002u.phpt index c6576b69bd..ec5317bd29 100755 --- a/ext/dom/tests/dom002u.phpt +++ b/ext/dom/tests/dom002u.phpt @@ -31,31 +31,6 @@ dump($dom->getElementsByTagNameNS('http://www.example.com/ns/fubar', 'bar')); dump($doc->getElementsByTagNameNS('http://www.example.com/ns/fubar', 'bar')); ?> --EXPECT-- -string(3) "bar" -string(5) "test1" -string(3) "bar" -string(5) "test2" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" -string(3) "bar" -string(5) "test1" -string(3) "bar" -string(5) "test2" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" -string(9) "fubar:bar" -string(5) "test3" -string(9) "fubar:bar" -string(5) "test4" ---UEXPECT-- unicode(3) "bar" unicode(5) "test1" unicode(3) "bar" diff --git a/ext/dom/tests/dom003.phpt b/ext/dom/tests/dom003.phpt index c1f4d22082..4ad7232623 100644 --- a/ext/dom/tests/dom003.phpt +++ b/ext/dom/tests/dom003.phpt @@ -22,49 +22,6 @@ $rootNode->appendChild($rootNode); --EXPECTF-- --- Catch exception with try/catch object(DOMException)#%d (6) { - ["message":protected]=> - string(23) "Hierarchy Request Error" - ["string":"Exception":private]=> - string(0) "" - ["file":protected]=> - string(%d) "%sdom003.php" - ["line":protected]=> - int(8) - ["trace":"Exception":private]=> - array(1) { - [0]=> - array(6) { - ["file"]=> - string(%d) "%sdom003.php" - ["line"]=> - int(8) - ["function"]=> - string(11) "appendChild" - ["class"]=> - string(7) "DOMNode" - ["type"]=> - string(2) "->" - ["args"]=> - array(1) { - [0]=> - object(DOMElement)#%d (0) { - } - } - } - } - ["code"]=> - int(3) -} ---- Don't catch exception with try/catch - -Fatal error: Uncaught exception 'DOMException' with message 'Hierarchy Request Error' in %sdom003.php:%d -Stack trace: -#0 %sdom003.php(13): DOMNode->appendChild(Object(DOMElement)) -#1 {main} - thrown in %sdom003.php on line %d ---UEXPECTF-- ---- Catch exception with try/catch -object(DOMException)#%d (6) { [u"message":protected]=> unicode(23) "Hierarchy Request Error" [u"string":u"Exception":private]=> diff --git a/ext/dom/tests/dom_comment_basic.phpt b/ext/dom/tests/dom_comment_basic.phpt index adb43fd0e5..292e429214 100644 --- a/ext/dom/tests/dom_comment_basic.phpt +++ b/ext/dom/tests/dom_comment_basic.phpt @@ -32,22 +32,6 @@ bool(true) --- child 0 --- object(DOMText)#%d (0) { } -string(2) " - " ---- child 1 --- -object(DOMComment)#%d (0) { -} -string(14) " Hello World! " ---- child 2 --- -object(DOMText)#%d (0) { -} -string(1) " -" ---UEXPECTF-- -bool(true) ---- child 0 --- -object(DOMText)#%d (0) { -} unicode(2) " " --- child 1 --- @@ -59,4 +43,3 @@ object(DOMText)#%d (0) { } unicode(1) " " - diff --git a/ext/dom/tests/dom_comment_variation.phpt b/ext/dom/tests/dom_comment_variation.phpt index cd15aebcd1..2bc23a3719 100644 --- a/ext/dom/tests/dom_comment_variation.phpt +++ b/ext/dom/tests/dom_comment_variation.phpt @@ -29,11 +29,4 @@ bool(true) --- child 0 --- object(DOMComment)#%d (0) { } -string(14) " Hello World! " ---UEXPECTF-- -bool(true) ---- child 0 --- -object(DOMComment)#%d (0) { -} unicode(14) " Hello World! " - diff --git a/ext/dom/tests/dom_set_attr_node.phpt b/ext/dom/tests/dom_set_attr_node.phpt index 0d24892ea4..3aad57145b 100644 --- a/ext/dom/tests/dom_set_attr_node.phpt +++ b/ext/dom/tests/dom_set_attr_node.phpt @@ -32,41 +32,6 @@ try { ?> --EXPECTF-- object(DOMException)#%d (6) { - ["message":protected]=> - string(20) "Wrong Document Error" - ["string":"Exception":private]=> - string(0) "" - ["file":protected]=> - string(%d) "%sdom_set_attr_node.php" - ["line":protected]=> - int(%d) - ["trace":"Exception":private]=> - array(1) { - [0]=> - array(6) { - ["file"]=> - string(%d) "%sdom_set_attr_node.php" - ["line"]=> - int(%d) - ["function"]=> - string(16) "setAttributeNode" - ["class"]=> - string(10) "DOMElement" - ["type"]=> - string(2) "->" - ["args"]=> - array(1) { - [0]=> - object(DOMAttr)#%d (0) { - } - } - } - } - ["code"]=> - int(4) -} ---UEXPECTF-- -object(DOMException)#%d (6) { [u"message":protected]=> unicode(20) "Wrong Document Error" [u"string":u"Exception":private]=> diff --git a/ext/dom/tests/domdocument.phpt b/ext/dom/tests/domdocument.phpt index fb643cfcee..d13952e449 100644 --- a/ext/dom/tests/domdocument.phpt +++ b/ext/dom/tests/domdocument.phpt @@ -96,4 +96,3 @@ string(85) "<foo:child xmlns:foo="urn::foo" foo:bar="2" xml:id="id2">data & <root xmlns:foo="urn::foo"><child1 imported="1"><?php echo 'Hello World'; ?></child1></root> Output is identical - diff --git a/ext/dom/tests/domxpath.phpt b/ext/dom/tests/domxpath.phpt index 82396b5218..dc2186e66d 100644 --- a/ext/dom/tests/domxpath.phpt +++ b/ext/dom/tests/domxpath.phpt @@ -55,4 +55,4 @@ var_dump($avg); myval float(1) bool(true) -float(4)
\ No newline at end of file +float(4) |