Changeset 1221 in tests

Timestamp:

02/28/2013 04:30:21 PM (12 years ago)

Author:

nacin

Message:

During test execution, all wp_die() calls should throw an exception.

If the wp_die() call is not expected, the test will result in an error. Expected wp_die() calls may be caught with $this->setExpectedException( $exception ), @expectedException, etc. For more, see ​http://www.phpunit.de/manual/3.8/en/writing-tests-for-phpunit.html#writing-tests-for-phpunit.exceptions.

Location:

trunk/includes

Files:

• exceptions.php (modified) (3 diffs)
• testcase.php (modified) (3 diffs)

trunk/includes/exceptions.php

@@ -6 +6 @@
 
 /**
- * Exception for cases of wp_die()
+ * General exception for wp_die()
+ */
+class WPDieException extends Exception {}
+
+/**
+ * Exception for cases of wp_die(), for ajax tests.
  * This means there was an error (no output, and a call to wp_die)
  *
@@ -13 +18 @@
  * @since      3.4.0
  */
-class WPAjaxDieStopException extends Exception {}
+class WPAjaxDieStopException extends WPDieException {}
 
 /**
- * Exception for cases of wp_die()
+ * Exception for cases of wp_die(), for ajax tests.
  * This means execution of the ajax function should be halted, but the unit
  * test can continue.  The function finished normally and there was not an
@@ -26 +31 @@
  * @since      3.4.0
  */
-class WPAjaxDieContinueException extends Exception {}
+class WPAjaxDieContinueException extends WPDieException {}

trunk/includes/testcase.php

@@ -19 +19 @@
         $this->clean_up_global_scope();
         $this->start_transaction();
+        add_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
     }
 
@@ -26 +27 @@
         remove_filter( 'dbdelta_create_queries', array( $this, '_create_temporary_tables' ) );
         remove_filter( 'query', array( $this, '_drop_temporary_tables' ) );
+        remove_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
     }
 
@@ -62 +64 @@
             return 'DROP TEMPORARY TABLE ' . substr( $query, 10 );
         return $query;
+    }
+
+    function get_wp_die_handler( $handler ) {
+        return array( $this, 'wp_die_handler' );
+    }
+
+    function wp_die_handler( $message ) {
+        throw new WPDieException( $message );
     }