From ac916f93ed542dc017639f0e784ae53a47bbc464 Mon Sep 17 00:00:00 2001 From: peter279k Date: Sat, 29 Feb 2020 04:13:02 +0800 Subject: [PATCH] Test improvement --- composer.json | 2 +- tests/Component/OrderManagement/OrderTest.php | 21 ++++++++++--------- tests/Component/Settlements/PayoutsTest.php | 4 ++-- tests/Component/TestCase.php | 3 ++- tests/Integration/TestCase.php | 6 ++++-- tests/Unit/Checkout/OrderTest.php | 3 --- tests/Unit/OrderManagement/CaptureTest.php | 5 +---- tests/Unit/OrderManagement/OrderTest.php | 7 ++----- tests/Unit/ResourceTest.php | 6 +----- tests/Unit/TestCase.php | 3 ++- tests/Unit/Transport/ApiResponseTest.php | 3 ++- .../Exception/ConnectorExceptionTest.php | 6 ++---- tests/Unit/Transport/GuzzleConnectorTest.php | 7 +++---- .../Unit/Transport/ResponseValidatorTest.php | 3 ++- tests/Unit/Transport/UserAgentTest.php | 3 ++- 15 files changed, 37 insertions(+), 45 deletions(-) diff --git a/composer.json b/composer.json index 17e62fa..09d95d3 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "guzzlehttp/guzzle": "~6.0" }, "require-dev": { - "phpunit/phpunit": ">=4.0.0, <6.0", + "phpunit/phpunit": "^4.8.36, <6.0", "squizlabs/php_codesniffer": "1.5.*", "phpmd/phpmd": "2.1.*", "phploc/phploc": "2.0.*", diff --git a/tests/Component/OrderManagement/OrderTest.php b/tests/Component/OrderManagement/OrderTest.php index a5d49db..94b9578 100644 --- a/tests/Component/OrderManagement/OrderTest.php +++ b/tests/Component/OrderManagement/OrderTest.php @@ -22,6 +22,7 @@ use GuzzleHttp\Psr7\Response; use Klarna\Rest\Transport\Method; use Klarna\Rest\OrderManagement\Capture; +use Klarna\Rest\OrderManagement\Refund; use Klarna\Rest\OrderManagement\Order; use Klarna\Rest\Tests\Component\ResourceTestCase; @@ -80,7 +81,7 @@ public function testFetch() $this->assertAuthorization($request); $capture = $order['captures'][0]; - $this->assertInstanceOf('Klarna\Rest\OrderManagement\Capture', $capture); + $this->assertInstanceOf(Capture::class, $capture); $this->assertEquals($capture->getId(), $capture['capture_id']); $this->assertEquals('1002', $capture->getId()); $this->assertEquals('data', $capture['test']); @@ -262,7 +263,7 @@ public function testRefund() $order = new Order($this->connector, '0002'); $refund = $order->refund(['data' => 'sent in']); - $this->assertInstanceOf('Klarna\Rest\OrderManagement\Refund', $refund); + $this->assertInstanceOf(Refund::class, $refund); $request = $this->mock->getLastRequest(); $this->assertEquals(Method::POST, $request->getMethod()); @@ -302,7 +303,7 @@ public function testFetchRefund() $order = new Order($this->connector, '0002'); $refund = $order->fetchRefund('refund-id-123'); - $this->assertInstanceOf('Klarna\Rest\OrderManagement\Refund', $refund); + $this->assertInstanceOf(Refund::class, $refund); $this->assertEquals( '/ordermanagement/v1/orders/0002/refunds/refund-id-123', $refund->getLocation() @@ -357,7 +358,7 @@ public function testFetchExistingRefund() $order->fetchRefund('refund-id-XXX'); $refund = $order->fetchRefund('refund-id-123'); - + $this->assertEquals('abc', $refund['test_data']); } @@ -376,7 +377,7 @@ public function testCreateCapture() $order = new Order($this->connector, '0002'); $capture = $order->createCapture(['data' => 'goes here']); - $this->assertInstanceOf('Klarna\Rest\OrderManagement\Capture', $capture); + $this->assertInstanceOf(Capture::class, $capture); $this->assertEquals('http://somewhere/a-path', $capture->getLocation()); $request = $this->mock->getLastRequest(); @@ -418,7 +419,7 @@ public function testFetchCapture() $order = new Order($this->connector, '0002'); $capture = $order->fetchCapture('1002'); - $this->assertInstanceOf('Klarna\Rest\OrderManagement\Capture', $capture); + $this->assertInstanceOf(Capture::class, $capture); $this->assertEquals( '/ordermanagement/v1/orders/0002/captures/1002', $capture->getLocation() @@ -461,7 +462,7 @@ public function testFetchCaptureExisting() $order['captures'][] = $capture; $capture = $order->fetchCapture('1002'); - $this->assertInstanceOf('Klarna\Rest\OrderManagement\Capture', $capture); + $this->assertInstanceOf(Capture::class, $capture); $this->assertEquals( '/ordermanagement/v1/orders/0002/captures/1002', $capture->getLocation() @@ -504,7 +505,7 @@ public function testFetchCaptureNew() $order['captures'][] = $capture; $capture = $order->fetchCapture('1003'); - $this->assertInstanceOf('Klarna\Rest\OrderManagement\Capture', $capture); + $this->assertInstanceOf(Capture::class, $capture); $this->assertEquals( '/ordermanagement/v1/orders/0002/captures/1003', $capture->getLocation() @@ -546,9 +547,9 @@ public function testFetchCaptures() $order = new Order($this->connector, '0002'); $captures = $order->fetchCaptures(); - $this->assertEquals(2, count($captures), 'Mismatched amount of captures'); + $this->assertCount(2, $captures, 'Mismatched amount of captures'); - $this->assertInstanceOf('Klarna\Rest\OrderManagement\Capture', $captures[0]); + $this->assertInstanceOf(Capture::class, $captures[0]); $this->assertEquals( '/ordermanagement/v1/orders/0002/captures/1001', $captures[0]->getLocation() diff --git a/tests/Component/Settlements/PayoutsTest.php b/tests/Component/Settlements/PayoutsTest.php index 30e4c5a..cddd3fe 100644 --- a/tests/Component/Settlements/PayoutsTest.php +++ b/tests/Component/Settlements/PayoutsTest.php @@ -118,7 +118,7 @@ public function testGetAllPayouts() $payout = new Payouts($this->connector); $data = $payout->getAllPayouts($params); - $this->assertEquals(1, count($data['payouts'])); + $this->assertCount(1, $data['payouts']); $this->assertEquals(500, $data['payouts'][0]['totals']['sale_amount']); $this->assertEquals(10, $data['pagination']['count']); @@ -165,7 +165,7 @@ public function testSummary() $payout = new Payouts($this->connector); $data = $payout->getSummary($params); - $this->assertEquals(2, count($data)); + $this->assertCount(2, $data); $this->assertEquals(550, $data[0]['summary_total_fee_correction_amount']); $this->assertEquals(100, $data[1]['summary_total_fee_correction_amount']); diff --git a/tests/Component/TestCase.php b/tests/Component/TestCase.php index 99fd119..da4313d 100644 --- a/tests/Component/TestCase.php +++ b/tests/Component/TestCase.php @@ -19,6 +19,7 @@ namespace Klarna\Rest\Tests\Component; +use PHPUnit\Framework\TestCase as PHPUnitTestCase; use GuzzleHttp\Client; use GuzzleHttp\Handler\MockHandler; use GuzzleHttp\HandlerStack; @@ -29,7 +30,7 @@ /** * Base component test case class. */ -class TestCase extends \PHPUnit_Framework_TestCase +class TestCase extends PHPUnitTestCase { const USERNAME = '1234'; diff --git a/tests/Integration/TestCase.php b/tests/Integration/TestCase.php index 9ef131b..3705a24 100644 --- a/tests/Integration/TestCase.php +++ b/tests/Integration/TestCase.php @@ -19,10 +19,12 @@ namespace Klarna\Rest\Tests\Integration; +use PHPUnit\Framework\TestCase as PHPUnitTestCase; + /** * Base unit test case class. */ -class TestCase extends \PHPUnit\Framework\TestCase +class TestCase extends PHPUnitTestCase { protected $rootPath; protected $credentials = []; @@ -39,7 +41,7 @@ protected function setUp() { $this->rootPath = dirname(dirname(__DIR__)); $this->credentials = json_decode(getenv('CREDENTIALS'), true); - + if (empty($this->credentials)) { $path = $this->rootPath . '/credentials.json'; if (file_exists($path)) { diff --git a/tests/Unit/Checkout/OrderTest.php b/tests/Unit/Checkout/OrderTest.php index 8f60c20..edf6edf 100644 --- a/tests/Unit/Checkout/OrderTest.php +++ b/tests/Unit/Checkout/OrderTest.php @@ -19,12 +19,9 @@ namespace Klarna\Tests\Unit\Rest\Checkout; -use GuzzleHttp\Exception\RequestException; use Klarna\Rest\Checkout\Order; use Klarna\Rest\Transport\Method; use Klarna\Rest\Tests\Unit\TestCase; -use Klarna\Rest\Transport\Connector; -use Klarna\Rest\Transport\Exception\ConnectorException; /** * Unit test cases for the checkout order resource. diff --git a/tests/Unit/OrderManagement/CaptureTest.php b/tests/Unit/OrderManagement/CaptureTest.php index c9afbd6..fe83af4 100644 --- a/tests/Unit/OrderManagement/CaptureTest.php +++ b/tests/Unit/OrderManagement/CaptureTest.php @@ -19,12 +19,9 @@ namespace Klarna\Tests\Unit\Rest\OrderManagement; -use GuzzleHttp\Exception\RequestException; use Klarna\Rest\OrderManagement\Capture; use Klarna\Rest\Tests\Unit\TestCase; -use Klarna\Rest\Transport\Connector; use Klarna\Rest\Transport\Method; -use Klarna\Rest\Transport\Exception\ConnectorException; /** * Unit test cases for the capture resource. @@ -227,7 +224,7 @@ public function testCreateInvalidStatusCode() $this->response->expects($this->any()) ->method('getStatus') ->will($this->returnValue('204')); - + $capture = new Capture($this->connector, '/orders/1'); $this->setExpectedException( diff --git a/tests/Unit/OrderManagement/OrderTest.php b/tests/Unit/OrderManagement/OrderTest.php index fe2480a..4096d0a 100644 --- a/tests/Unit/OrderManagement/OrderTest.php +++ b/tests/Unit/OrderManagement/OrderTest.php @@ -19,13 +19,10 @@ namespace Klarna\Tests\Unit\Rest\OrderManagement; -use GuzzleHttp\Exception\RequestException; use Klarna\Rest\OrderManagement\Capture; use Klarna\Rest\OrderManagement\Order; use Klarna\Rest\Tests\Unit\TestCase; -use Klarna\Rest\Transport\Connector; use Klarna\Rest\Transport\Method; -use Klarna\Rest\Transport\Exception\ConnectorException; /** * Unit test cases for the order resource. @@ -691,7 +688,7 @@ public function testFetchCapture() $order = new Order($this->connector, '12345'); $capture = $order->fetchCapture('2'); - $this->assertInstanceOf('Klarna\Rest\OrderManagement\Capture', $capture); + $this->assertInstanceOf(Capture::class, $capture); $this->assertEquals('from response json', $capture['data']); } @@ -776,7 +773,7 @@ public function testFetchCaptureNoCache() $capture = $order->fetchCapture('2'); - $this->assertInstanceOf('Klarna\Rest\OrderManagement\Capture', $capture); + $this->assertInstanceOf(Capture::class, $capture); $this->assertEquals('from response json', $capture['data']); $this->assertEquals('2', $capture->getId()); } diff --git a/tests/Unit/ResourceTest.php b/tests/Unit/ResourceTest.php index 154dec9..04b7953 100644 --- a/tests/Unit/ResourceTest.php +++ b/tests/Unit/ResourceTest.php @@ -20,13 +20,9 @@ namespace Klarna\Rest\Tests\Unit; use GuzzleHttp\ClientInterface; -use GuzzleHttp\Exception\RequestException; use Klarna\Rest\Tests\Unit\TestCase; use Klarna\Rest\Transport\Connector; -use Klarna\Rest\Transport\Exception\ConnectorException; use Klarna\Rest\Transport\UserAgent; -use Klarna\Rest\Resource; -use GuzzleHttp\Psr7\Response; /** * Unit test cases for the resource class. @@ -109,7 +105,7 @@ public function testLocation() { $r = $this->getMockForAbstractClass('Klarna\Rest\Resource', [$this->connector]); $this->assertEquals(null, $r->getLocation()); - + $r->setLocation('/new/location'); $this->assertEquals('/new/location', $r->getLocation()); } diff --git a/tests/Unit/TestCase.php b/tests/Unit/TestCase.php index d43fbc4..67aa2cc 100644 --- a/tests/Unit/TestCase.php +++ b/tests/Unit/TestCase.php @@ -19,13 +19,14 @@ namespace Klarna\Rest\Tests\Unit; +use PHPUnit\Framework\TestCase as PHPUnitTestCase; use Klarna\Rest\Transport\Connector; use Klarna\Rest\Transport\ApiResponse; /** * Base unit test case class. */ -class TestCase extends \PHPUnit_Framework_TestCase +class TestCase extends PHPUnitTestCase { /** */ diff --git a/tests/Unit/Transport/ApiResponseTest.php b/tests/Unit/Transport/ApiResponseTest.php index 61cf05b..be59f4b 100644 --- a/tests/Unit/Transport/ApiResponseTest.php +++ b/tests/Unit/Transport/ApiResponseTest.php @@ -19,12 +19,13 @@ namespace Klarna\Rest\Tests\Unit\Transport; +use PHPUnit\Framework\TestCase; use Klarna\Rest\Transport\ApiResponse; /** * Unit test cases for the UserAgent class. */ -class ApiResponseTest extends \PHPUnit_Framework_TestCase +class ApiResponseTest extends TestCase { /** * Make sure the default user agent components are present. diff --git a/tests/Unit/Transport/Exception/ConnectorExceptionTest.php b/tests/Unit/Transport/Exception/ConnectorExceptionTest.php index d0cd1a9..ea13f10 100644 --- a/tests/Unit/Transport/Exception/ConnectorExceptionTest.php +++ b/tests/Unit/Transport/Exception/ConnectorExceptionTest.php @@ -19,15 +19,13 @@ namespace Klarna\Rest\Tests\Unit\Transport\Exception; -use GuzzleHttp\Exception\RequestException; +use PHPUnit\Framework\TestCase; use Klarna\Rest\Transport\Exception\ConnectorException; -use Psr\Http\Message\RequestInterface; -use Psr\Http\Message\ResponseInterface; /** * Unit test cases for the ConnectorException. */ -class ConnectorExceptionTest extends \PHPUnit_Framework_TestCase +class ConnectorExceptionTest extends TestCase { /** * Make sure the getters work as intended. diff --git a/tests/Unit/Transport/GuzzleConnectorTest.php b/tests/Unit/Transport/GuzzleConnectorTest.php index b9acf0e..5c00f38 100644 --- a/tests/Unit/Transport/GuzzleConnectorTest.php +++ b/tests/Unit/Transport/GuzzleConnectorTest.php @@ -25,7 +25,6 @@ use GuzzleHttp\Exception\RequestException; use Klarna\Rest\Tests\Unit\TestCase; use Klarna\Rest\Transport\Connector; -use Klarna\Rest\Transport\Exception\ConnectorException; use Klarna\Rest\Transport\UserAgent; /** @@ -259,7 +258,7 @@ public function testCreate() ); $client = $connector->getClient(); - $this->assertInstanceOf('GuzzleHttp\ClientInterface', $client); + $this->assertInstanceOf(ClientInterface::class, $client); $this->assertEquals(self::BASE_URL, $client->getConfig('base_uri')); @@ -283,7 +282,7 @@ public function testCreateDefaultUserAgent() ); $userAgent = $connector->getUserAgent(); - $this->assertInstanceOf('Klarna\Rest\Transport\UserAgent', $userAgent); + $this->assertInstanceOf(UserAgent::class, $userAgent); $this->assertContains('Library/Klarna.kco_rest_php', strval($userAgent)); } @@ -296,7 +295,7 @@ public function testGetClient() { $client = $this->object->getClient(); - $this->assertInstanceOf('GuzzleHttp\ClientInterface', $client); + $this->assertInstanceOf(ClientInterface::class, $client); $this->assertSame($this->client, $client); } } diff --git a/tests/Unit/Transport/ResponseValidatorTest.php b/tests/Unit/Transport/ResponseValidatorTest.php index 081914e..5374907 100644 --- a/tests/Unit/Transport/ResponseValidatorTest.php +++ b/tests/Unit/Transport/ResponseValidatorTest.php @@ -19,6 +19,7 @@ namespace Klarna\Rest\Tests\Unit\Transport; +use PHPUnit\Framework\TestCase; use Klarna\Rest\Transport\ResponseValidator; use Klarna\Rest\Transport\ApiResponse; use Psr\Http\Message\ResponseInterface; @@ -26,7 +27,7 @@ /** * Unit test cases for the ResponseValidator class. */ -class ResponseValidatorTest extends \PHPUnit_Framework_TestCase +class ResponseValidatorTest extends TestCase { /** * @var ResponseInterface diff --git a/tests/Unit/Transport/UserAgentTest.php b/tests/Unit/Transport/UserAgentTest.php index b2e3903..664c56f 100644 --- a/tests/Unit/Transport/UserAgentTest.php +++ b/tests/Unit/Transport/UserAgentTest.php @@ -19,12 +19,13 @@ namespace Klarna\Rest\Tests\Unit\Transport; +use PHPUnit\Framework\TestCase; use Klarna\Rest\Transport\UserAgent; /** * Unit test cases for the UserAgent class. */ -class UserAgentTest extends \PHPUnit_Framework_TestCase +class UserAgentTest extends TestCase { /** * @var UserAgent