helly Tue Oct 29 07:12:20 2002 EDT
Modified files:
/php4/ext/xml/tests xml001.phpt xml002.phpt xml003.phpt xml004.phpt
xml007.phpt
Log:
Fix tests
#Why do i need to define the class infront of its usage in ZE2?
Index: php4/ext/xml/tests/xml001.phpt
diff -u php4/ext/xml/tests/xml001.phpt:1.1 php4/ext/xml/tests/xml001.phpt:1.2
--- php4/ext/xml/tests/xml001.phpt:1.1 Tue Oct 29 06:59:24 2002
+++ php4/ext/xml/tests/xml001.phpt Tue Oct 29 07:12:19 2002
@@ -2,6 +2,8 @@
XML parser test, function callbacks
--SKIPIF--
<?php include("skipif.inc"); ?>
+--INI--
+magic_quotes_runtime=0
--FILE--
<?php
chdir(dirname(__FILE__));
Index: php4/ext/xml/tests/xml002.phpt
diff -u php4/ext/xml/tests/xml002.phpt:1.1 php4/ext/xml/tests/xml002.phpt:1.2
--- php4/ext/xml/tests/xml002.phpt:1.1 Tue Oct 29 06:59:24 2002
+++ php4/ext/xml/tests/xml002.phpt Tue Oct 29 07:12:19 2002
@@ -2,35 +2,12 @@
XML parser test, object tuple callbacks
--SKIPIF--
<?php include("skipif.inc"); ?>
+--INI--
+magic_quotes_runtime=0
--FILE--
<?php
chdir(dirname(__FILE__));
-$xml_parser = xml_parser_create();
-$obj = new myclass;
-xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
-xml_set_element_handler($xml_parser, array($obj,"startElement"),
-array($obj, "endElement"));
-xml_set_character_data_handler($xml_parser, array($obj, "characterData"));
-xml_set_processing_instruction_handler($xml_parser, array($obj, "PIHandler"));
-xml_set_default_handler($xml_parser, array($obj, "defaultHandler"));
-xml_set_external_entity_ref_handler($xml_parser,
-array($obj, "externalEntityRefHandler"));
-
-if (!($fp = @fopen("xmltest.xml", "r"))) {
- die("could not open XML input");
-}
-
-while ($data = fread($fp, 4096)) {
- if (!xml_parse($xml_parser, $data, feof($fp))) {
- die(sprintf("XML error: %s at line %d\n",
- xml_error_string(xml_get_error_code($xml_parser)),
- xml_get_current_line_number($xml_parser)));
- }
-}
-print "parse complete\n";
-xml_parser_free($xml_parser);
-
class myclass
{
function startElement($parser, $name, $attribs)
@@ -69,6 +46,32 @@
return true;
}
}
+
+$xml_parser = xml_parser_create();
+$obj = new myclass;
+xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
+xml_set_element_handler($xml_parser, array($obj,"startElement"),
+array($obj, "endElement"));
+xml_set_character_data_handler($xml_parser, array($obj, "characterData"));
+xml_set_processing_instruction_handler($xml_parser, array($obj, "PIHandler"));
+xml_set_default_handler($xml_parser, array($obj, "defaultHandler"));
+xml_set_external_entity_ref_handler($xml_parser,
+array($obj, "externalEntityRefHandler"));
+
+if (!($fp = @fopen("xmltest.xml", "r"))) {
+ die("could not open XML input");
+}
+
+while ($data = fread($fp, 4096)) {
+ if (!xml_parse($xml_parser, $data, feof($fp))) {
+ die(sprintf("XML error: %s at line %d\n",
+ xml_error_string(xml_get_error_code($xml_parser)),
+ xml_get_current_line_number($xml_parser)));
+ }
+}
+print "parse complete\n";
+xml_parser_free($xml_parser);
+
?>
--EXPECT--
{?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[
Index: php4/ext/xml/tests/xml003.phpt
diff -u php4/ext/xml/tests/xml003.phpt:1.1 php4/ext/xml/tests/xml003.phpt:1.2
--- php4/ext/xml/tests/xml003.phpt:1.1 Tue Oct 29 06:59:24 2002
+++ php4/ext/xml/tests/xml003.phpt Tue Oct 29 07:12:19 2002
@@ -2,34 +2,12 @@
XML parser test, xml_set_object callbacks
--SKIPIF--
<?php include("skipif.inc"); ?>
+--INI--
+magic_quotes_runtime=0
--FILE--
<?php
chdir(dirname(__FILE__));
-$xml_parser = xml_parser_create();
-$obj = new myclass;
-xml_set_object($xml_parser, $obj);
-xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
-xml_set_element_handler($xml_parser, "startElement", "endElement");
-xml_set_character_data_handler($xml_parser, "characterData");
-xml_set_processing_instruction_handler($xml_parser, "PIHandler");
-xml_set_default_handler($xml_parser, "defaultHandler");
-xml_set_external_entity_ref_handler($xml_parser, "externalEntityRefHandler");
-
-if (!($fp = @fopen("xmltest.xml", "r"))) {
- die("could not open XML input");
-}
-
-while ($data = fread($fp, 4096)) {
- if (!xml_parse($xml_parser, $data, feof($fp))) {
- die(sprintf("XML error: %s at line %d\n",
- xml_error_string(xml_get_error_code($xml_parser)),
- xml_get_current_line_number($xml_parser)));
- }
-}
-print "parse complete\n";
-xml_parser_free($xml_parser);
-
class myclass
{
function startElement($parser, $name, $attribs)
@@ -68,6 +46,30 @@
return true;
}
}
+
+$xml_parser = xml_parser_create();
+$obj = new myclass;
+xml_set_object($xml_parser, $obj);
+xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
+xml_set_element_handler($xml_parser, "startElement", "endElement");
+xml_set_character_data_handler($xml_parser, "characterData");
+xml_set_processing_instruction_handler($xml_parser, "PIHandler");
+xml_set_default_handler($xml_parser, "defaultHandler");
+xml_set_external_entity_ref_handler($xml_parser, "externalEntityRefHandler");
+
+if (!($fp = @fopen("xmltest.xml", "r"))) {
+ die("could not open XML input");
+}
+
+while ($data = fread($fp, 4096)) {
+ if (!xml_parse($xml_parser, $data, feof($fp))) {
+ die(sprintf("XML error: %s at line %d\n",
+ xml_error_string(xml_get_error_code($xml_parser)),
+ xml_get_current_line_number($xml_parser)));
+ }
+}
+print "parse complete\n";
+xml_parser_free($xml_parser);
?>
--EXPECT--
{?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[
Index: php4/ext/xml/tests/xml004.phpt
diff -u php4/ext/xml/tests/xml004.phpt:1.1 php4/ext/xml/tests/xml004.phpt:1.2
--- php4/ext/xml/tests/xml004.phpt:1.1 Tue Oct 29 06:59:24 2002
+++ php4/ext/xml/tests/xml004.phpt Tue Oct 29 07:12:19 2002
@@ -2,6 +2,8 @@
XML parser case folding test
--SKIPIF--
<?php include("skipif.inc"); ?>
+--INI--
+magic_quotes_runtime=0
--FILE--
<?php
chdir(dirname(__FILE__));
Index: php4/ext/xml/tests/xml007.phpt
diff -u php4/ext/xml/tests/xml007.phpt:1.1 php4/ext/xml/tests/xml007.phpt:1.2
--- php4/ext/xml/tests/xml007.phpt:1.1 Tue Oct 29 06:59:24 2002
+++ php4/ext/xml/tests/xml007.phpt Tue Oct 29 07:12:19 2002
@@ -3,7 +3,7 @@
--SKIPIF--
<?php // vim600: syn=php
include("skipif.inc");
-if(strtoupper("äöü") == "äöü")
+if(strtoupper("äöüß") != "ÄÖÜß")
{
die("skip strtoupper on non-ascii not supported on this platform");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
