Changes from branches/4.3/tests/phpunit/tests/db.php at r33991 to trunk/tests/phpunit/tests/db.php at r33259

File:

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

trunk/tests/phpunit/tests/db.php

@@ -527 +527 @@
         function data_get_table_from_query() {
                 $table = 'a_test_table_name';
-                $more_tables = array(
-                        // table_name => expected_value
-                        '`a_test_db`.`another_test_table`' => 'a_test_db.another_test_table',
-                        'a-test-with-dashes'               => 'a-test-with-dashes',
-                );
+                $db_table = '`a_test_db`.`another_test_table`';
 
                 $queries = array(
@@ -641 +637 @@
                 $querycount = count( $queries );
                 for ( $ii = 0; $ii < $querycount; $ii++ ) {
-                        foreach ( $more_tables as $name => $expected_name ) {
-                                $new_query = str_replace( $table, $name, $queries[ $ii ] );
-                                $queries[] = array( $new_query, $expected_name );
-                        }
+                        $db_query = str_replace( $table, $db_table, $queries[ $ii ] );
+                        $expected_db_table = str_replace( '`', '', $db_table );
 
                         $queries[ $ii ] = array( $queries[ $ii ], $table );
+                        $queries[] = array( $db_query, $expected_db_table );
                 }
                 return $queries;