Fixed dom tests.

diff --git a/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt b/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
index 2aec2cf7beb688c7531f0049f8a63dd7c5793b0b..403e01aa76bfb90420bf173d2df68253bd90cd2a 100644 (file)
--- a/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
+++ b/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
@@ -6,17 +6,14 @@ Hans Zaunere
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-
-// need external DTD/XML docs
-if( @file_get_contents('http://www.php.net/docs.php') === FALSE )
-    exit('skip network not available');
 ?>
 --FILE--
 <?php
 
 require_once('dom_test.inc');
 
-$XMLStringGood = file_get_contents('http://www.php.net/docs.php');
+chdir(__DIR__ . "/../examples");
+$XMLStringGood = file_get_contents('note.xml');
 
 $dom = new DOMDocument;
 $dom->resolveExternals = TRUE;
@@ -27,7 +24,7 @@ $dom->loadXML($XMLStringGood);
 echo "No Error Report Above\n";
 
 $BogusElement = $dom->createElement('NYPHP','DOMinatrix');
-$Body = $dom->getElementsByTagName('body')->item(0);
+$Body = $dom->getElementsByTagName('from')->item(0);
 $Body->appendChild($BogusElement);
 $XMLStringBad = $dom->saveXML();
 
@@ -42,12 +39,8 @@ validateOnParse set to FALSE:
 No Error Report Above
 validateOnParse set to TRUE: 
 
-Warning: DOMDocument::loadXML(): Entity 'nbsp' not defined in Entity, line: %d in %s on line %d
-
-Warning: DOMDocument::loadXML(): Entity 'copy' not defined in Entity, line: %d in %s on line %d
-
 Warning: DOMDocument::loadXML(): No declaration for element NYPHP in Entity, line: %d in %s on line %d
 
-Warning: DOMDocument::loadXML(): Element body content does not follow the DTD, expecting (p | h1 | h2 | h3 | h4 | h5 | h6 | div | ul | ol | dl | pre | hr | blockquote | address | fieldset | table | form | noscript | ins | del | script)*, got (div div div div div NYPHP) in Entity, line: %d in %s on line %d
+Warning: DOMDocument::loadXML(): Element from was declared #PCDATA but contains non text nodes in Entity, line: %d in %s on line %d
 Error Report Above
 

diff --git a/ext/dom/tests/dom004.phpt b/ext/dom/tests/dom004.phpt
index 82b7915f6f63050d9ac6db8e65ba3bd5336e0036..5b65f24ba10827a4514d695b742b11bc5b286ebf 100644 (file)
--- a/ext/dom/tests/dom004.phpt
+++ b/ext/dom/tests/dom004.phpt
@@ -3,7 +3,7 @@ Test 4: Streams Test
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-array_search('compress.zlib', stream_get_wrappers()) or die('skip compress.zlib wrapper is not available');
+in_array('compress.zlib', stream_get_wrappers()) or die('skip compress.zlib wrapper is not available');
 ?>
 --FILE--
 <?php

diff --git a/ext/dom/tests/dom_xinclude.phpt b/ext/dom/tests/dom_xinclude.phpt
index bf335d03223d782e54ab45a0d94582b3e91ab850..686a9e81aac3f7dace763dfeee96840469ca86ac 100644 (file)
--- a/ext/dom/tests/dom_xinclude.phpt
+++ b/ext/dom/tests/dom_xinclude.phpt
@@ -3,7 +3,7 @@ Test: Xinclude and Streams
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-array_search('compress.zlib', stream_get_wrappers()) or die('skip compress.zlib wrapper is not available');
+in_array('compress.zlib', stream_get_wrappers()) or die('skip compress.zlib wrapper is not available');
 ?>
 --FILE--
 <?php