Changeset 101 in tests

Timestamp:

12/03/2007 10:52:17 PM (18 years ago)

Author:

tellyworth

Message:

make sure errors are handled the same way in different environments

Files:

• wp-test.php (modified) (2 diffs)
• wp-testlib/base.php (modified) (2 diffs)

wp-test.php

@@ -22 +22 @@
 // make sure errors are displayed during setup
 error_reporting(E_ALL);
-ini_set('display_errors', '1');
+ini_set('display_errors', true);
 
 require_once(DIR_TESTROOT.'/wp-testlib/base.php');
@@ -87 +87 @@
 do_action('test_start');
 
-// hide errors during test runs, since they're captured and reported by the test framework
-ini_set('display_errors', '0');
+// hide warnings during testing, since that's the normal WP behaviour
+error_reporting(E_ALL ^ E_NOTICE);
 // run the tests and print the results
 $result = wptest_run_tests($classes, @$opts['t']);

wp-testlib/base.php

@@ -18 +18 @@
         // error types taken from PHPUnit_Framework_TestResult::run
         $this->_phpunit_err_mask = E_USER_ERROR | E_NOTICE | E_STRICT;
-        if (version_compare(phpversion(), '5.2.0RC1', '>=')) {
-            $this->_phpunit_err_mask |= E_RECOVERABLE_ERROR;
-        }
         $this->_old_handler = set_error_handler(array(&$this, '_error_handler'));
         if (is_null($this->_old_handler)) {
@@ -38 +35 @@
     function _error_handler($errno, $errstr, $errfile, $errline) {
         // @ in front of statement
-        if (0 ==  ini_get('error_reporting')) {
+        if (error_reporting() == 0) {
             return;
         }
+        // notices and strict warnings are passed on to the phpunit error handler but don't trigger an exception
         if ($errno | $this->_phpunit_err_mask) {
             PHPUnit_Util_ErrorHandler($errno, $errstr, $errfile, $errline);
-        } else {
+        }
+        // warnings and errors trigger an exception, which is included in the test results
+        else {
             error_log("Testing: $errstr in $errfile on line $errline");
             //TODO: we should raise custom exception here, sth like WP_PHPError
-            throw new PHPUnit_Framework_Error(
+            throw new PHPUnit_Framework_Error(
                 $errstr,
                 $errno,