Minor refactoring

This commit is contained in:
Meritoo
2017-09-27 12:22:06 +02:00
parent c3e6935dd8
commit 92315bd853
3 changed files with 43 additions and 38 deletions

View File

@@ -3,7 +3,7 @@
"description": "Client of LimeSurvey API", "description": "Client of LimeSurvey API",
"type": "library", "type": "library",
"license": "MIT", "license": "MIT",
"version": "0.0.5", "version": "0.0.6",
"authors": [ "authors": [
{ {
"name": "Meritoo", "name": "Meritoo",

View File

@@ -85,7 +85,10 @@ class JsonRpcClientManager
* The "debug" mode is turned on? * The "debug" mode is turned on?
*/ */
if ($this->connectionConfiguration->isDebugModeOn()) { if ($this->connectionConfiguration->isDebugModeOn()) {
$this->rpcClient->getHttpClient()->withDebug(); $this
->rpcClient
->getHttpClient()
->withDebug();
} }
} }

View File

@@ -22,6 +22,13 @@ use Meritoo\LimeSurvey\ApiClient\Configuration\ConnectionConfiguration;
*/ */
class ConnectionConfigurationTest extends BaseTestCase class ConnectionConfigurationTest extends BaseTestCase
{ {
/**
* Simple instance of the configuration
*
* @var ConnectionConfiguration
*/
private $simpleConfiguration;
public function testConstructorVisibilityAndArguments() public function testConstructorVisibilityAndArguments()
{ {
static::assertConstructorVisibilityAndArguments(ConnectionConfiguration::class, OopVisibilityType::IS_PUBLIC, 4, 3); static::assertConstructorVisibilityAndArguments(ConnectionConfiguration::class, OopVisibilityType::IS_PUBLIC, 4, 3);
@@ -49,69 +56,55 @@ class ConnectionConfigurationTest extends BaseTestCase
public function testConstructor() public function testConstructor()
{ {
$configuration = new ConnectionConfiguration('http://test.com', 'test1', 'test2'); static::assertEquals('http://test.com', $this->simpleConfiguration->getBaseUrl());
static::assertEquals('test1', $this->simpleConfiguration->getUsername());
static::assertEquals('http://test.com', $configuration->getBaseUrl()); static::assertEquals('test2', $this->simpleConfiguration->getPassword());
static::assertEquals('test1', $configuration->getUsername()); static::assertFalse($this->simpleConfiguration->isDebugModeOn());
static::assertEquals('test2', $configuration->getPassword());
static::assertFalse($configuration->isDebugModeOn());
} }
public function testSetBaseUrl() 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'); $this->simpleConfiguration->setBaseUrl('http://lorem.ipsum/');
static::assertEquals('http://lorem.ipsum', $configuration->getBaseUrl()); static::assertEquals('http://lorem.ipsum', $this->simpleConfiguration->getBaseUrl());
$configuration->setBaseUrl('http://lorem.ipsum/');
static::assertEquals('http://lorem.ipsum', $configuration->getBaseUrl());
} }
public function testSetRemoteControlUrl() public function testSetRemoteControlUrl()
{ {
$configuration = new ConnectionConfiguration('http://test.com', 'test1', 'test2'); $this->simpleConfiguration->setRemoteControlUrl('/lorem/ipsum');
$configuration->setRemoteControlUrl('/lorem/ipsum'); static::assertEquals('/lorem/ipsum', $this->simpleConfiguration->getRemoteControlUrl());
static::assertEquals('/lorem/ipsum', $configuration->getRemoteControlUrl());
} }
public function testSetUsername() public function testSetUsername()
{ {
$configuration = new ConnectionConfiguration('http://test.com', 'test1', 'test2'); $this->simpleConfiguration->setUsername('lorem');
$configuration->setUsername('lorem'); static::assertEquals('lorem', $this->simpleConfiguration->getUsername());
static::assertEquals('lorem', $configuration->getUsername());
} }
public function testSetPassword() public function testSetPassword()
{ {
$configuration = new ConnectionConfiguration('http://test.com', 'test1', 'test2'); $this->simpleConfiguration->setPassword('ipsum');
$configuration->setPassword('ipsum'); static::assertEquals('ipsum', $this->simpleConfiguration->getPassword());
static::assertEquals('ipsum', $configuration->getPassword());
} }
public function testSetDebugMode() public function testSetDebugMode()
{ {
$configuration = new ConnectionConfiguration('http://test.com', 'test1', 'test2'); $this->simpleConfiguration->setDebugMode();
static::assertFalse($this->simpleConfiguration->isDebugModeOn());
$configuration->setDebugMode(); $this->simpleConfiguration->setDebugMode(false);
static::assertFalse($configuration->isDebugModeOn()); static::assertFalse($this->simpleConfiguration->isDebugModeOn());
$configuration->setDebugMode(false); $this->simpleConfiguration->setDebugMode(true);
static::assertFalse($configuration->isDebugModeOn()); static::assertTrue($this->simpleConfiguration->isDebugModeOn());
$configuration->setDebugMode(true);
static::assertTrue($configuration->isDebugModeOn());
} }
public function testGetFullUrl() public function testGetFullUrl()
{ {
$configuration = new ConnectionConfiguration('http://test.com', 'test1', 'test2'); $this->simpleConfiguration->setRemoteControlUrl('lorem/ipsum');
$configuration->setRemoteControlUrl('lorem/ipsum'); static::assertEquals('http://test.com/lorem/ipsum', $this->simpleConfiguration->getFullUrl());
static::assertEquals('http://test.com/lorem/ipsum', $configuration->getFullUrl());
} }
/** /**
@@ -149,4 +142,13 @@ class ConnectionConfigurationTest extends BaseTestCase
'htp:/dolor.com', 'htp:/dolor.com',
]; ];
} }
/**
* {@inheritdoc}
*/
protected function setUp()
{
parent::setUp();
$this->simpleConfiguration = new ConnectionConfiguration('http://test.com', 'test1', 'test2');
}
} }