Changeset 38382 for trunk/tests/phpunit/tests/db/charset.php

Timestamp:

08/26/2016 08:21:30 PM (8 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Remove many unnecessary calls to rand_str() which can, in theory, fail at random. Static strings are much more appropriate.

See #37371

File:

• trunk/tests/phpunit/tests/db/charset.php (modified) (4 diffs)

trunk/tests/phpunit/tests/db/charset.php

@@ -544 +544 @@
 
         $vars = array();
-        foreach( $this->table_and_column_defs as $value ) {
-            $this_table_name = $table_name . '_' . rand_str( 5 );
+        foreach( $this->table_and_column_defs as $i => $value ) {
+            $this_table_name = $table_name . '_' . $i;
             $drop = "DROP TABLE IF EXISTS $this_table_name";
             $create = "CREATE TABLE $this_table_name {$value['definition']}";
@@ -584 +584 @@
 
         $vars = array();
-        foreach( $this->table_and_column_defs as $value ) {
-            $this_table_name = $table_name . '_' . rand_str( 5 );
+        foreach( $this->table_and_column_defs as $i => $value ) {
+            $this_table_name = $table_name . '_' . $i;
             $drop = "DROP TABLE IF EXISTS $this_table_name";
             $create = "CREATE TABLE $this_table_name {$value['definition']}";
@@ -688 +688 @@
         );
 
-        foreach( $data as &$value ) {
-            $this_table_name = $table_name . '_' . rand_str( 5 );
+        foreach( $data as $i => &$value ) {
+            $this_table_name = $table_name . '_' . $i;
 
             $value[0] = "CREATE TABLE $this_table_name {$value[0]}";
@@ -802 +802 @@
         );
 
-        foreach( $data as &$value ) {
-            $this_table_name = $table_name . '_' . rand_str( 5 );
+        foreach( $data as $i => &$value ) {
+            $this_table_name = $table_name . '_' . $i;
 
             $value[0] = "CREATE TABLE $this_table_name {$value[0]}";