Changeset 31306

Timestamp:

01/30/2015 04:47:44 PM (12 years ago)

Author:

boonebgorges

Message:

Introduce setExpectedDeprecated() and setExpectedIncorrectUsage() methods to `WP_UnitTestCase.

These methods provide a procedural alternative to the @expectedDeprecated
and @expectedIncorrectUsage test annotations, and parallel PHPUnit's native
setExpectedException().

Props prasoon2211, jdgrimes.
Fixes #28486.

Location:

trunk/tests/phpunit

Files:

• includes/testcase.php (modified) (1 diff)
• tests/includes/helpers.php (modified) (1 diff)

trunk/tests/phpunit/includes/testcase.php

@@ -244 +244 @@
                         $this->fail( "Unexpected incorrect usage notice for $unexpected" );
                 }
+        }
+
+        /**
+         * Declare an expected `_deprecated_function()` or `_deprecated_argument()` call from within a test.
+         *
+         * @since 4.2.0
+         *
+         * @param string $deprecated Name of the function, method, class, or argument that is deprecated. Must match
+         *                           first parameter of the `_deprecated_function()` or `_deprecated_argument()` call.
+         */
+        public function setExpectedDeprecated( $deprecated ) {
+                array_push( $this->expected_deprecated, $deprecated );
+        }
+
+        /**
+         * Declare an expected `_doing_it_wrong()` call from within a test.
+         *
+         * @since 4.2.0
+         *
+         * @param string $deprecated Name of the function, method, or class that appears in the first argument of the
+         *                           source `_doing_it_wrong()` call.
+         */
+        public function setExpectedIncorrectUsage( $doing_it_wrong ) {
+                array_push( $this->expected_doing_it_wrong, $doing_it_wrong );
         }
 

trunk/tests/phpunit/tests/includes/helpers.php

@@ -169 +169 @@
                 $this->assertFalse( isset( $stati['foo'] ) );
         }
+
+        /**
+         * @ticket 28486
+         */
+        public function test_setExpectedDeprecated() {
+                $this->setExpectedDeprecated( 'Tests_TestHelpers::mock_deprecated' );
+                $this->mock_deprecated();
+        }
+
+        /**
+         * @ticket 28486
+         */
+        public function test_setExpectedIncorrectUsage() {
+                $this->setExpectedIncorrectUsage( 'Tests_TestHelpers::mock_incorrect_usage' );
+                $this->mock_incorrect_usage();
+        }
+
+        protected function mock_deprecated() {
+                _deprecated_function( __METHOD__, '2.5' );
+        }
+
+        protected function mock_incorrect_usage() {
+                _doing_it_wrong( __METHOD__, __( 'Incorrect usage test' ), '2.5' );
+        }
 }