List:Commits« Previous MessageNext Message »
From:uwendel Date:June 18 2007 1:40pm
Subject:PHP mysqlnd svn commit: r384 - trunk/tests/ext/mysqli
View as plain text  
Author: uwendel
Date: 2007-06-18 15:40:31 +0200 (Mon, 18 Jun 2007)
New Revision: 384

Modified:
   trunk/tests/ext/mysqli/mysqli_character_set_name.phpt
   trunk/tests/ext/mysqli/mysqli_character_set_name_oo.phpt
   trunk/tests/ext/mysqli/mysqli_real_escape_string.phpt
   trunk/tests/ext/mysqli/mysqli_stmt_bind_param.phpt
   trunk/tests/ext/mysqli/mysqli_stmt_bind_result.phpt
   trunk/tests/ext/mysqli/mysqli_stmt_fetch.phpt
   trunk/tests/ext/mysqli/mysqli_stmt_param_count.phpt
   trunk/tests/ext/mysqli/mysqli_stmt_result_metadata.phpt
   trunk/tests/ext/mysqli/mysqli_stmt_send_long_data.phpt
Log:
Added dummy calls of function aliases. If the (partly deprecated) aliases do not exist,
the tests should fail.


Modified: trunk/tests/ext/mysqli/mysqli_character_set_name.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_character_set_name.phpt	2007-06-18 10:37:31 UTC (rev
383)
+++ trunk/tests/ext/mysqli/mysqli_character_set_name.phpt	2007-06-18 13:40:31 UTC (rev
384)
@@ -61,6 +61,10 @@
     
     if (NULL !== ($tmp = @mysqli_character_set_name($link)))
         printf("[013] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); 
+
+    /* Make sure that the function alias exists */   
+    if (!is_null($tmp = @mysqli_client_encoding()))
+        printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);        
     
     print "done!\n"; 
 ?>

Modified: trunk/tests/ext/mysqli/mysqli_character_set_name_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_character_set_name_oo.phpt	2007-06-18 10:37:31 UTC (rev
383)
+++ trunk/tests/ext/mysqli/mysqli_character_set_name_oo.phpt	2007-06-18 13:40:31 UTC (rev
384)
@@ -54,7 +54,11 @@
     $mysqli->close();
 
     if (NULL !== ($tmp = @$mysqli->character_set_name()))
-        printf("[013] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); 
+        printf("[013] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+        
+    /* Make sure that the function alias exists */
+    if (!is_null($tmp = @$mysqli->client_encoding()))
+        printf("[014] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);    
     
     print "done!\n"; 
 ?>

Modified: trunk/tests/ext/mysqli/mysqli_real_escape_string.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_real_escape_string.phpt	2007-06-18 10:37:31 UTC (rev
383)
+++ trunk/tests/ext/mysqli/mysqli_real_escape_string.phpt	2007-06-18 13:40:31 UTC (rev
384)
@@ -45,6 +45,10 @@
     if (NULL !== ($tmp = mysqli_real_escape_string($link, 'foo')))
         printf("[010] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
         
+    /* Make sure that the function alias exists */
+    if (NULL !== ($tmp = @mysqli_escape_string()))
+        printf("[011] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+        
     print "done!";
 ?>
 --EXPECTF--

Modified: trunk/tests/ext/mysqli/mysqli_stmt_bind_param.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_bind_param.phpt	2007-06-18 10:37:31 UTC (rev 383)
+++ trunk/tests/ext/mysqli/mysqli_stmt_bind_param.phpt	2007-06-18 13:40:31 UTC (rev 384)
@@ -274,10 +274,17 @@
     mysqli_stmt_execute($stmt);
     
     if (!true === ($tmp = mysqli_stmt_bind_param($stmt, "is", $id, $label)))
-        printf("[2002] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+        printf("[2002] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));  
+    
 
     mysqli_stmt_close($stmt);
     mysqli_close($link);
+    
+    /* Check that the function alias exists. It's a deprecated function, 
+    but we have not announce the removal so far, therefore we need to check for it */
+    if (!is_null($tmp = @mysqli_bind_param()))
+        printf("[021] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+        
     print "done!";
 ?>
 --EXPECTF--

Modified: trunk/tests/ext/mysqli/mysqli_stmt_bind_result.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_bind_result.phpt	2007-06-18 10:37:31 UTC (rev 383)
+++ trunk/tests/ext/mysqli/mysqli_stmt_bind_result.phpt	2007-06-18 13:40:31 UTC (rev 384)
@@ -279,7 +279,11 @@
     func_mysqli_stmt_bind_result($link, $engine, "s", "SET('a', 'b')", "a", 1740,
$hint_str_or_unicode);  
     func_mysqli_stmt_bind_result($link, $engine, "s", "SET('a', 'b')", NULL, 1760,
$hint_str_or_unicode);
     
-    // mysqli_stmt_close($stmt);
+    /* Check that the function alias exists. It's a deprecated function, 
+    but we have not announce the removal so far, therefore we need to check for it */
+    if (!is_null($tmp = @mysqli_bind_result()))
+        printf("[3000] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+            
     mysqli_close($link);
     print "done!";
 ?>

Modified: trunk/tests/ext/mysqli/mysqli_stmt_fetch.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_fetch.phpt	2007-06-18 10:37:31 UTC (rev 383)
+++ trunk/tests/ext/mysqli/mysqli_stmt_fetch.phpt	2007-06-18 13:40:31 UTC (rev 384)
@@ -75,6 +75,11 @@
         
     mysqli_close($link);    
     
+    /* Check that the function alias exists. It's a deprecated function, 
+    but we have not announce the removal so far, therefore we need to check for it */
+    if (!is_null($tmp = @mysqli_fetch()))
+        printf("[017] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+    
     print "done!";
 ?>
 --EXPECTF--

Modified: trunk/tests/ext/mysqli/mysqli_stmt_param_count.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_param_count.phpt	2007-06-18 10:37:31 UTC (rev 383)
+++ trunk/tests/ext/mysqli/mysqli_stmt_param_count.phpt	2007-06-18 13:40:31 UTC (rev 384)
@@ -47,7 +47,13 @@
     if (NULL !== ($tmp = mysqli_stmt_param_count($stmt)))
         printf("[40] Expecting NULL, got %s/%s\n");
             
-    mysqli_close($link);    
+    mysqli_close($link); 
+    
+    /* Check that the function alias exists. It's a deprecated function, 
+    but we have not announce the removal so far, therefore we need to check for it */
+    if (!is_null($tmp = @mysqli_param_count()))
+        printf("[041] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+           
     print "done!";
 ?>
 --EXPECTF--

Modified: trunk/tests/ext/mysqli/mysqli_stmt_result_metadata.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_result_metadata.phpt	2007-06-18 10:37:31 UTC (rev
383)
+++ trunk/tests/ext/mysqli/mysqli_stmt_result_metadata.phpt	2007-06-18 13:40:31 UTC (rev
384)
@@ -81,6 +81,11 @@
     
     if (NULL !== ($tmp = mysqli_stmt_result_metadata($stmt)))
         printf("[017] Expecting NULL, got %s/%s\n");
+        
+    /* Check that the function alias exists. It's a deprecated function, 
+    but we have not announce the removal so far, therefore we need to check for it */    
   
+    if (!is_null($tmp = @mysqli_get_metadata()))
+        printf("[018] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
             
     mysqli_close($link);    
     print "done!";

Modified: trunk/tests/ext/mysqli/mysqli_stmt_send_long_data.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_send_long_data.phpt	2007-06-18 10:37:31 UTC (rev
383)
+++ trunk/tests/ext/mysqli/mysqli_stmt_send_long_data.phpt	2007-06-18 13:40:31 UTC (rev
384)
@@ -97,7 +97,12 @@
         printf("[018] Blob value has not been stored properly!\n");   
     
     if (NULL !== ($tmp = @mysqli_stmt_send_long_data($stmt, '')))
-        printf("[019] Expecting NULL, got %s/%s\n");        
+        printf("[019] Expecting NULL, got %s/%s\n");
+
+    /* Check that the function alias exists. It's a deprecated function, 
+    but we have not announce the removal so far, therefore we need to check for it */
+    if (!is_null($tmp = @mysqli_send_long_data()))
+        printf("[020] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
             
     mysqli_close($link);    
     print "done!";

Thread
PHP mysqlnd svn commit: r384 - trunk/tests/ext/mysqliuwendel18 Jun