ant Mon Dec 1 11:30:40 2008 UTC
Modified files:
/php-src/ext/dom/tests DOMNode_removeChild_basic.phpt
DOMNode_cloneNode_basic.phpt
DOMNode_normalize_basic.phpt
DOMComment_replaceData_error1.phpt
dom_test.inc
DOMComment_insertData_basic.phpt
DOMDocument_createAttribute_error1.phpt
bug42082.phpt
DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt
DOMComment_insertData_error1.phpt
DOMDocument_loadHTML_basic.phpt
DOMNode_hasChildNodes_basic.phpt
DOMDocument_createAttribute_error.phpt
DOMDocument_createAttribute_basic.phpt
DOMComment_insertData_error2.phpt
DOMComment_replaceData_basic.phpt
DOMComment_appendData_basic.phpt
DOMDocument_save_basic.phpt
DOMNode_issamenode_basic.phpt
DOMCharacterData_appendData_basic.phpt
DOMComment_replaceData_error2.phpt
DOMDocument_createAttribute_variation.phpt
DOMElement_hasAttributes_basic.phpt
DOMDocument_createProcessingInstruction_basic.phpt
DOMDocument_createProcessingInstruction_error.phpt
DOMComment_appendData_basic_Sullivan.phpt
DOMText_appendData_basic.phpt
Log:
DOM tests: checked on PHP 5.2.6, 5.3 and 6.0 (Windows, Linux and Linux 64
bit).
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMNode_removeChild_basic.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/dom/tests/DOMNode_removeChild_basic.phpt
diff -u /dev/null php-src/ext/dom/tests/DOMNode_removeChild_basic.phpt:1.2
--- /dev/null Mon Dec 1 11:30:40 2008
+++ php-src/ext/dom/tests/DOMNode_removeChild_basic.phpt Mon Dec 1
11:30:39 2008
@@ -0,0 +1,113 @@
+--TEST--
+DOM removeChild : Basic Functionality
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+?>
+--CREDITS--
+Simon Hughes <[EMAIL PROTECTED]>
+--FILE--
+<?php
+
+$xml = <<< EOXML
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<courses>
+ <course title="one">
+ <notes>
+ <note>c1n1</note>
+ <note>c1n2</note>
+ </notes>
+ </course>
+ <course title="two">
+ <notes>
+ <note>c2n1</note>
+ <note>c2n2</note>
+ </notes>
+ </course>
+</courses>
+EOXML;
+
+function dumpcourse($current) {
+ $title = ($current->nodeType != XML_TEXT_NODE &&
$current->hasAttribute('title')) ? $current->getAttribute('title'):"no title";
+ echo "Course: $title:";var_dump($current);
+ echo "~";var_dump($current->textContent);
+}
+
+$dom = new DOMDocument();
+$dom->loadXML($xml);
+$root = $dom->documentElement;
+
+$children = $root->childNodes;
+$len = $children->length;
+echo "orignal has $len nodes\n";
+for ($index = $children->length - 1; $index >=0; $index--) {
+ echo "node $index\n";
+ $current = $children->item($index);
+ dumpcourse($current);
+ if ($current->nodeType == XML_TEXT_NODE) {
+ $noderemoved = $root->removeChild($current);
+ }
+}
+$children = $root->childNodes;
+$len = $children->length;
+echo "after text removed it now has $len nodes\n";
+for ($index = 0; $index < $children->length; $index++) {
+ echo "node $index\n";
+ $current = $children->item($index);
+ dumpcourse($current);
+}
+
+--EXPECTF--
+orignal has 5 nodes
+node 4
+Course: no title:object(DOMText)#4 (0) {
+}
+~unicode(1) "
+"
+node 3
+Course: two:object(DOMElement)#5 (0) {
+}
+~unicode(24) "
+
+ c2n1
+ c2n2
+
+ "
+node 2
+Course: no title:object(DOMText)#6 (0) {
+}
+~unicode(2) "
+ "
+node 1
+Course: one:object(DOMElement)#4 (0) {
+}
+~unicode(24) "
+
+ c1n1
+ c1n2
+
+ "
+node 0
+Course: no title:object(DOMText)#5 (0) {
+}
+~unicode(2) "
+ "
+after text removed it now has 2 nodes
+node 0
+Course: one:object(DOMElement)#3 (0) {
+}
+~unicode(24) "
+
+ c1n1
+ c1n2
+
+ "
+node 1
+Course: two:object(DOMElement)#4 (0) {
+}
+~unicode(24) "
+
+ c2n1
+ c2n2
+
+ "
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMNode_cloneNode_basic.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/dom/tests/DOMNode_cloneNode_basic.phpt
diff -u /dev/null php-src/ext/dom/tests/DOMNode_cloneNode_basic.phpt:1.2
--- /dev/null Mon Dec 1 11:30:40 2008
+++ php-src/ext/dom/tests/DOMNode_cloneNode_basic.phpt Mon Dec 1 11:30:39 2008
@@ -0,0 +1,111 @@
+--TEST--
+DOM cloneNode : Basic Functionality
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+?>
+--CREDITS--
+Simon Hughes <[EMAIL PROTECTED]>
+--FILE--
+<?php
+
+$xml = <<< EOXML
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<courses>
+ <course title="one">
+ <notes>
+ <note>c1n1</note>
+ <note>c1n2</note>
+ </notes>
+ </course>
+ <course title="two">
+ <notes>
+ <note>c2n1</note>
+ <note>c2n2</note>
+ </notes>
+ </course>
+</courses>
+EOXML;
+
+function dumpcourse($current) {
+ $title = ($current->nodeType != XML_TEXT_NODE &&
$current->hasAttribute('title')) ? $current->getAttribute('title'):"no title";
+ echo "Course: $title:";var_dump($current);
+ echo "~";var_dump($current->textContent);
+}
+
+$dom = new DOMDocument();
+$dom->loadXML($xml);
+$root = $dom->documentElement;
+
+// strip all text nodes from this tree
+$children = $root->childNodes;
+$len = $children->length;
+for ($index = $children->length - 1; $index >=0; $index--) {
+ $current = $children->item($index);
+ if ($current->nodeType == XML_TEXT_NODE) {
+ $noderemoved = $root->removeChild($current);
+ }
+}
+
+echo "Start cloneNode test\n";
+$first_course = $children->item(0);
+$cloned_first_course_default = $first_course->cloneNode();
+$first_course->setAttribute('title', 'new title1');
+
+$cloned_first_course_true = $first_course->cloneNode(true);
+$first_course->setAttribute('title', 'new title2');
+
+$cloned_first_course_false = $first_course->cloneNode(false);
+$first_course->setAttribute('title', 'new title3');
+
+$cloned_first_course_default->setAttribute('title', 'new title default');
+$cloned_first_course_true->setAttribute('title', 'new title true');
+$cloned_first_course_false->setAttribute('title', 'new title false');
+
+$root->appendChild($cloned_first_course_default);
+$root->appendChild($cloned_first_course_true);
+$root->appendChild($cloned_first_course_false);
+
+$children = $root->childNodes;
+for ($index = 0; $index < $children->length; $index++) {
+ echo "node $index\n";
+ dumpcourse($children->item($index));
+}
+
+--EXPECTF--
+Start cloneNode test
+node 0
+Course: new title3:object(DOMElement)#6 (0) {
+}
+~unicode(24) "
+
+ c1n1
+ c1n2
+
+ "
+node 1
+Course: two:object(DOMElement)#3 (0) {
+}
+~unicode(24) "
+
+ c2n1
+ c2n2
+
+ "
+node 2
+Course: new title default:object(DOMElement)#4 (0) {
+}
+~unicode(0) ""
+node 3
+Course: new title true:object(DOMElement)#7 (0) {
+}
+~unicode(24) "
+
+ c1n1
+ c1n2
+
+ "
+node 4
+Course: new title false:object(DOMElement)#8 (0) {
+}
+~unicode(0) ""
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMNode_normalize_basic.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/dom/tests/DOMNode_normalize_basic.phpt
diff -u php-src/ext/dom/tests/DOMNode_normalize_basic.phpt:1.2
php-src/ext/dom/tests/DOMNode_normalize_basic.phpt:1.3
--- php-src/ext/dom/tests/DOMNode_normalize_basic.phpt:1.2 Tue May 27
18:16:00 2008
+++ php-src/ext/dom/tests/DOMNode_normalize_basic.phpt Mon Dec 1 11:30:39 2008
@@ -1,15 +1,15 @@
--TEST--
-DomNode::normalize()
+normalize()
--SKIPIF--
<?php
include('skipif.inc');
?>
--FILE--
-<?php
+<?php
/* Create an XML document
* with structure
- * <book>
+ * <book>
* <author></author>
* <title>This is the title</title>
* </book>
@@ -57,8 +57,8 @@
var_dump($title->childNodes->length);
?>
---EXPECT--
+--EXPECTF--
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)
+Number of child nodes of title after normalizing title = int(1)
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt
diff -u php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt:1.3
php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt:1.4
--- php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt:1.3 Tue May
27 18:16:00 2008
+++ php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt Mon Dec 1
11:30:39 2008
@@ -20,5 +20,5 @@
}
?>
---EXPECT--
+--EXPECTF--
Throws DOMException for -ve offest
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom_test.inc?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/dom/tests/dom_test.inc
diff -u php-src/ext/dom/tests/dom_test.inc:1.4
php-src/ext/dom/tests/dom_test.inc:1.5
--- php-src/ext/dom/tests/dom_test.inc:1.4 Sat Aug 5 12:35:35 2006
+++ php-src/ext/dom/tests/dom_test.inc Mon Dec 1 11:30:39 2008
@@ -1,5 +1,5 @@
<?PHP
-$xmlstr = b"<?xml version='1.0' standalone='yes'?>
+$xmlstr = "<?xml version='1.0' standalone='yes'?>
<!DOCTYPE chapter SYSTEM '/share/sgml/Norman_Walsh/db3xml10/db3xml10.dtd'
[ <!ENTITY sp \"spanish\">
]>
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_insertData_basic.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/DOMComment_insertData_basic.phpt
diff -u php-src/ext/dom/tests/DOMComment_insertData_basic.phpt:1.3
php-src/ext/dom/tests/DOMComment_insertData_basic.phpt:1.4
--- php-src/ext/dom/tests/DOMComment_insertData_basic.phpt:1.3 Tue May 27
18:16:00 2008
+++ php-src/ext/dom/tests/DOMComment_insertData_basic.phpt Mon Dec 1
11:30:39 2008
@@ -16,6 +16,6 @@
echo $dom->saveXML();
?>
---EXPECT--
+--EXPECTF--
<?xml version="1.0"?>
<!--test-inserted-comment-->
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt
diff -u php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt:1.4
php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt:1.5
--- php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt:1.4 Sun Jul
13 21:22:41 2008
+++ php-src/ext/dom/tests/DOMDocument_createAttribute_error1.phpt Mon Dec
1 11:30:39 2008
@@ -3,8 +3,6 @@
--CREDITS--
Muhammad Khalid Adnan
# TestFest 2008
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
--FILE--
<?php
@@ -26,3 +24,4 @@
?>
--EXPECT--
Test failed!
+
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug42082.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/dom/tests/bug42082.phpt
diff -u php-src/ext/dom/tests/bug42082.phpt:1.4
php-src/ext/dom/tests/bug42082.phpt:1.5
--- php-src/ext/dom/tests/bug42082.phpt:1.4 Sun Jul 13 21:22:41 2008
+++ php-src/ext/dom/tests/bug42082.phpt Mon Dec 1 11:30:39 2008
@@ -1,7 +1,5 @@
--TEST--
Bug #42082 (NodeList length zero should be empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
--FILE--
<?php
$doc = new DOMDocument();
@@ -26,4 +24,5 @@
bool(true)
bool(true)
bool(false)
-bool(false)
+bool(false)
+
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt?r1=1.3&r2=1.4&diff_format=u
Index:
php-src/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt
diff -u
php-src/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt:1.3
php-src/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt:1.4
---
php-src/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt:1.3
Sun Jul 13 21:22:41 2008
+++
php-src/ext/dom/tests/DOMDocumentFragment_appendXML_hasChildNodes_basic.phpt
Mon Dec 1 11:30:39 2008
@@ -1,7 +1,5 @@
--TEST--
Testing DOMDocumentFragment::appendXML and DOMDocumentFragment::hasChildNodes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
--FILE--
<?php
$doc = new DOMDocument();
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_insertData_error1.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/DOMComment_insertData_error1.phpt
diff -u php-src/ext/dom/tests/DOMComment_insertData_error1.phpt:1.3
php-src/ext/dom/tests/DOMComment_insertData_error1.phpt:1.4
--- php-src/ext/dom/tests/DOMComment_insertData_error1.phpt:1.3 Tue May 27
18:16:00 2008
+++ php-src/ext/dom/tests/DOMComment_insertData_error1.phpt Mon Dec 1
11:30:39 2008
@@ -20,5 +20,5 @@
}
?>
---EXPECT--
+--EXPECTF--
Throws DOMException for -ve offset
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_loadHTML_basic.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/DOMDocument_loadHTML_basic.phpt
diff -u php-src/ext/dom/tests/DOMDocument_loadHTML_basic.phpt:1.3
php-src/ext/dom/tests/DOMDocument_loadHTML_basic.phpt:1.4
--- php-src/ext/dom/tests/DOMDocument_loadHTML_basic.phpt:1.3 Tue May 27
18:16:00 2008
+++ php-src/ext/dom/tests/DOMDocument_loadHTML_basic.phpt Mon Dec 1
11:30:39 2008
@@ -13,6 +13,6 @@
$doc->loadHTML("<html><body><p>Test<br></p></body></html>");
echo $doc->saveHTML();
?>
---EXPECT--
+--EXPECTF--
<!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>
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt
diff -u php-src/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt:1.4
php-src/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt:1.5
--- php-src/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt:1.4 Tue May 27
18:16:00 2008
+++ php-src/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt Mon Dec 1
11:30:39 2008
@@ -37,7 +37,7 @@
var_dump($text->hasChildNodes());
?>
---EXPECT--
+--EXPECTF--
Root has child nodes: bool(true)
Title has child nodes: bool(true)
-Text has child nodes: bool(false)
+Text has child nodes: bool(false)
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt
diff -u php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt:1.3
php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt:1.4
--- php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt:1.3 Sun Jul
13 21:22:41 2008
+++ php-src/ext/dom/tests/DOMDocument_createAttribute_error.phpt Mon Dec
1 11:30:39 2008
@@ -1,7 +1,5 @@
--TEST--
Test DOMDocument::createAttribute() for expected expection thrown when wrong
parameter passed
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
--FILE--
<?php
$dom = new DOMDocument();
@@ -23,5 +21,5 @@
}
?>
---EXPECT--
+--EXPECTF--
PASS
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt
diff -u php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt:1.4
php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt:1.5
--- php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt:1.4 Sun Jul
13 21:22:41 2008
+++ php-src/ext/dom/tests/DOMDocument_createAttribute_basic.phpt Mon Dec
1 11:30:39 2008
@@ -3,8 +3,6 @@
--CREDITS--
Muhammad Khalid Adnan
# TestFest 2008
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
--FILE--
<?php
@@ -23,3 +21,4 @@
--EXPECT--
<?xml version="1.0"?>
<para hahaha=""/>
+
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_insertData_error2.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/DOMComment_insertData_error2.phpt
diff -u php-src/ext/dom/tests/DOMComment_insertData_error2.phpt:1.3
php-src/ext/dom/tests/DOMComment_insertData_error2.phpt:1.4
--- php-src/ext/dom/tests/DOMComment_insertData_error2.phpt:1.3 Tue May 27
18:16:00 2008
+++ php-src/ext/dom/tests/DOMComment_insertData_error2.phpt Mon Dec 1
11:30:39 2008
@@ -20,5 +20,5 @@
}
?>
---EXPECT--
-Throws DOMException for offset too large
+--EXPECTF--
+Throws DOMException for offset too large
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt
diff -u php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.4
php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.5
--- php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.4 Sun Jul 13
21:22:41 2008
+++ php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt Mon Dec 1
11:30:39 2008
@@ -4,7 +4,7 @@
Andrew Larssen <[EMAIL PROTECTED]>
London TestFest 2008
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php // require_once('skipif.inc'); ?>
--FILE--
<?php
@@ -22,7 +22,7 @@
echo $dom->saveXML();
?>
---EXPECT--
+--EXPECTF--
<?xml version="1.0"?>
<!--testreplacedcomment-->
<?xml version="1.0"?>
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_appendData_basic.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/DOMComment_appendData_basic.phpt
diff -u php-src/ext/dom/tests/DOMComment_appendData_basic.phpt:1.3
php-src/ext/dom/tests/DOMComment_appendData_basic.phpt:1.4
--- php-src/ext/dom/tests/DOMComment_appendData_basic.phpt:1.3 Tue May 27
18:16:00 2008
+++ php-src/ext/dom/tests/DOMComment_appendData_basic.phpt Mon Dec 1
11:30:39 2008
@@ -16,6 +16,6 @@
echo $dom->saveXML();
?>
---EXPECT--
+--EXPECTF--
<?xml version="1.0"?>
-<!--test-comment-more-data-->
+<!--test-comment-more-data-->
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_save_basic.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/DOMDocument_save_basic.phpt
diff -u php-src/ext/dom/tests/DOMDocument_save_basic.phpt:1.3
php-src/ext/dom/tests/DOMDocument_save_basic.phpt:1.4
--- php-src/ext/dom/tests/DOMDocument_save_basic.phpt:1.3 Tue May 27
18:16:00 2008
+++ php-src/ext/dom/tests/DOMDocument_save_basic.phpt Mon Dec 1 11:30:39 2008
@@ -28,5 +28,6 @@
$temp_filename = dirname(__FILE__)."/DomDocument_save_basic.tmp";
unlink($temp_filename);
?>
---EXPECT--
+--EXPECTF--
Wrote: 72 bytes
+
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMNode_issamenode_basic.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/DOMNode_issamenode_basic.phpt
diff -u php-src/ext/dom/tests/DOMNode_issamenode_basic.phpt:1.3
php-src/ext/dom/tests/DOMNode_issamenode_basic.phpt:1.4
--- php-src/ext/dom/tests/DOMNode_issamenode_basic.phpt:1.3 Sun Jul 13
21:22:41 2008
+++ php-src/ext/dom/tests/DOMNode_issamenode_basic.phpt Mon Dec 1 11:30:39 2008
@@ -3,8 +3,6 @@
--CREDITS--
James Lewis <[EMAIL PROTECTED]>
#TestFest 2008
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
--FILE--
<?php
require_once("dom_test.inc");
@@ -30,6 +28,8 @@
echo "EXPECTING NOT SAME NODE, PASSED\n" ;
?>
+===DONE===
--EXPECT--
EXPECTING SAME NODE, PASSED
EXPECTING NOT SAME NODE, PASSED
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMCharacterData_appendData_basic.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/dom/tests/DOMCharacterData_appendData_basic.phpt
diff -u php-src/ext/dom/tests/DOMCharacterData_appendData_basic.phpt:1.4
php-src/ext/dom/tests/DOMCharacterData_appendData_basic.phpt:1.5
--- php-src/ext/dom/tests/DOMCharacterData_appendData_basic.phpt:1.4 Sun Jul
13 21:22:41 2008
+++ php-src/ext/dom/tests/DOMCharacterData_appendData_basic.phpt Mon Dec
1 11:30:39 2008
@@ -3,8 +3,6 @@
--CREDITS--
Mike Sullivan <[EMAIL PROTECTED]>
#TestFest 2008 (London)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
--FILE--
<?php
@@ -34,4 +32,4 @@
CDATA Content: data><&"
<?xml version="1.0"?>
-<root><cdata><![CDATA[data><&"]]></cdata></root>
+<root><cdata><![CDATA[data><&"]]></cdata></root>
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt
diff -u php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt:1.3
php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt:1.4
--- php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt:1.3 Tue May
27 18:16:00 2008
+++ php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt Mon Dec 1
11:30:39 2008
@@ -20,5 +20,5 @@
}
?>
---EXPECT--
-Throws DOMException for offest too large
+--EXPECTF--
+Throws DOMException for offest too large
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt
diff -u php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt:1.3
php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt:1.4
--- php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt:1.3
Sun Jul 13 21:22:41 2008
+++ php-src/ext/dom/tests/DOMDocument_createAttribute_variation.phpt Mon Dec
1 11:30:39 2008
@@ -1,7 +1,5 @@
--TEST--
Test DOMDocument::createAttribute() for expected return value
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
--FILE--
<?php
$dom = new DOMDocument();
@@ -10,5 +8,5 @@
echo get_class($attr);
?>
---EXPECT--
+--EXPECTF--
DOMAttr
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt
diff -u php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt:1.3
php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt:1.4
--- php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt:1.3 Sun Jul
13 21:22:41 2008
+++ php-src/ext/dom/tests/DOMElement_hasAttributes_basic.phpt Mon Dec 1
11:30:39 2008
@@ -3,8 +3,6 @@
--CREDITS--
James Lewis <[EMAIL PROTECTED]>
#TestFest 2008
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
--FILE--
<?php
require_once("dom_test.inc");
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt
diff -u
php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt:1.3
php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt:1.4
---
php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt:1.3
Sun Jul 13 21:22:41 2008
+++ php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt
Mon Dec 1 11:30:39 2008
@@ -1,30 +1,28 @@
---TEST--
-DomDocument::createProcessingInstruction() - basic test for
DomDocument::createProcessingInstruction()
---CREDITS--
-Muhammad Khalid Adnan
-# TestFest 2008
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-$doc = new DOMDocument;
-
-$node = $doc->createElement("para");
-$newnode = $doc->appendChild($node);
-
-$test_proc_inst0 =
- $doc->createProcessingInstruction( "blablabla" );
-$node->appendChild($test_proc_inst0);
-
-$test_proc_inst1 =
- $doc->createProcessingInstruction( "blablabla", "datadata" );
-$node->appendChild($test_proc_inst1);
-
-echo $doc->saveXML();
-
-?>
---EXPECT--
-<?xml version="1.0"?>
-<para><?blablabla?><?blablabla datadata?></para>
-
+--TEST--
+DomDocument::createProcessingInstruction() - basic test for
DomDocument::createProcessingInstruction()
+--CREDITS--
+Muhammad Khalid Adnan
+# TestFest 2008
+--FILE--
+<?php
+
+$doc = new DOMDocument;
+
+$node = $doc->createElement("para");
+$newnode = $doc->appendChild($node);
+
+$test_proc_inst0 =
+ $doc->createProcessingInstruction( "blablabla" );
+$node->appendChild($test_proc_inst0);
+
+$test_proc_inst1 =
+ $doc->createProcessingInstruction( "blablabla", "datadata" );
+$node->appendChild($test_proc_inst1);
+
+echo $doc->saveXML();
+
+?>
+--EXPECT--
+<?xml version="1.0"?>
+<para><?blablabla?><?blablabla datadata?></para>
+
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt
diff -u
php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt:1.3
php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt:1.4
---
php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt:1.3
Sun Jul 13 21:22:41 2008
+++ php-src/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt
Mon Dec 1 11:30:39 2008
@@ -1,31 +1,29 @@
---TEST--
-DomDocument::createProcessingInstruction() - error test for
DomDocument::createProcessingInstruction()
---CREDITS--
-Muhammad Khalid Adnan
-# TestFest 2008
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-$doc = new DOMDocument;
-
-$node = $doc->createElement("para");
-$newnode = $doc->appendChild($node);
-
-try {
- $test_proc_inst =
- $doc->createProcessingInstruction( "bla bla bla" );
- $node->appendChild($test_proc_inst);
-
- echo $doc->saveXML();
-}
-catch (DOMException $e)
-{
- echo 'Test failed!', PHP_EOL;
-}
-
-?>
---EXPECT--
-Test failed!
-
+--TEST--
+DomDocument::createProcessingInstruction() - error test for
DomDocument::createProcessingInstruction()
+--CREDITS--
+Muhammad Khalid Adnan
+# TestFest 2008
+--FILE--
+<?php
+
+$doc = new DOMDocument;
+
+$node = $doc->createElement("para");
+$newnode = $doc->appendChild($node);
+
+try {
+ $test_proc_inst =
+ $doc->createProcessingInstruction( "bla bla bla" );
+ $node->appendChild($test_proc_inst);
+
+ echo $doc->saveXML();
+}
+catch (DOMException $e)
+{
+ echo 'Test failed!', PHP_EOL;
+}
+
+?>
+--EXPECT--
+Test failed!
+
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt
diff -u php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt:1.4
php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt:1.5
--- php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt:1.4 Sun Jul
13 21:22:41 2008
+++ php-src/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt Mon Dec
1 11:30:39 2008
@@ -3,8 +3,6 @@
--CREDITS--
Mike Sullivan <[EMAIL PROTECTED]>
#TestFest 2008 (London)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
--FILE--
<?php
@@ -34,4 +32,4 @@
Comment Content: data><&"
<?xml version="1.0"?>
-<root><comment><!--data><&"--></comment></root>
+<root><comment><!--data><&"--></comment></root>
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMText_appendData_basic.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/dom/tests/DOMText_appendData_basic.phpt
diff -u php-src/ext/dom/tests/DOMText_appendData_basic.phpt:1.4
php-src/ext/dom/tests/DOMText_appendData_basic.phpt:1.5
--- php-src/ext/dom/tests/DOMText_appendData_basic.phpt:1.4 Sun Jul 13
21:22:41 2008
+++ php-src/ext/dom/tests/DOMText_appendData_basic.phpt Mon Dec 1 11:30:39 2008
@@ -3,8 +3,6 @@
--CREDITS--
Mike Sullivan <[EMAIL PROTECTED]>
#TestFest 2008 (London)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
--FILE--
<?php
@@ -34,4 +32,4 @@
Text Content: data><&"
<?xml version="1.0"?>
-<root><text>data><&"</text></root>
+<root><text>data><&"</text></root>
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
