Changeset 78 in tests

Timestamp:

11/08/2007 01:26:12 AM (18 years ago)

Author:

tellyworth

Message:

update filter/action tests for wporg r6324

Location:

wp-testcase

Files:

• test_actions.php (modified) (2 diffs)
• test_filters.php (modified) (5 diffs)

wp-testcase/test_actions.php

@@ -4 +4 @@
 
 class WPTestActions extends WPTestCase {
-    var $_old_filters;
-
-    function setUp() {
-        #$this->_old_filters = $GLOBALS['wp_filter'];
-    }
-
-    function tearDown() {
-        #$GLOBALS['wp_filter'] = $this->_old_filters;
-    }
 
     function test_simple_action() {
@@ -151 +142 @@
 
     function test_all_action() {
-        $a = new MockAction(1);
+        $a = new MockAction();
         $tag1 = rand_str();
         $tag2 = rand_str();

wp-testcase/test_filters.php

@@ -4 +4 @@
 
 class WPTestFilters extends WPTestCase {
-    var $_old_filters;
-
-    function setUp() {
-        $this->_old_filters = $GLOBALS['wp_filter'];
-        unset($GLOBALS['merged_filters']);
-        // this screws up filter priorities
-        unset($GLOBALS['wp_filter']['all']);
-    }
-
-    function tearDown() {
-        $GLOBALS['wp_filter'] = $this->_old_filters;
-    }
 
     function test_simple_filter() {
@@ -144 +132 @@
         $tag1 = rand_str();
         $tag2 = rand_str();
+        $val = rand_str();
 
         // add an 'all' filter
-        add_filter('all', array(&$a, 'filter'));
+        add_filter('all', array(&$a, 'filterall'));
         // do some filters
         $this->assertEquals($val, apply_filters($tag1, $val));
@@ -158 +147 @@
         $this->assertEquals(array($tag1, $tag2, $tag1, $tag1), $a->get_tags());
 
+        remove_filter('all', array(&$a, 'filterall'));
+
     }
 
@@ -165 +156 @@
         $val = rand_str();
 
-        add_filter('all', array(&$a, 'filter'));
-        $this->assertEquals($val, apply_filters($tag1, $val));
+        add_filter('all', array(&$a, 'filterall'));
+        $this->assertEquals($val, apply_filters($tag, $val));
 
         // make sure our hook was called correctly
@@ -173 +164 @@
 
         // now remove the filter, do it again, and make sure it's not called this time
-        remove_filter('all', array(&$a, 'filter'));
-        $this->assertEquals($val, apply_filters($tag1, $val));
+        remove_filter('all', array(&$a, 'filterall'));
+        $this->assertEquals($val, apply_filters($tag, $val));
         // call cound should remain at 1
         $this->assertEquals(1, $a->get_call_count());