Changeset 837 in tests

Timestamp:

07/01/2012 09:40:48 PM (13 years ago)

Author:

nacin

Message:

Add the TEMPORARY keyword to CREATE TABLE and DROP TABLE to prevent implicit transaction commits. Use assertInstanceOf in assertWPError. see #82.

File:

• trunk/wp-testlib/testcase.php (modified) (2 diffs)

trunk/wp-testlib/testcase.php

@@ -20 +20 @@
         global $wpdb;
         $wpdb->query( 'ROLLBACK' );
+        remove_filter( 'dbdelta_create_queries', array( $this, '_create_temporary_tables' ) );
+        remove_filter( 'query', array( $this, '_drop_temporary_tables' ) );
     }
 
@@ -44 +46 @@
         $wpdb->query( 'SET autocommit = 0;' );
         $wpdb->query( 'START TRANSACTION;' );
+        add_filter( 'dbdelta_create_queries', array( $this, '_create_temporary_tables' ) );
+        add_filter( 'query', array( $this, '_drop_temporary_tables' ) );
+    }
+
+    function _create_temporary_tables( $queries ) {
+        return str_replace( 'CREATE TABLE', 'CREATE TEMPORARY TABLE', $queries );
+    }
+
+    function _drop_temporary_tables( $query ) {
+        if ( 'DROP TABLE' === substr( $query, 0, 10 ) )
+            return 'DROP TEMPORARY TABLE ' . substr( $query, 10 );
+        return $query;
     }
 
     function assertWPError( $actual, $message = '' ) {
-        $this->assertTrue( is_wp_error( $actual ), $message );
+        $this->assertInstanceOf( 'WP_Error', $actual, $message );
     }