From 92315bd853a608c0c4b8a06daf88e0dba5909d17 Mon Sep 17 00:00:00 2001 From: Meritoo Date: Wed, 27 Sep 2017 12:22:06 +0200 Subject: [PATCH] Minor refactoring --- composer.json | 2 +- .../Manager/JsonRpcClientManager.php | 5 +- .../ConnectionConfigurationTest.php | 74 ++++++++++--------- 3 files changed, 43 insertions(+), 38 deletions(-) diff --git a/composer.json b/composer.json index 6903ff7..6485711 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Client of LimeSurvey API", "type": "library", "license": "MIT", - "version": "0.0.5", + "version": "0.0.6", "authors": [ { "name": "Meritoo", diff --git a/src/Meritoo/LimeSurvey/ApiClient/Manager/JsonRpcClientManager.php b/src/Meritoo/LimeSurvey/ApiClient/Manager/JsonRpcClientManager.php index b7ffba2..26e1417 100644 --- a/src/Meritoo/LimeSurvey/ApiClient/Manager/JsonRpcClientManager.php +++ b/src/Meritoo/LimeSurvey/ApiClient/Manager/JsonRpcClientManager.php @@ -85,7 +85,10 @@ class JsonRpcClientManager * The "debug" mode is turned on? */ if ($this->connectionConfiguration->isDebugModeOn()) { - $this->rpcClient->getHttpClient()->withDebug(); + $this + ->rpcClient + ->getHttpClient() + ->withDebug(); } } diff --git a/tests/Meritoo/LimeSurvey/Test/ApiClient/Configuration/ConnectionConfigurationTest.php b/tests/Meritoo/LimeSurvey/Test/ApiClient/Configuration/ConnectionConfigurationTest.php index d782bab..54ec1f2 100644 --- a/tests/Meritoo/LimeSurvey/Test/ApiClient/Configuration/ConnectionConfigurationTest.php +++ b/tests/Meritoo/LimeSurvey/Test/ApiClient/Configuration/ConnectionConfigurationTest.php @@ -22,6 +22,13 @@ use Meritoo\LimeSurvey\ApiClient\Configuration\ConnectionConfiguration; */ class ConnectionConfigurationTest extends BaseTestCase { + /** + * Simple instance of the configuration + * + * @var ConnectionConfiguration + */ + private $simpleConfiguration; + public function testConstructorVisibilityAndArguments() { static::assertConstructorVisibilityAndArguments(ConnectionConfiguration::class, OopVisibilityType::IS_PUBLIC, 4, 3); @@ -49,69 +56,55 @@ class ConnectionConfigurationTest extends BaseTestCase public function testConstructor() { - $configuration = new ConnectionConfiguration('http://test.com', 'test1', 'test2'); - - static::assertEquals('http://test.com', $configuration->getBaseUrl()); - static::assertEquals('test1', $configuration->getUsername()); - static::assertEquals('test2', $configuration->getPassword()); - static::assertFalse($configuration->isDebugModeOn()); + static::assertEquals('http://test.com', $this->simpleConfiguration->getBaseUrl()); + static::assertEquals('test1', $this->simpleConfiguration->getUsername()); + static::assertEquals('test2', $this->simpleConfiguration->getPassword()); + static::assertFalse($this->simpleConfiguration->isDebugModeOn()); } public function testSetBaseUrl() { - $configuration = new ConnectionConfiguration('http://test.com', 'test1', 'test2'); + $this->simpleConfiguration->setBaseUrl('http://lorem.ipsum'); + static::assertEquals('http://lorem.ipsum', $this->simpleConfiguration->getBaseUrl()); - $configuration->setBaseUrl('http://lorem.ipsum'); - static::assertEquals('http://lorem.ipsum', $configuration->getBaseUrl()); - - $configuration->setBaseUrl('http://lorem.ipsum/'); - static::assertEquals('http://lorem.ipsum', $configuration->getBaseUrl()); + $this->simpleConfiguration->setBaseUrl('http://lorem.ipsum/'); + static::assertEquals('http://lorem.ipsum', $this->simpleConfiguration->getBaseUrl()); } public function testSetRemoteControlUrl() { - $configuration = new ConnectionConfiguration('http://test.com', 'test1', 'test2'); - $configuration->setRemoteControlUrl('/lorem/ipsum'); - - static::assertEquals('/lorem/ipsum', $configuration->getRemoteControlUrl()); + $this->simpleConfiguration->setRemoteControlUrl('/lorem/ipsum'); + static::assertEquals('/lorem/ipsum', $this->simpleConfiguration->getRemoteControlUrl()); } public function testSetUsername() { - $configuration = new ConnectionConfiguration('http://test.com', 'test1', 'test2'); - $configuration->setUsername('lorem'); - - static::assertEquals('lorem', $configuration->getUsername()); + $this->simpleConfiguration->setUsername('lorem'); + static::assertEquals('lorem', $this->simpleConfiguration->getUsername()); } public function testSetPassword() { - $configuration = new ConnectionConfiguration('http://test.com', 'test1', 'test2'); - $configuration->setPassword('ipsum'); - - static::assertEquals('ipsum', $configuration->getPassword()); + $this->simpleConfiguration->setPassword('ipsum'); + static::assertEquals('ipsum', $this->simpleConfiguration->getPassword()); } public function testSetDebugMode() { - $configuration = new ConnectionConfiguration('http://test.com', 'test1', 'test2'); + $this->simpleConfiguration->setDebugMode(); + static::assertFalse($this->simpleConfiguration->isDebugModeOn()); - $configuration->setDebugMode(); - static::assertFalse($configuration->isDebugModeOn()); + $this->simpleConfiguration->setDebugMode(false); + static::assertFalse($this->simpleConfiguration->isDebugModeOn()); - $configuration->setDebugMode(false); - static::assertFalse($configuration->isDebugModeOn()); - - $configuration->setDebugMode(true); - static::assertTrue($configuration->isDebugModeOn()); + $this->simpleConfiguration->setDebugMode(true); + static::assertTrue($this->simpleConfiguration->isDebugModeOn()); } public function testGetFullUrl() { - $configuration = new ConnectionConfiguration('http://test.com', 'test1', 'test2'); - $configuration->setRemoteControlUrl('lorem/ipsum'); - - static::assertEquals('http://test.com/lorem/ipsum', $configuration->getFullUrl()); + $this->simpleConfiguration->setRemoteControlUrl('lorem/ipsum'); + static::assertEquals('http://test.com/lorem/ipsum', $this->simpleConfiguration->getFullUrl()); } /** @@ -149,4 +142,13 @@ class ConnectionConfigurationTest extends BaseTestCase 'htp:/dolor.com', ]; } + + /** + * {@inheritdoc} + */ + protected function setUp() + { + parent::setUp(); + $this->simpleConfiguration = new ConnectionConfiguration('http://test.com', 'test1', 'test2'); + } }