Fix typo in data sanitizer and added encoding support

1 files changed, 13 insertions, 5 deletions

diff --git a/tests/it_xml.t b/tests/it_xml.t
index a0922c5..8c2c084 100755
--- a/tests/it_xml.t
+++ b/tests/it_xml.t
@@ -3,11 +3,11 @@
 
 # Tests for xml.class
 
-function match($xmldata, $expected, $name, $prefix = "")
+function match($xmldata, $expected, $name, $prefix = "", $p = array())
 {
 	$classname = $prefix ? ($prefix . "_xml") : "it_xml";
 	$varname  = $prefix . "foo";
-	$xml = new $classname("<root>$xmldata</root>");
+	$xml = new $classname("<root>$xmldata</root>", $p);
 
 	is(
 		preg_replace('/[#\s]+/', " ", print_r($xml->$varname, true)),
@@ -47,9 +47,17 @@ match(
 );
 
 match(
-	'<foo>&amp;&lt;&gt;&#38;&#60;&#62;&#x26;&#x3C;&#x3E; &uuml;</foo>',
-	'foo Object ( [val] => &<>&<>&<> ü ) ',
-	'Predecode illegal entities',
+	'<foo>&amp;amp; &lt;a&gt; &#38;amp; &#60;b&#62; &#x26;amp; &#x3C;c&#x3E; &uuml;</foo>',
+	'foo Object ( [val] => &amp; <a> &amp; <b> &amp; <c> ü ) ',
+	'Predecode illegal entities while keeping properly encoded ones',
+);
+
+match(
+	'<foo>&amp;amp; &lt;a&gt; &#38;amp; &#60;b&#62; &#x26;amp; &#x3C;c&#x3E; &uuml;</foo>',
+	utf8_encode('foo Object ( [val] => &amp; <a> &amp; <b> &amp; <c> ü ) '),
+	'Predecode illegal entities while keeping properly encoded ones (UTF-8)',
+	"",
+	array('encoding' => "UTF-8"),
 );