WordPress.org

Make WordPress Core

Changeset 51563


Ignore:
Timestamp:
08/06/2021 09:38:45 PM (2 months ago)
Author:
SergeyBiryukov
Message:

Tests: Replace expectException() for PHP native errors with calls to the dedicated PHPUnit 8.4+ methods.

The old manner of testing these is soft deprecated as of PHPUnit 8.4, hard deprecated as of PHPUnit 9.0 and will be removed in PHPUnit 10.0.

These dedicated methods introduced in PHPUnit 8.4 should be used as an alternative:

  • expectDeprecation()
  • expectDeprecationMessage()
  • expectDeprecationMessageMatches()
  • expectNotice()
  • expectNoticeMessage()
  • expectNoticeMessageMatches()
  • expectWarning()
  • expectWarningMessage()
  • expectWarningMessageMatches()
  • expectError()
  • expectErrorMessage()
  • expectErrorMessageMatches()

These new PHPUnit methods are all polyfilled by the PHPUnit Polyfills and switching to these will future-proof the tests some more.

References:

Follow-up to [51559-51562].

Props jrf.
See #46149.

Location:
trunk/tests/phpunit/tests
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/tests/phpunit/tests/compat.php

    r51415 r51563  
    181181
    182182    function test_json_encode_decode() {
    183         $this->expectException( 'PHPUnit_Framework_Error_Deprecated' );
     183        $this->expectDeprecation();
    184184
    185185        require_once ABSPATH . WPINC . '/class-json.php';
  • trunk/tests/phpunit/tests/dependencies/scripts.php

    r51462 r51563  
    14251425        if ( $warning ) {
    14261426            if ( PHP_VERSION_ID < 80000 ) {
    1427                 $this->expectException( 'PHPUnit_Framework_Error_Warning' );
     1427                $this->expectWarning();
    14281428            } else {
    1429                 // As this exception will only be set on PHP 8 in combination with PHPUnit 7, this will work (for now).
     1429                /*
     1430                 * As this exception will only be set on PHP 8 in combination with PHPUnit 7, this will work (for now).
     1431                 * Once the PHPUnit version constraints have been widened and a _supported_ PHPUnit version is
     1432                 * used to run the tests on PHP 8.x, this should be changed to `$this->expectError()`.
     1433                 */
    14301434                $this->expectException( 'Error' );
    14311435            }
  • trunk/tests/phpunit/tests/locale.php

    r48993 r51563  
    2828    public function test_get_weekday_undefined_index() {
    2929        if ( PHP_VERSION_ID >= 80000 ) {
    30             $this->expectException( 'PHPUnit_Framework_Error_Warning' );
     30            $this->expectWarning();
    3131        } else {
    32             $this->expectException( 'PHPUnit_Framework_Error_Notice' );
     32            $this->expectNotice();
    3333        }
    3434
  • trunk/tests/phpunit/tests/rest-api/rest-block-directory-controller.php

    r49603 r51563  
    9090        $this->prevent_requests_to_host( 'api.wordpress.org' );
    9191
    92         $this->expectException( 'PHPUnit_Framework_Error_Warning' );
     92        $this->expectWarning();
    9393        $response = rest_do_request( $request );
    9494        $this->assertErrorResponse( 'plugins_api_failed', $response, 500 );
  • trunk/tests/phpunit/tests/rest-api/rest-plugins-controller.php

    r50633 r51563  
    537537        $this->prevent_requests_to_host( 'api.wordpress.org' );
    538538
    539         $this->expectException( 'PHPUnit_Framework_Error_Warning' );
     539        $this->expectWarning();
    540540        $response = rest_do_request( $request );
    541541        $this->assertErrorResponse( 'plugins_api_failed', $response, 500 );
  • trunk/tests/phpunit/tests/rest-api/rest-schema-sanitization.php

    r49246 r51563  
    458458    public function test_format_validation_is_applied_if_missing_type() {
    459459        if ( PHP_VERSION_ID >= 80000 ) {
    460             $this->expectException( 'PHPUnit_Framework_Error_Warning' ); // For the undefined index.
     460            $this->expectWarning(); // For the undefined index.
    461461        } else {
    462             $this->expectException( 'PHPUnit_Framework_Error_Notice' );
     462            $this->expectNotice(); // For the undefined index.
    463463        }
    464464
  • trunk/tests/phpunit/tests/rest-api/rest-schema-validation.php

    r50653 r51563  
    158158    public function test_format_validation_is_applied_if_missing_type() {
    159159        if ( PHP_VERSION_ID >= 80000 ) {
    160             $this->expectException( 'PHPUnit_Framework_Error_Warning' ); // For the undefined index.
     160            $this->expectWarning(); // For the undefined index.
    161161        } else {
    162             $this->expectException( 'PHPUnit_Framework_Error_Notice' );
     162            $this->expectNotice(); // For the undefined index.
    163163        }
    164164
Note: See TracChangeset for help on using the changeset viewer.