From: andy wharmby Date: Tue, 23 Jun 2009 22:45:33 +0000 (+0000) Subject: New and fixed html tests. Tested in Windows, Linux and Linux 64. X-Git-Tag: php-5.2.11RC1~240 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30cadad9033cce02fefaf591975bda5735114919;p=php New and fixed html tests. Tested in Windows, Linux and Linux 64. --- diff --git a/ext/standard/tests/strings/htmlentities09.phpt b/ext/standard/tests/strings/htmlentities09.phpt index 4c6ef60c74..bdf6d0970c 100644 --- a/ext/standard/tests/strings/htmlentities09.phpt +++ b/ext/standard/tests/strings/htmlentities09.phpt @@ -16,8 +16,8 @@ output_handler= --EXPECT-- SJIS -string(6) "ABC" +string(12) "814181428143" diff --git a/ext/standard/tests/strings/htmlentities16.phpt b/ext/standard/tests/strings/htmlentities16.phpt index 0f945280b5..438b0e490b 100644 --- a/ext/standard/tests/strings/htmlentities16.phpt +++ b/ext/standard/tests/strings/htmlentities16.phpt @@ -14,8 +14,10 @@ output_handler= +===DONE=== --EXPECT-- -string(11) "ˆ©ðîñêîøíûé" +string(22) "88a9f0eef1eaeef8edfbe9" string(75) "€©роскошный" +===DONE=== diff --git a/ext/standard/tests/strings/htmlspecialchars_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_basic.phpt new file mode 100644 index 0000000000..3ef932a70b --- /dev/null +++ b/ext/standard/tests/strings/htmlspecialchars_basic.phpt @@ -0,0 +1,97 @@ +--TEST-- +Test htmlspecialchars() function : basic functionality +--FILE-- +\"&\n"; +$s2 = "&&abc<>\"&\n"; +$s3 = "a>,\\"&\n"; +$s4 = "a\'\'&bc<>\"&\n"; +$s5 = "&<\n"; +echo "Basic tests\n"; +echo "Test 1: " . htmlspecialchars ($s1); +echo "Test 2: " . htmlspecialchars ($s2); +echo "Test 3: " . htmlspecialchars ($s3); +echo "Test 4: " . htmlspecialchars ($s4); +echo "Test 5: " . htmlspecialchars ($s5); +echo "Test 6: " . htmlspecialchars ($s1,ENT_NOQUOTES); +echo "Test 7: " . htmlspecialchars ($s2,ENT_NOQUOTES); +echo "Test 8: " . htmlspecialchars ($s3,ENT_NOQUOTES); +echo "Test 9: " . htmlspecialchars ($s4,ENT_NOQUOTES); +echo "Test 10: " . htmlspecialchars ($s5,ENT_NOQUOTES); +echo "Test 11: " . htmlspecialchars ($s1,ENT_COMPAT); +echo "Test 12: " . htmlspecialchars ($s2,ENT_COMPAT); +echo "Test 13: " . htmlspecialchars ($s3,ENT_COMPAT); +echo "Test 14: " . htmlspecialchars ($s4,ENT_COMPAT); +echo "Test 15: " . htmlspecialchars ($s5,ENT_COMPAT); +echo "Test 16: " . htmlspecialchars ($s1,ENT_QUOTES); +echo "Test 17: " . htmlspecialchars ($s2,ENT_QUOTES); +echo "Test 18: " . htmlspecialchars ($s3,ENT_QUOTES); +echo "Test 19: " . htmlspecialchars ($s4,ENT_QUOTES); +echo "Test 20: " . htmlspecialchars ($s5,ENT_QUOTES); + +echo "\nTry with char set option - specify default ISO-8859-1\n"; +echo "Test 21: " . htmlspecialchars ($s1,ENT_NOQUOTES, "ISO-8859-1"); +echo "Test 22: " . htmlspecialchars ($s2,ENT_COMPAT, "ISO-8859-1"); +echo "Test 23: " . htmlspecialchars ($s3,ENT_QUOTES, "ISO-8859-1"); +echo "Test 24: " . htmlspecialchars ($s5,ENT_QUOTES, "ISO-8859-1"); + +echo "\nTry with double decode FALSE\n"; +$s1 = ""&xyz>abc"\n"; +$s2 = ""&123<456"\n"; +$s3 = "\"300 < 400\"\n"; +echo "Test 25: " . htmlspecialchars ($s1,ENT_NOQUOTES, "ISO-8859-1", false); +echo "Test 26: " . htmlspecialchars ($s2,ENT_NOQUOTES, "ISO-8859-1", false); +echo "Test 27: " . htmlspecialchars ($s3,ENT_NOQUOTES, "ISO-8859-1", false); + +echo "\nTry with double decode TRUE\n"; +echo "Test 28: " . htmlspecialchars ($s1, ENT_NOQUOTES, "ISO-8859-1", true); +echo "Test 29: " . htmlspecialchars ($s2, ENT_NOQUOTES, "ISO-8859-1", true); + +?> +===DONE=== +--EXPECT-- +*** Testing htmlspecialchars() : basic functionality *** +Basic tests +Test 1: abc<>"& +Test 2: &&abc<>"& +Test 3: a>,\<bc<>"& +Test 4: a\'\'&bc<>"& +Test 5: &amp;&lt; +Test 6: abc<>"& +Test 7: &&abc<>"& +Test 8: a>,\<bc<>"& +Test 9: a\'\'&bc<>"& +Test 10: &amp;&lt; +Test 11: abc<>"& +Test 12: &&abc<>"& +Test 13: a>,\<bc<>"& +Test 14: a\'\'&bc<>"& +Test 15: &amp;&lt; +Test 16: abc<>"& +Test 17: &&abc<>"& +Test 18: a>,\<bc<>"& +Test 19: a\'\'&bc<>"& +Test 20: &amp;&lt; + +Try with char set option - specify default ISO-8859-1 +Test 21: abc<>"& +Test 22: &&abc<>"& +Test 23: a>,\<bc<>"& +Test 24: &amp;&lt; + +Try with double decode FALSE +Test 25: "&xyz>abc" +Test 26: "&123<456" +Test 27: "300 < 400" + +Try with double decode TRUE +Test 28: &quot;&amp;xyz&gt;abc&quot; +Test 29: &quot;&amp;123&lt;456&quot; +===DONE=== \ No newline at end of file diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt index 5f0582d51e..81765f5974 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt @@ -31,51 +31,51 @@ unset($unset_var); //array of values to iterate over $values = array( - // int data - 0, - 1, - 12345, - -2345, - - // float data - 10.5, - -10.5, - 10.5e10, - 10.6E-10, - .5, - - // array data - array(), - array(0), - array(1), - array(1, 2), - array('color' => 'red', 'item' => 'pen'), - - // null data - NULL, - null, - - // boolean data - true, - false, - TRUE, - FALSE, - - // empty data - "", - '', - - // object data - new classA(), - - // undefined data - @$undefined_var, - - // unset data - @$unset_var, - - //resource - $file_handle + // int data +/*1*/ 0, + 1, + 12345, + -2345, + + // float data +/*5*/ 10.5, + -10.5, + 10.1234567e10, + 10.7654321E-10, + .5, + + // array data +/*10*/ array(), + array(0), + array(1), + array(1, 2), + array('color' => 'red', 'item' => 'pen'), + + // null data +/*15*/ NULL, + null, + + // boolean data +/*17*/ true, + false, + TRUE, + FALSE, + + // empty data +/*21*/ "", + '', + + // object data +/*23*/ new classA(), + + // undefined data +/*24*/ @$undefined_var, + + // unset data +/*25*/ @$unset_var, + + //resource +/*26*/ $file_handle ); // loop through each element of the array for string @@ -89,8 +89,8 @@ foreach($values as $value) { // close the file resource used fclose($file_handle); -echo "Done"; ?> +===DONE=== --EXPECTF-- *** Testing htmlspecialchars_decode() : usage variations *** -- Iterator 1 -- @@ -106,9 +106,9 @@ string(4) "10.5" -- Iterator 6 -- string(5) "-10.5" -- Iterator 7 -- -string(12) "105000000000" +string(12) "101234567000" -- Iterator 8 -- -string(7) "1.06E-9" +string(13) "1.07654321E-9" -- Iterator 9 -- string(3) "0.5" -- Iterator 10 -- @@ -157,4 +157,4 @@ string(0) "" Warning: htmlspecialchars_decode() expects parameter 1 to be string, resource given in %s on line %d NULL -Done +===DONE=== diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt index d1636eb156..ea932e9d93 100644 Binary files a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt and b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt differ