wharmby         Tue Jan 20 22:54:39 2009 UTC

  Modified files:              
    /php-src/ext/standard/tests/strings stripcslashes_error.phpt 
                                        stripcslashes_variation1.phpt 
                                        stripcslashes_basic.phpt 
                                        strip_tags_variation1.phpt 
                                        strip_tags_variation3.phpt 
                                        stripslashes_variation1.phpt 
  Log:
  New stripcslashes() tests. Tested on Window, Linux and Linux 64 bit
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripcslashes_error.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/stripcslashes_error.phpt
diff -u /dev/null 
php-src/ext/standard/tests/strings/stripcslashes_error.phpt:1.2
--- /dev/null   Tue Jan 20 22:54:39 2009
+++ php-src/ext/standard/tests/strings/stripcslashes_error.phpt Tue Jan 20 
22:54:39 2009
@@ -0,0 +1,34 @@
+--TEST--
+Test stripcslashes() function :  error conditions 
+--FILE--
+<?php
+
+/* Prototype  : string stripcslashes  ( string $str  )
+ * Description: Returns a string with backslashes stripped off. Recognizes 
C-like \n, \r ..., 
+ *              octal and hexadecimal representation.
+ * Source code: ext/standard/string.c
+*/
+
+echo "*** Testing stripcslashes() : unexpected number of arguments ***";
+
+
+echo "\n-- Testing stripcslashes() function with no arguments --\n";
+var_dump( stripcslashes() );
+
+echo "\n-- Testing stripcslashes() function with more than expected no. of 
arguments --\n";
+$extra_arg = 10;
+var_dump( stripcslashes("abc def", $extra_arg) );
+?>
+===DONE===
+--EXPECTF--
+*** Testing stripcslashes() : unexpected number of arguments ***
+-- Testing stripcslashes() function with no arguments --
+
+Warning: stripcslashes() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+-- Testing stripcslashes() function with more than expected no. of arguments --
+
+Warning: stripcslashes() expects exactly 1 parameter, 2 given in %s on line %d
+NULL
+===DONE===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripcslashes_variation1.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/stripcslashes_variation1.phpt
diff -u /dev/null 
php-src/ext/standard/tests/strings/stripcslashes_variation1.phpt:1.2
--- /dev/null   Tue Jan 20 22:54:39 2009
+++ php-src/ext/standard/tests/strings/stripcslashes_variation1.phpt    Tue Jan 
20 22:54:39 2009
@@ -0,0 +1,178 @@
+--TEST--
+Test stripcslashes() function : usage variations  - non-string type argument 
+--INI--
+--FILE--
+<?php
+/* Prototype  : string stripcslashes  ( string $str  )
+ * Description: Returns a string with backslashes stripped off. Recognizes 
C-like \n, \r ..., 
+ *              octal and hexadecimal representation.
+ * Source code: ext/standard/string.c
+*/
+
+/*
+ * Test stripcslashes() with non-string type argument such as int, float, etc 
+*/
+
+echo "*** Testing stripcslashes() : with non-string type argument ***\n";
+// initialize all required variables
+
+// get an unset variable
+$unset_var = 'string_val';
+unset($unset_var);
+
+// declaring a class
+class sample  {
+  public function __toString() {
+  return "object";
+  } 
+}
+
+// Defining resource
+$file_handle = fopen(__FILE__, 'r');
+
+// array with different values
+$values =  array (
+
+                 // integer values
+/*1*/    0,
+                 1,
+                 12345,
+                 -2345,
+               
+                 // float values
+/*5*/    10.5,
+                 -10.5,
+                 10.1234567e10,
+                 10.7654321E-10,
+                 .5,
+               
+                 // array values
+/*10*/   array(),
+                 array(0),
+                 array(1),
+                 array(1, 2),
+                 array('color' => 'red', 'item' => 'pen'),
+               
+                 // boolean values
+/*15*/   true,
+                 false,
+                 TRUE,
+                 FALSE,
+               
+                 // empty string
+/*19*/   "",
+                 '',
+               
+                 // undefined variable
+/*21*/   $undefined_var,
+               
+                 // unset variable
+/*22*/   $unset_var,
+                 
+                 // objects
+/*23*/   new sample(),
+               
+                 // resource
+/*24*/   $file_handle,
+                
+                 // null values
+/*25*/   NULL,
+                 null
+);
+
+
+// loop through each element of the array and check the working of 
stripcslashes()
+// when $str arugment is supplied with different values
+echo "\n--- Testing stripcslashes() by supplying different values for 'str' 
argument ---\n";
+$counter = 1;
+for($index = 0; $index < count($values); $index ++) {
+  echo "-- Iteration $counter --\n";
+  $str = $values [$index];
+
+  var_dump( stripcslashes($str) );
+
+  $counter ++;
+}
+
+// closing the file
+fclose($file_handle);
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing stripcslashes() : with non-string type argument ***
+
+Notice: Undefined variable: undefined_var in %s on line %d
+
+Notice: Undefined variable: unset_var in %s on line %d
+
+--- Testing stripcslashes() by supplying different values for 'str' argument 
---
+-- Iteration 1 --
+string(1) "0"
+-- Iteration 2 --
+string(1) "1"
+-- Iteration 3 --
+string(5) "12345"
+-- Iteration 4 --
+string(5) "-2345"
+-- Iteration 5 --
+string(4) "10.5"
+-- Iteration 6 --
+string(5) "-10.5"
+-- Iteration 7 --
+string(12) "101234567000"
+-- Iteration 8 --
+string(13) "1.07654321E-9"
+-- Iteration 9 --
+string(3) "0.5"
+-- Iteration 10 --
+
+Warning: stripcslashes() expects parameter 1 to be binary string, array given 
in %s on line %d
+NULL
+-- Iteration 11 --
+
+Warning: stripcslashes() expects parameter 1 to be binary string, array given 
in %s on line %d
+NULL
+-- Iteration 12 --
+
+Warning: stripcslashes() expects parameter 1 to be binary string, array given 
in %s on line %d
+NULL
+-- Iteration 13 --
+
+Warning: stripcslashes() expects parameter 1 to be binary string, array given 
in %s on line %d
+NULL
+-- Iteration 14 --
+
+Warning: stripcslashes() expects parameter 1 to be binary string, array given 
in %s on line %d
+NULL
+-- Iteration 15 --
+string(1) "1"
+-- Iteration 16 --
+string(0) ""
+-- Iteration 17 --
+string(1) "1"
+-- Iteration 18 --
+string(0) ""
+-- Iteration 19 --
+
+Warning: stripcslashes() expects parameter 1 to be strictly a binary string, 
Unicode string given in %s on line %d
+NULL
+-- Iteration 20 --
+
+Warning: stripcslashes() expects parameter 1 to be strictly a binary string, 
Unicode string given in %s on line %d
+NULL
+-- Iteration 21 --
+string(0) ""
+-- Iteration 22 --
+string(0) ""
+-- Iteration 23 --
+string(6) "object"
+-- Iteration 24 --
+
+Warning: stripcslashes() expects parameter 1 to be binary string, resource 
given in %s on line %d
+NULL
+-- Iteration 25 --
+string(0) ""
+-- Iteration 26 --
+string(0) ""
+===DONE===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripcslashes_basic.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/stripcslashes_basic.phpt
diff -u /dev/null 
php-src/ext/standard/tests/strings/stripcslashes_basic.phpt:1.2
--- /dev/null   Tue Jan 20 22:54:39 2009
+++ php-src/ext/standard/tests/strings/stripcslashes_basic.phpt Tue Jan 20 
22:54:39 2009
@@ -0,0 +1,27 @@
+--TEST--
+Test stripcslashes() function : basic functionality 
+--FILE--
+<?php
+
+/* Prototype  : string stripcslashes  ( string $str  )
+ * Description: Returns a string with backslashes stripped off. Recognizes 
C-like \n, \r ..., 
+ *              octal and hexadecimal representation.
+ * Source code: ext/standard/string.c
+*/
+
+echo "*** Testing stripcslashes() : basic functionality ***\n";
+var_dump(stripcslashes(b'\H\e\l\l\o \W\or\l\d'));
+var_dump(stripcslashes(b'Hello World\\r\\n'));
+var_dump(stripcslashes(b'\x48\x65\x6c\x6c\x6f \x57\x6f\x72\x6c\x64'));
+var_dump(stripcslashes(b'\110\145\154\154\157 \127\157\162\154\144'));
+
+?>
+===DONE===
+--EXPECT--
+*** Testing stripcslashes() : basic functionality ***
+string(11) "Hello World"
+string(13) "Hello World
+"
+string(11) "Hello World"
+string(11) "Hello World"
+===DONE===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_variation1.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_variation1.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_variation1.phpt:1.3 
php-src/ext/standard/tests/strings/strip_tags_variation1.phpt:1.4
--- php-src/ext/standard/tests/strings/strip_tags_variation1.phpt:1.3   Tue May 
27 10:50:46 2008
+++ php-src/ext/standard/tests/strings/strip_tags_variation1.phpt       Tue Jan 
20 22:54:39 2009
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : usage variations - unexpected values for 'str' 
argument
 --INI--
-short_open_tag = on
+set short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
@@ -32,51 +32,51 @@
 //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 variable
-      $fp
+                     // 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 variable
+/*26*/       $fp
 
 );
 
@@ -88,8 +88,8 @@
       $iterator++;
 };
 
-echo "Done";
 ?>
+===DONE===
 --EXPECTF--
 *** Testing strip_tags() : usage variations ***
 -- Iteration 1 --
@@ -105,9 +105,9 @@
 -- Iteration 6 --
 unicode(5) "-10.5"
 -- Iteration 7 --
-unicode(12) "105000000000"
+unicode(12) "101234567000"
 -- Iteration 8 --
-unicode(7) "1.06E-9"
+unicode(13) "1.07654321E-9"
 -- Iteration 9 --
 unicode(3) "0.5"
 -- Iteration 10 --
@@ -156,4 +156,4 @@
 
 Warning: strip_tags() expects parameter 1 to be string (Unicode or binary), 
resource given in %s on line %d
 NULL
-Done
+===DONE===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_variation3.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_variation3.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_variation3.phpt:1.3 
php-src/ext/standard/tests/strings/strip_tags_variation3.phpt:1.4
--- php-src/ext/standard/tests/strings/strip_tags_variation3.phpt:1.3   Tue May 
27 10:50:46 2008
+++ php-src/ext/standard/tests/strings/strip_tags_variation3.phpt       Tue Jan 
20 22:54:39 2009
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : usage variations - unexpected values for both 
'str' and 'allowable_tags'
 --INI--
-short_open_tag = on
+set short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
@@ -32,52 +32,51 @@
 //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 variable
-      $fp
-
+                     // 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 variable
+/*26*/       $fp
 );
 
 // loop through each element of the array for allowable_tags
@@ -88,8 +87,8 @@
       $iterator++;
 };
 
-echo "Done";
 ?>
+===DONE===
 --EXPECTF--
 *** Testing strip_tags() : usage variations ***
 -- Iteration 1 --
@@ -105,9 +104,9 @@
 -- Iteration 6 --
 unicode(5) "-10.5"
 -- Iteration 7 --
-unicode(12) "105000000000"
+unicode(12) "101234567000"
 -- Iteration 8 --
-unicode(7) "1.06E-9"
+unicode(13) "1.07654321E-9"
 -- Iteration 9 --
 unicode(3) "0.5"
 -- Iteration 10 --
@@ -156,4 +155,4 @@
 
 Warning: strip_tags() expects parameter 1 to be string (Unicode or binary), 
resource given in %s on line %d
 NULL
-Done
+===DONE===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripslashes_variation1.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/standard/tests/strings/stripslashes_variation1.phpt
diff -u php-src/ext/standard/tests/strings/stripslashes_variation1.phpt:1.6 
php-src/ext/standard/tests/strings/stripslashes_variation1.phpt:1.7
--- php-src/ext/standard/tests/strings/stripslashes_variation1.phpt:1.6 Mon Aug 
25 13:44:33 2008
+++ php-src/ext/standard/tests/strings/stripslashes_variation1.phpt     Tue Jan 
20 22:54:39 2009
@@ -21,7 +21,7 @@
 // declaring a class
 class sample  {
   public function __toString() {
-  return "obj\'ct";
+  return "object";
   } 
 }
 
@@ -31,51 +31,51 @@
 // array with different values
 $values =  array (
 
-  // integer values
-  0,
-  1,
-  12345,
-  -2345,
-
-  // float values
-  10.5,
-  -10.5,
-  10.5e10,
-  10.6E-10,
-  .5,
-
-  // array values
-  array(),
-  array(0),
-  array(1),
-  array(1, 2),
-  array('color' => 'red', 'item' => 'pen'),
-
-  // boolean values
-  true,
-  false,
-  TRUE,
-  FALSE,
-
-  // empty string
-  "",
-  '',
-
-  // undefined variable
-  $undefined_var,
-
-  // unset variable
-  $unset_var,
-  
-  // objects
-  new sample(),
-
-  // resource
-  $file_handle,
-
-  // NULL values 
-  NULL,
-  null
+                 // integer values
+/*1*/    0,
+                 1,
+                 12345,
+                 -2345,
+               
+                 // float values
+/*5*/    10.5,
+                 -10.5,
+                 10.1234567e10,
+                 10.7654321E-10,
+                 .5,
+               
+                 // array values
+/*10*/   array(),
+                 array(0),
+                 array(1),
+                 array(1, 2),
+                 array('color' => 'red', 'item' => 'pen'),
+               
+                 // boolean values
+/*15*/   true,
+                 false,
+                 TRUE,
+                 FALSE,
+               
+                 // empty string
+/*19*/   "",
+                 '',
+               
+                 // undefined variable
+/*21*/   $undefined_var,
+               
+                 // unset variable
+/*22*/   $unset_var,
+                 
+                 // objects
+/*23*/   new sample(),
+               
+                 // resource
+/*24*/   $file_handle,
+                
+                 // null values
+/*25*/   NULL,
+                 null
 );
 
 
@@ -95,8 +95,8 @@
 // closing the file
 fclose($file_handle);
 
-echo "Done\n";
 ?>
+===DONE===
 --EXPECTF--
 *** Testing stripslashes() : with non-string type argument ***
 
@@ -118,9 +118,9 @@
 -- Iteration 6 --
 unicode(5) "-10.5"
 -- Iteration 7 --
-unicode(12) "105000000000"
+unicode(12) "101234567000"
 -- Iteration 8 --
-unicode(7) "1.06E-9"
+unicode(13) "1.07654321E-9"
 -- Iteration 9 --
 unicode(3) "0.5"
 -- Iteration 10 --
@@ -160,7 +160,7 @@
 -- Iteration 22 --
 unicode(0) ""
 -- Iteration 23 --
-unicode(6) "obj'ct"
+unicode(6) "object"
 -- Iteration 24 --
 
 Warning: stripslashes() expects parameter 1 to be string (Unicode or binary), 
resource given in %s on line %d
@@ -169,4 +169,4 @@
 unicode(0) ""
 -- Iteration 26 --
 unicode(0) ""
-Done
+===DONE===
\ No newline at end of file

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to