From 33d641de4e78a39fb080752c788f9e00de403d83 Mon Sep 17 00:00:00 2001 From: Francis Besset Date: Mon, 18 Aug 2014 10:29:49 +0200 Subject: [PATCH] [SoapClient] Fixed tests if proxy exists in environment variables --- .../Tests/AxisInterop/MtomAxisInteropTest.php | 3 ++- .../Tests/AxisInterop/SwaAxisInteropTest.php | 3 ++- .../AxisInterop/WsAddressingAxisInteropTest.php | 3 ++- .../WsSecuritySigEncAxisInteropTest.php | 3 ++- .../WsSecurityUserPassAxisInteropTest.php | 3 ++- src/BeSimple/SoapClient/Tests/CurlTest.php | 16 ++++++++++++---- .../ServerInterop/MtomServerInteropTest.php | 3 ++- .../Tests/ServerInterop/SwaServerInteropTest.php | 1 + .../WsSecuritySigEncServerInteropTest.php | 3 ++- .../WsSecurityUserPassServerInteropTest.php | 3 ++- .../SoapClient/Tests/WsdlDownloaderTest.php | 8 ++++++-- 11 files changed, 35 insertions(+), 14 deletions(-) diff --git a/src/BeSimple/SoapClient/Tests/AxisInterop/MtomAxisInteropTest.php b/src/BeSimple/SoapClient/Tests/AxisInterop/MtomAxisInteropTest.php index 27d9e20..f16f8c4 100644 --- a/src/BeSimple/SoapClient/Tests/AxisInterop/MtomAxisInteropTest.php +++ b/src/BeSimple/SoapClient/Tests/AxisInterop/MtomAxisInteropTest.php @@ -28,6 +28,7 @@ class MtomAxisInteropTest extends TestCase 'base64Binary' => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\base64Binary', 'AttachmentRequest' => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\AttachmentRequest', ), + 'proxy_host' => false, ); public function testAttachment() @@ -48,4 +49,4 @@ class MtomAxisInteropTest extends TestCase // $this->assertEquals($b64->_, file_get_contents($fileCreatedByServer)); // unlink($fileCreatedByServer); } -} \ No newline at end of file +} diff --git a/src/BeSimple/SoapClient/Tests/AxisInterop/SwaAxisInteropTest.php b/src/BeSimple/SoapClient/Tests/AxisInterop/SwaAxisInteropTest.php index 4b9921f..d964aa3 100644 --- a/src/BeSimple/SoapClient/Tests/AxisInterop/SwaAxisInteropTest.php +++ b/src/BeSimple/SoapClient/Tests/AxisInterop/SwaAxisInteropTest.php @@ -37,6 +37,7 @@ class SwaAxisInteropTest extends TestCase 'uploadFile' => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\uploadFile', 'uploadFileResponse' => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\uploadFileResponse', ), + 'proxy_host' => false, ); public function testUploadDownloadText() @@ -74,4 +75,4 @@ class SwaAxisInteropTest extends TestCase $this->assertEquals($upload->data, $result->data); } -} \ No newline at end of file +} diff --git a/src/BeSimple/SoapClient/Tests/AxisInterop/WsAddressingAxisInteropTest.php b/src/BeSimple/SoapClient/Tests/AxisInterop/WsAddressingAxisInteropTest.php index cf7308a..2310476 100644 --- a/src/BeSimple/SoapClient/Tests/AxisInterop/WsAddressingAxisInteropTest.php +++ b/src/BeSimple/SoapClient/Tests/AxisInterop/WsAddressingAxisInteropTest.php @@ -32,6 +32,7 @@ class WsAddressingAxisInteropTest extends TestCase private $options = array( 'soap_version' => SOAP_1_2, 'features' => SOAP_SINGLE_ELEMENT_ARRAYS, // make sure that result is array for size=1 + 'proxy_host' => false, ); public function testSession() @@ -56,4 +57,4 @@ class WsAddressingAxisInteropTest extends TestCase $this->assertEquals($soapSessionId1, $soapSessionId2); } -} \ No newline at end of file +} diff --git a/src/BeSimple/SoapClient/Tests/AxisInterop/WsSecuritySigEncAxisInteropTest.php b/src/BeSimple/SoapClient/Tests/AxisInterop/WsSecuritySigEncAxisInteropTest.php index 6e4f0d9..2d7070e 100644 --- a/src/BeSimple/SoapClient/Tests/AxisInterop/WsSecuritySigEncAxisInteropTest.php +++ b/src/BeSimple/SoapClient/Tests/AxisInterop/WsSecuritySigEncAxisInteropTest.php @@ -64,6 +64,7 @@ class WsSecuritySigEncAxisInteropTest extends TestCase 'addBookResponse' => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\addBookResponse', 'BookInformation' => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\BookInformation', ), + 'proxy_host' => false, ); public function testSigEnc() @@ -103,4 +104,4 @@ class WsSecuritySigEncAxisInteropTest extends TestCase // getBooksByType("scifi"); } -} \ No newline at end of file +} diff --git a/src/BeSimple/SoapClient/Tests/AxisInterop/WsSecurityUserPassAxisInteropTest.php b/src/BeSimple/SoapClient/Tests/AxisInterop/WsSecurityUserPassAxisInteropTest.php index 6ab2824..2ee71d6 100644 --- a/src/BeSimple/SoapClient/Tests/AxisInterop/WsSecurityUserPassAxisInteropTest.php +++ b/src/BeSimple/SoapClient/Tests/AxisInterop/WsSecurityUserPassAxisInteropTest.php @@ -40,6 +40,7 @@ class WsSecurityUserPassAxisInteropTest extends TestCase 'addBookResponse' => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\addBookResponse', 'BookInformation' => 'BeSimple\SoapClient\Tests\AxisInterop\Fixtures\BookInformation', ), + 'proxy_host' => false, ); public function testUserPassText() @@ -93,4 +94,4 @@ class WsSecurityUserPassAxisInteropTest extends TestCase // getBooksByType("scifi"); } -} \ No newline at end of file +} diff --git a/src/BeSimple/SoapClient/Tests/CurlTest.php b/src/BeSimple/SoapClient/Tests/CurlTest.php index c80b992..28b6311 100644 --- a/src/BeSimple/SoapClient/Tests/CurlTest.php +++ b/src/BeSimple/SoapClient/Tests/CurlTest.php @@ -74,7 +74,9 @@ class CurlTest extends AbstractWebserverTest public function testGetResponseBody() { - $curl = new Curl(); + $curl = new Curl(array( + 'proxy_host' => false, + )); $curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT)); $this->assertEquals('This is a testfile for cURL.', $curl->getResponseBody()); @@ -82,7 +84,9 @@ class CurlTest extends AbstractWebserverTest public function testGetResponseContentType() { - $curl = new Curl(); + $curl = new Curl(array( + 'proxy_host' => false, + )); $curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT)); $this->assertEquals('text/plain; charset=UTF-8', $curl->getResponseContentType()); @@ -93,7 +97,9 @@ class CurlTest extends AbstractWebserverTest public function testGetResponseHeaders() { - $curl = new Curl(); + $curl = new Curl(array( + 'proxy_host' => false, + )); $curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT)); $this->assertEquals(117 + self::$websererPortLength, strlen($curl->getResponseHeaders())); @@ -104,7 +110,9 @@ class CurlTest extends AbstractWebserverTest public function testGetResponseStatusCode() { - $curl = new Curl(); + $curl = new Curl(array( + 'proxy_host' => false, + )); $curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT)); $this->assertEquals(200, $curl->getResponseStatusCode()); diff --git a/src/BeSimple/SoapClient/Tests/ServerInterop/MtomServerInteropTest.php b/src/BeSimple/SoapClient/Tests/ServerInterop/MtomServerInteropTest.php index 779313f..07d7b48 100644 --- a/src/BeSimple/SoapClient/Tests/ServerInterop/MtomServerInteropTest.php +++ b/src/BeSimple/SoapClient/Tests/ServerInterop/MtomServerInteropTest.php @@ -20,6 +20,7 @@ class MtomServerInteropTest extends TestCase 'base64Binary' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\base64Binary', 'AttachmentRequest' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\AttachmentRequest', ), + 'proxy_host' => false, ); public function testAttachment() @@ -40,4 +41,4 @@ class MtomServerInteropTest extends TestCase $this->assertEquals($b64->_, file_get_contents($fileCreatedByServer)); unlink($fileCreatedByServer); } -} \ No newline at end of file +} diff --git a/src/BeSimple/SoapClient/Tests/ServerInterop/SwaServerInteropTest.php b/src/BeSimple/SoapClient/Tests/ServerInterop/SwaServerInteropTest.php index 5f3e6f3..01eaeae 100644 --- a/src/BeSimple/SoapClient/Tests/ServerInterop/SwaServerInteropTest.php +++ b/src/BeSimple/SoapClient/Tests/ServerInterop/SwaServerInteropTest.php @@ -23,6 +23,7 @@ class SwaServerInteropTest extends TestCase 'uploadFile' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\uploadFile', 'uploadFileResponse' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\uploadFileResponse', ), + 'proxy_host' => false, ); public function testUploadDownloadText() diff --git a/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecuritySigEncServerInteropTest.php b/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecuritySigEncServerInteropTest.php index 0ff0142..8978fd6 100644 --- a/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecuritySigEncServerInteropTest.php +++ b/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecuritySigEncServerInteropTest.php @@ -30,6 +30,7 @@ class WsSecuritySigEncServerInteropTest extends TestCase 'addBookResponse' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\addBookResponse', 'BookInformation' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\BookInformation', ), + 'proxy_host' => false, ); public function testSigEnc() @@ -69,4 +70,4 @@ class WsSecuritySigEncServerInteropTest extends TestCase // getBooksByType("scifi"); } -} \ No newline at end of file +} diff --git a/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerInteropTest.php b/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerInteropTest.php index 1df839c..efe86b5 100644 --- a/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerInteropTest.php +++ b/src/BeSimple/SoapClient/Tests/ServerInterop/WsSecurityUserPassServerInteropTest.php @@ -29,6 +29,7 @@ class WsSecurityUserPassServerInteropTest extends TestCase 'addBookResponse' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\addBookResponse', 'BookInformation' => 'BeSimple\SoapClient\Tests\ServerInterop\Fixtures\BookInformation', ), + 'proxy_host' => false, ); public function testUserPassText() @@ -82,4 +83,4 @@ class WsSecurityUserPassServerInteropTest extends TestCase // getBooksByType("scifi"); } -} \ No newline at end of file +} diff --git a/src/BeSimple/SoapClient/Tests/WsdlDownloaderTest.php b/src/BeSimple/SoapClient/Tests/WsdlDownloaderTest.php index 2027b2d..38905b5 100644 --- a/src/BeSimple/SoapClient/Tests/WsdlDownloaderTest.php +++ b/src/BeSimple/SoapClient/Tests/WsdlDownloaderTest.php @@ -115,7 +115,9 @@ class WsdlDownloaderTest extends AbstractWebserverTest Cache::setDirectory($wsdlCacheUrl); $cacheDirForRegExp = preg_quote($wsdlCacheUrl, '#'); - $wsdlDownloader = new WsdlDownloader(new Curl()); + $wsdlDownloader = new WsdlDownloader(new Curl(array( + 'proxy_host' => false, + ))); $r = new \ReflectionClass($wsdlDownloader); $m = $r->getMethod('resolveRemoteIncludes'); $m->setAccessible(true); @@ -178,7 +180,9 @@ class WsdlDownloaderTest extends AbstractWebserverTest Cache::setDirectory($wsdlCacheUrl); $cacheDirForRegExp = preg_quote($wsdlCacheUrl, '#'); - $wsdlDownloader = new WsdlDownloader(new Curl()); + $wsdlDownloader = new WsdlDownloader(new Curl(array( + 'proxy_host' => false, + ))); $r = new \ReflectionClass($wsdlDownloader); $m = $r->getMethod('resolveRemoteIncludes'); $m->setAccessible(true);