pajoye          Wed Jul 26 23:24:11 2006 UTC

  Modified files:              
    /php-src/ext/filter/tests   033.phpt 033_run.inc 
  Log:
  - fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/033.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/filter/tests/033.phpt
diff -u php-src/ext/filter/tests/033.phpt:1.4 
php-src/ext/filter/tests/033.phpt:1.5
--- php-src/ext/filter/tests/033.phpt:1.4       Wed Jul 19 08:25:45 2006
+++ php-src/ext/filter/tests/033.phpt   Wed Jul 26 23:24:11 2006
@@ -7,19 +7,19 @@
 --EXPECT--     
 int                      1                                               123   
                                            
 boolean                  1                                                     
                                            
-float                    1                                                     
                                            
+float                    1                                               123   
                                            
 validate_regexp                                                                
                   O'Henry                  
-validate_url                               http://a.b.c
+validate_url        PHP  1  [EMAIL PROTECTED]    http://a.b.c        1.2.3.4   
123  123abc<>()          O'Henry        하퍼    
 validate_email              [EMAIL PROTECTED]                                  
                                                  
 validate_ip                                                    1.2.3.4         
                                            
 string              PHP  1  [EMAIL PROTECTED]    http://a.b.c        1.2.3.4   
123  123abc()            O&#39;Henry    하퍼    
-stripped            PHP  1  [EMAIL PROTECTED]    http://a.b.c        1.2.3.4   
123  123abc()            OHenry         하퍼    
+stripped            PHP  1  [EMAIL PROTECTED]    http://a.b.c        1.2.3.4   
123  123abc()            O&#39;Henry    하퍼    
 encoded             PHP  1  foo%40bar.com  http%3A%2F%2Fa.b.c  1.2.3.4   123  
123abc%3C%3E%28%29  O%27Henry      %ED%95%98%ED%8D%BC
 special_chars       PHP  1  [EMAIL PROTECTED]    http://a.b.c        1.2.3.4   
123  123abc&#60;&#62;()  O&#39;Henry    하퍼    
 unsafe_raw          PHP  1  [EMAIL PROTECTED]    http://a.b.c        1.2.3.4   
123  123abc<>()          O'Henry        하퍼    
 email               PHP  1  [EMAIL PROTECTED]    http//a.b.c         1.2.3.4   
123  123abc              O'Henry                  
 url                 PHP  1  [EMAIL PROTECTED]    http://a.b.c        1.2.3.4   
123  123abc<>()          O'Henry                  
 number_int               1                                     1234      123  
123                                          
-number_float             1                                     1.2.3.4   123  
123                                          
+number_float             1                                     1234      123  
123                                          
 magic_quotes        PHP  1  [EMAIL PROTECTED]    http://a.b.c        1.2.3.4   
123  123abc<>()          O\'Henry       하퍼    
 callback            PHP  1  [EMAIL PROTECTED]    HTTP://A.B.C        1.2.3.4   
123  123ABC<>()          O'HENRY        하퍼  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/033_run.inc?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/filter/tests/033_run.inc
diff -u php-src/ext/filter/tests/033_run.inc:1.1 
php-src/ext/filter/tests/033_run.inc:1.2
--- php-src/ext/filter/tests/033_run.inc:1.1    Wed Jul 19 08:25:45 2006
+++ php-src/ext/filter/tests/033_run.inc        Wed Jul 26 23:24:11 2006
@@ -2,22 +2,34 @@
 function test($data) {
   return strtoupper($data);
 }
-$data = array("PHP","1","[EMAIL 
PROTECTED]","http://a.b.c","1.2.3.4","123","123abc<>()","O'Henry", "하퍼");
+$data = array(
+       "PHP",
+       "1",
+       "[EMAIL PROTECTED]",
+       "http://a.b.c";,
+       "1.2.3.4",
+       "123",
+       "123abc<>()",
+       "O'Henry",
+       "하퍼"
+);
+
+
 foreach(input_filters_list() as $filter) {
-  if($filter=="validate_regexp") {
-    foreach($data as $k=>$d) $result[$k] = 
filter_data($d,input_name_to_filter($filter),array("regexp"=>'/^O.*/'));
-  } else {
-    foreach($data as $k=>$d) $result[$k] = 
filter_data($d,input_name_to_filter($filter),"test");
-  }
-  printf("%-20s",$filter);
-  printf("%-5s",$result[0]);
-  printf("%-3s",$result[1]);
-  printf("%-15s",$result[2]);
-  printf("%-20s",$result[3]);
-  printf("%-10s",$result[4]);
-  printf("%-5s",$result[5]);
-  printf("%-20s",$result[6]);
-  printf("%-15s",$result[7]);
-  printf("%-10s\n",$result[8]);
+       if($filter=="validate_regexp") {
+               foreach($data as $k=>$d) $result[$k] = 
filter_data($d,input_name_to_filter($filter),array("regexp"=>'/^O.*/'));
+       } else {
+               foreach($data as $k=>$d) $result[$k] = 
filter_data($d,input_name_to_filter($filter),"test");
+       }
+       printf("%-20s",$filter);
+       printf("%-5s",$result[0]);
+       printf("%-3s",$result[1]);
+       printf("%-15s",$result[2]);
+       printf("%-20s",$result[3]);
+       printf("%-10s",$result[4]);
+       printf("%-5s",$result[5]);
+       printf("%-20s",$result[6]);
+       printf("%-15s",$result[7]);
+       printf("%-10s\n",$result[8]);
 }
 ?>

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

Reply via email to