From 4c3b61356b9fe001c5637c30f6105a208f4dffc3 Mon Sep 17 00:00:00 2001
From: Christian Schneider
Date: Sun, 15 Jul 2007 14:26:40 +0000
Subject: Make itools tests work under PHP4 and PHP5
---
tests/itjs.t | 2 +-
tests/xml.t | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/itjs.t b/tests/itjs.t
index 7fa6b03..4b4b0c8 100755
--- a/tests/itjs.t
+++ b/tests/itjs.t
@@ -19,7 +19,7 @@ is(
is(
itjs::serialize(array(null, "", false)),
- '["", "", ""]',
+ '["", "", false]',
'null, empty string, false'
);
diff --git a/tests/xml.t b/tests/xml.t
index 8e72a77..5d652cc 100755
--- a/tests/xml.t
+++ b/tests/xml.t
@@ -12,7 +12,7 @@ function match($xmldata, $expected, $name, $prefix = "")
$xml = new $classname("<root>$xmldata</root>");
is(
- preg_replace('/[#\s]+/', " ", search_test::dump($xml->$varname)),
+ preg_replace('/[#\s]+/', " ", print_r($xml->$varname, true)),
$expected,
$name,
);
@@ -20,25 +20,25 @@ function match($xmldata, $expected, $name, $prefix = "")
match(
'<foo />',
- 'class foo { }',
+ 'foo Object ( ) ',
'empty tag'
);
match(
'<foo /><foo />',
- 'array ( 0 => class foo { }, 1 => class foo { }, )',
+ 'Array ( [0] => foo Object ( ) [1] => foo Object ( ) ) ',
'multiple empty tags converted to array'
);
match(
'<foo title="Z�rich">St�ssihofstadt</foo>',
- 'class foo { var $attr = array( \'title\' => \'Z�rich\' ); var $val = \'St�ssihofstadt\'; }',
+ 'foo Object ( [attr] => Array ( [title] => Z�rich ) [val] => St�ssihofstadt ) ',
'simple tag with latin1 content and attribute'
);
match(
'<foo><ns:a.b.-c ns2:d.e-f="value" /></foo>',
- 'class foo { var $a_b__c = class a_b__c { var $attr = array( \'d_e_f\' => \'value\' ); }; }',
+ 'foo Object ( [a_b__c] => a_b__c Object ( [attr] => Array ( [d_e_f] => value ) ) ) ',
'Tags and attributes with name space and special characters'
);
@@ -62,7 +62,7 @@ function my_xml($xmldata)
match(
'<myfoo />',
- 'class myfoo { var $inheritbaseclass = false; }',
+ 'myfoo Object ( [inheritbaseclass] => ) ',
'Inheritance and constructor (critical for e.g. tel_xmlentry)',
'my'
);
--
cgit v1.2.3