Ticket #28486: 28486.3.diff

tests/phpunit/includes/testcase.php

@@ -245 +245 @@
                 }
         }
 
+        function setExpectedDeprecated( $deprecated_element ) {
+                array_push( $this->expected_deprecated, $deprecated_element );
+        }
+
+        function setExpectedIncorrectUsage( $doing_it_wrong ) {
+                array_push( $this->expected_doing_it_wrong, $doing_it_wrong );
+        }
+
         function deprecated_function_run( $function ) {
                 if ( ! in_array( $function, $this->caught_deprecated ) )
                         $this->caught_deprecated[] = $function;

tests/phpunit/tests/includes/helpers.php

@@ -168 +168 @@
 
                 $this->assertFalse( isset( $stati['foo'] ) );
         }
+
+        public function test_setExpectedDeprecated() {
+                _deprecated_function( __FUNCTION__, '2.5' );
+                $this->setExpectedDeprecated( 'test_setExpectedDeprecated' );
+        }
+
+        public function test_setExpectedIncorrectUsage() {
+                _doing_it_wrong( __FUNCTION__, __( 'Incorrect usage test' ), '2.5' );
+                $this->setExpectedIncorrectUsage( 'test_setExpectedIncorrectUsage' );
+        }
 }