From 2dc215a3e4554fa4608f80aa50f0accc9cd487be Mon Sep 17 00:00:00 2001 From: Meritoo Date: Thu, 21 Sep 2017 17:13:07 +0200 Subject: [PATCH] Tests - implement BaseTestCase::assert*() methods --- .../LimeSurvey/Test/ApiClient/Base/Result/BaseItemTest.php | 4 ++-- .../Meritoo/LimeSurvey/Test/ApiClient/Client/ClientTest.php | 4 ++-- .../Test/ApiClient/Manager/JsonRpcClientManagerTest.php | 4 ++-- .../Test/ApiClient/Manager/SessionManagerTest.php | 2 +- .../Test/ApiClient/Result/Processor/ResultProcessorTest.php | 2 +- .../Meritoo/LimeSurvey/Test/ApiClient/Result/ResultTest.php | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Base/Result/BaseItemTest.php b/tests/Meritoo/LimeSurvey/Test/ApiClient/Base/Result/BaseItemTest.php index c3defff..c00d1b1 100644 --- a/tests/Meritoo/LimeSurvey/Test/ApiClient/Base/Result/BaseItemTest.php +++ b/tests/Meritoo/LimeSurvey/Test/ApiClient/Base/Result/BaseItemTest.php @@ -8,8 +8,8 @@ namespace Meritoo\LimeSurvey\Test\ApiClient\Base\Result; +use Meritoo\Common\Test\Base\BaseTestCase; use Meritoo\LimeSurvey\ApiClient\Base\Result\BaseItem; -use PHPUnit_Framework_TestCase; use ReflectionClass; /** @@ -18,7 +18,7 @@ use ReflectionClass; * @author Krzysztof Niziol * @copyright Meritoo.pl */ -class BaseItemTest extends PHPUnit_Framework_TestCase +class BaseItemTest extends BaseTestCase { public function testConstructorVisibilityAndArguments() { diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Client/ClientTest.php b/tests/Meritoo/LimeSurvey/Test/ApiClient/Client/ClientTest.php index 7cfb6d3..15ba693 100644 --- a/tests/Meritoo/LimeSurvey/Test/ApiClient/Client/ClientTest.php +++ b/tests/Meritoo/LimeSurvey/Test/ApiClient/Client/ClientTest.php @@ -71,12 +71,12 @@ class ClientTest extends BaseTestCase public function testGetRpcClientManagerVisibilityAndArguments() { - $this->verifyMethodVisibilityAndArguments(Client::class, 'getRpcClientManager', OopVisibilityType::IS_PRIVATE); + static::assertMethodVisibilityAndArguments(Client::class, 'getRpcClientManager', OopVisibilityType::IS_PRIVATE); } public function testGetSessionManagerVisibilityAndArguments() { - $this->verifyMethodVisibilityAndArguments(Client::class, 'getRpcClientManager', OopVisibilityType::IS_PRIVATE); + static::assertMethodVisibilityAndArguments(Client::class, 'getRpcClientManager', OopVisibilityType::IS_PRIVATE); } /** diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Manager/JsonRpcClientManagerTest.php b/tests/Meritoo/LimeSurvey/Test/ApiClient/Manager/JsonRpcClientManagerTest.php index aadadb0..14a0be6 100644 --- a/tests/Meritoo/LimeSurvey/Test/ApiClient/Manager/JsonRpcClientManagerTest.php +++ b/tests/Meritoo/LimeSurvey/Test/ApiClient/Manager/JsonRpcClientManagerTest.php @@ -33,7 +33,7 @@ class JsonRpcClientManagerTest extends BaseTestCase public function testConstructorVisibilityAndArguments() { - $this->verifyConstructorVisibilityAndArguments(JsonRpcClientManager::class, OopVisibilityType::IS_PUBLIC, 1, 1); + static::assertConstructorVisibilityAndArguments(JsonRpcClientManager::class, OopVisibilityType::IS_PUBLIC, 1, 1); } public function testRunMethod() @@ -85,7 +85,7 @@ class JsonRpcClientManagerTest extends BaseTestCase public function testGetRpcClientVisibilityAndArguments() { - $this->verifyMethodVisibilityAndArguments(JsonRpcClientManager::class, 'getRpcClient', OopVisibilityType::IS_PROTECTED); + static::assertMethodVisibilityAndArguments(JsonRpcClientManager::class, 'getRpcClient', OopVisibilityType::IS_PROTECTED); } /** diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Manager/SessionManagerTest.php b/tests/Meritoo/LimeSurvey/Test/ApiClient/Manager/SessionManagerTest.php index c407934..158bcb5 100644 --- a/tests/Meritoo/LimeSurvey/Test/ApiClient/Manager/SessionManagerTest.php +++ b/tests/Meritoo/LimeSurvey/Test/ApiClient/Manager/SessionManagerTest.php @@ -24,7 +24,7 @@ class SessionManagerTest extends BaseTestCase { public function testConstructorVisibilityAndArguments() { - $this->verifyConstructorVisibilityAndArguments(SessionManager::class, OopVisibilityType::IS_PUBLIC, 1, 1); + static::assertConstructorVisibilityAndArguments(SessionManager::class, OopVisibilityType::IS_PUBLIC, 1, 1); } public function testGetSessionKeyWhenFailedWithoutReason() diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Processor/ResultProcessorTest.php b/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Processor/ResultProcessorTest.php index 2612d76..8d7f24d 100644 --- a/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Processor/ResultProcessorTest.php +++ b/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/Processor/ResultProcessorTest.php @@ -68,7 +68,7 @@ class ResultProcessorTest extends BaseTestCase public function testGetItemInstanceVisibilityAndArguments() { - $this->verifyMethodVisibilityAndArguments(ResultProcessor::class, 'getItemInstance', OopVisibilityType::IS_PRIVATE, 1, 1); + static::assertMethodVisibilityAndArguments(ResultProcessor::class, 'getItemInstance', OopVisibilityType::IS_PRIVATE, 1, 1); } public function testRunWithUnknownResultClass() diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/ResultTest.php b/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/ResultTest.php index 2b337e4..63deaf7 100644 --- a/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/ResultTest.php +++ b/tests/Meritoo/LimeSurvey/Test/ApiClient/Result/ResultTest.php @@ -71,7 +71,7 @@ class ResultTest extends BaseTestCase public function testConstructorVisibilityAndArguments() { - $this->verifyConstructorVisibilityAndArguments(Result::class, OopVisibilityType::IS_PUBLIC, 2, 2); + static::assertConstructorVisibilityAndArguments(Result::class, OopVisibilityType::IS_PUBLIC, 2, 2); } public function testIsEmpty() @@ -112,12 +112,12 @@ class ResultTest extends BaseTestCase public function testGetProcessedDataVisibilityAndArguments() { - $this->verifyMethodVisibilityAndArguments(Result::class, 'getProcessedData', OopVisibilityType::IS_PRIVATE, 1, 1); + static::assertMethodVisibilityAndArguments(Result::class, 'getProcessedData', OopVisibilityType::IS_PRIVATE, 1, 1); } public function testGetResultProcessorVisibilityAndArguments() { - $this->verifyMethodVisibilityAndArguments(Result::class, 'getResultProcessor', OopVisibilityType::IS_PRIVATE); + static::assertMethodVisibilityAndArguments(Result::class, 'getResultProcessor', OopVisibilityType::IS_PRIVATE); } /**