diff --git a/tests/PHPCurlClass/Helper.php b/tests/PHPCurlClass/Helper.php index 605827e..7e9abd4 100644 --- a/tests/PHPCurlClass/Helper.php +++ b/tests/PHPCurlClass/Helper.php @@ -9,6 +9,8 @@ class Test const TEST_URL = 'http://127.0.0.1:8000/'; const ERROR_URL = 'http://1.2.3.4/'; + public $message; + private $testUrl; public function __construct($port = null) @@ -30,6 +32,16 @@ class Test } else { $this->curl->$request_method($this->testUrl); } + + $this->message = + 'error message: ' . $this->curl->errorMessage . "\n" . + 'curl error message: ' . $this->curl->curlErrorMessage . "\n" . + 'http error message: ' . $this->curl->httpErrorMessage . "\n" . + 'error code: ' . $this->curl->errorCode . "\n" . + 'curl error code: ' . $this->curl->curlErrorCode . "\n" . + 'raw response: ' . $this->curl->rawResponse . "\n" . + ''; + return $this->curl->response; } diff --git a/tests/PHPCurlClass/PHPCurlClassTest.php b/tests/PHPCurlClass/PHPCurlClassTest.php index 0658d92..61e7cda 100644 --- a/tests/PHPCurlClass/PHPCurlClassTest.php +++ b/tests/PHPCurlClass/PHPCurlClassTest.php @@ -1161,26 +1161,16 @@ class CurlTest extends \PHPUnit\Framework\TestCase public function testTimeout() { $test = new Test('8003'); - $test->curl->verbose(); $test->curl->setTimeout(10); $test->server('timeout_legacy', 'GET', array( 'seconds' => '5', )); - $message = - 'error message: ' . $test->curl->errorMessage . "\n" . - 'curl error message: ' . $test->curl->curlErrorMessage . "\n" . - 'http error message: ' . $test->curl->httpErrorMessage . "\n" . - 'error code: ' . $test->curl->errorCode . "\n" . - 'curl error code: ' . $test->curl->curlErrorCode . "\n" . - 'raw response: ' . $test->curl->rawResponse . "\n" . - ''; - - $this->assertFalse($test->curl->error, $message); - $this->assertFalse($test->curl->curlError, $message); - $this->assertNotEquals(CURLE_OPERATION_TIMEOUTED, $test->curl->errorCode, $message); - $this->assertNotEquals(CURLE_OPERATION_TIMEOUTED, $test->curl->curlErrorCode, $message); - $this->assertFalse($test->curl->httpError, $message); + $this->assertFalse($test->curl->error, $test->message); + $this->assertFalse($test->curl->curlError, $test->message); + $this->assertNotEquals(CURLE_OPERATION_TIMEOUTED, $test->curl->errorCode, $test->message); + $this->assertNotEquals(CURLE_OPERATION_TIMEOUTED, $test->curl->curlErrorCode, $test->message); + $this->assertFalse($test->curl->httpError, $test->message); } public function testError()