WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
09/27/2015 10:26:16 PM (10 years ago)
Author:
johnbillion
Message:

Switch several assertions to assertNotWPError() so more context is provided when the assertion fails.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/tests/phpunit/tests/http/base.php

    r34639 r34646  
    5353        // 5 : 5 & 301
    5454        $res = wp_remote_request($this->redirection_script . '?code=301&rt=' . 5, array('redirection' => 5) );
    55         $this->assertFalse( is_wp_error($res) );
     55        $this->assertNotWPError( $res );
    5656        $this->assertEquals(200, (int)$res['response']['code'] );
    5757    }
    … …  
    6060        // 5 : 5 & 302
    6161        $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 5, array('redirection' => 5) );
    62         $this->assertFalse( is_wp_error($res) );
     62        $this->assertNotWPError( $res );
    6363        $this->assertEquals(200, (int)$res['response']['code'] );
    6464    }
    … …  
    7070        // 5 > 0 & 301
    7171        $res = wp_remote_request($this->redirection_script . '?code=301&rt=' . 5, array('redirection' => 0) );
    72         $this->assertFalse( is_wp_error($res) );
     72        $this->assertNotWPError( $res );
    7373        $this->assertEquals(301, (int)$res['response']['code'] );
    7474    }
    … …  
    8080        // 5 > 0 & 302
    8181        $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 5, array('redirection' => 0) );
    82         $this->assertFalse( is_wp_error($res) );
     82        $this->assertNotWPError( $res );
    8383        $this->assertEquals(302, (int)$res['response']['code'] );
    8484    }
    … …  
    8787        // 5 - 5
    8888        $res = wp_remote_request($this->redirection_script . '?rt=' . 5, array('redirection' => 5) );
    89         $this->assertFalse( is_wp_error($res) );
     89        $this->assertNotWPError( $res );
    9090        $this->assertEquals(200, (int)$res['response']['code'] );
    9191    }
    … …  
    9494        // No redirections on HEAD request:
    9595        $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 1, array('method' => 'HEAD') );
    96         $this->assertFalse( is_wp_error($res) );
     96        $this->assertNotWPError( $res );
    9797        $this->assertEquals( 302, (int)$res['response']['code'] );
    9898    }
    … …  
    104104        // Redirections on HEAD request when Requested
    105105        $res = wp_remote_request($this->redirection_script . '?rt=' . 5, array('redirection' => 5, 'method' => 'HEAD') );
    106         $this->assertFalse( is_wp_error($res) );
     106        $this->assertNotWPError( $res );
    107107        $this->assertEquals( 200, (int)$res['response']['code'] );
    108108    }
    … …  
    123123        // 4 < 5 (close edgecase)
    124124        $res = wp_remote_request($this->redirection_script . '?rt=' . 4, array('redirection' => 5) );
    125         $this->assertFalse( is_wp_error($res) );
     125        $this->assertNotWPError( $res );
    126126    }
    127127
    … …  
    132132        // 0 redirections asked for, Should return the document?
    133133        $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 5, array('redirection' => 0) );
    134         $this->assertFalse( is_wp_error($res) );
     134        $this->assertNotWPError( $res );
    135135        $this->assertEquals( 302, (int)$res['response']['code'] );
    136136    }
    … …  
    144144        // Prints PASS on initial load, FAIL if the client follows the specified redirection
    145145        $res = wp_remote_request( $this->redirection_script . '?201-location=true' );
    146         $this->assertFalse( is_wp_error( $res ) );
     146        $this->assertNotWPError( $res );
    147147        $this->assertEquals( 'PASS', $res['body']);
    148148    }
    … …  
    170170        $res = wp_remote_request( $this->redirection_script . '?header-check', array('headers' => $headers) );
    171171
    172         $this->assertFalse( is_wp_error($res) );
     172        $this->assertNotWPError( $res );
    173173
    174174        $headers = array();
    … …  
    199199        }
    200200
    201         $this->assertFalse( is_wp_error( $res ) );
     201        $this->assertNotWPError( $res );
    202202        $this->assertEquals( '', $res['body'] ); // The body should be empty.
    203203        $this->assertEquals( $size, $res['headers']['content-length'] ); // Check the headers are returned (and the size is the same..)
    … …  
    220220        }
    221221
    222         $this->assertFalse( is_wp_error( $res ) );
     222        $this->assertNotWPError( $res );
    223223        $this->assertEquals( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters
    224224
    … …  
    236236        $res = wp_remote_request( $url, array( 'timeout' => 30, 'limit_response_size' => $size ) );
    237237
    238         $this->assertFalse( is_wp_error( $res ) );
     238        $this->assertNotWPError( $res );
    239239        $this->assertEquals( $size, strlen( $res['body'] ) );
    240240    }
Note: See TracChangeset for help on using the changeset viewer.