Changeset 39 in tests

Timestamp:

09/27/2007 03:50:17 PM (17 years ago)

Author:

nbachiyski

Message:

Catch all errors, which PHPUnit does and fail the test if one occured

Files:

• wp-test.php (modified) (1 diff)
• wp-testcase/test_cron.php (modified) (1 diff)
• wp-testcase/test_includes_cache.php (modified) (2 diffs)
• wp-testcase/test_meta.php (modified) (1 diff)
• wp-testcase/test_user_capabilities.php (modified) (2 diffs)
• wp-testdata/sample_blogs.php (modified) (1 diff)
• wp-testlib/base.php (modified) (2 diffs)

wp-test.php

@@ -47 +47 @@
 
 // initialize wp
-echo "Testing branch ".DIR_WP."\n";
 define('WP_INSTALLING', 1);
 require_once(ABSPATH.'wp-settings.php');

wp-testcase/test_cron.php

@@ -11 +11 @@
 
     function tearDown() {
+        parent::tearDown();
         // make sure the schedule is clear
         _set_cron_array(array());

wp-testcase/test_includes_cache.php

@@ -5 +5 @@
 
     function setUp() {
+        parent::setUp();
         // create two cache objects with a shared cache dir
         // this simulates a typical cache situation, two separate requests interacting
@@ -12 +13 @@
 
     function tearDown() {
+        parent::tearDown();
         wp_cache_flush();
     }

wp-testcase/test_meta.php

@@ -6 +6 @@
 
     function setUp() {
+        parent::setUp();
         $this->val = true;
     }
 
     function tearDown() {
+        parent::tearDown();
         $this->val = false;
     }

wp-testcase/test_user_capabilities.php

@@ -7 +7 @@
 
     function setUp() {
+        parent::setUp();
         // keep track of users we create
         $user_ids = array();
@@ -12 +13 @@
 
     function tearDown() {
+        parent::tearDown();
         // delete any users that were created during tests
         foreach ($this->user_ids as $id)

wp-testdata/sample_blogs.php

@@ -12 +12 @@
 
     function setUp() {
+        parent::setUp();
         $this->author = get_userdatabylogin(WP_USER_NAME);
         $this->_delete_all_posts();

wp-testlib/base.php

@@ -5 +5 @@
 #require_once('PHPUnit.php');
 require_once('PHPUnit/Framework.php');
+require_once('PHPUnit/Util/ErrorHandler.php');
 
 // test cases should extend WPTestCase instead of PHPUnit_TestCase for three reasons:
@@ -13 +14 @@
 
 class WPTestCase extends PHPUnit_Framework_TestCase {
+
+    function setUp() {
+        // 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)) {
+            restore_error_handler();
+        }
+    }
+
+    function tearDown() {
+        if (!is_null($this->_old_handler)) {
+            restore_error_handler();
+        }
+    }
+
+    /**
+     * Treat any error, which wasn't handled by PHPUnit as a failure
+     */
+    function _error_handler($errno, $errstr, $errfile, $errline) {
+        if ($errno | $this->_phpunit_err_mask) {
+            PHPUnit_Util_ErrorHandler($errno, $errstr, $errfile, $errline);
+        } 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(
+                $errstr,
+                $errno,
+                $errfile,
+                $errline,
+                $trace
+            );
+        }
+    }
 
     function _query_filter($q) {