2 Commits
0.0.3 ... 0.0.4

5 changed files with 210 additions and 24 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.3", "version": "0.0.4",
"authors": [ "authors": [
{ {
"name": "Meritoo", "name": "Meritoo",

View File

@@ -0,0 +1,31 @@
<?php
/**
* (c) Meritoo.pl, http://www.meritoo.pl
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Meritoo\LimeSurvey\ApiClient\Exception;
/**
* An exception used while raw data returned by the LimeSurvey's API cannot be processed
*
* @author Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
* @copyright Meritoo.pl
*/
class CannotProcessDataException extends \Exception
{
/**
* Class constructor
*
* @param string $reason Reason why data cannot be processed, e.g. "Invalid user name or password"
*/
public function __construct($reason)
{
$template = 'Raw data returned by the LimeSurvey\'s API cannot be processed. Reason: \'%s\'.';
$message = sprintf($template, $reason);
parent::__construct($message);
}
}

View File

@@ -10,6 +10,7 @@ namespace Meritoo\LimeSurvey\ApiClient\Result;
use Meritoo\Common\Collection\Collection; use Meritoo\Common\Collection\Collection;
use Meritoo\LimeSurvey\ApiClient\Base\Result\BaseItem; use Meritoo\LimeSurvey\ApiClient\Base\Result\BaseItem;
use Meritoo\LimeSurvey\ApiClient\Exception\CannotProcessDataException;
use Meritoo\LimeSurvey\ApiClient\Result\Processor\ResultProcessor; use Meritoo\LimeSurvey\ApiClient\Result\Processor\ResultProcessor;
use Meritoo\LimeSurvey\ApiClient\Type\MethodType; use Meritoo\LimeSurvey\ApiClient\Type\MethodType;
@@ -35,6 +36,13 @@ class Result
*/ */
private $rawData; private $rawData;
/**
* Status, information returned instead of usual/normal result
*
* @var string
*/
private $status;
/** /**
* Processor of the raw data fetched while talking to the LimeSurvey's API * Processor of the raw data fetched while talking to the LimeSurvey's API
* *
@@ -52,7 +60,7 @@ class Result
public function __construct($method, array $rawData) public function __construct($method, array $rawData)
{ {
$this->method = MethodType::getValidatedMethod($method); $this->method = MethodType::getValidatedMethod($method);
$this->rawData = $rawData; $this->setRawDataAndStatus($rawData);
} }
/** /**
@@ -71,14 +79,41 @@ class Result
* @param bool $raw (optional) If is set to true, raw data provided by the LimeSurvey's API will be returned. * @param bool $raw (optional) If is set to true, raw data provided by the LimeSurvey's API will be returned.
* Otherwise - prepared/processed. * Otherwise - prepared/processed.
* @return array|Collection|BaseItem * @return array|Collection|BaseItem
* @throws CannotProcessDataException
*/ */
public function getData($raw = false) public function getData($raw = false)
{ {
/*
* Raw data should be returned only?
* Let's do it
*/
if ($raw) { if ($raw) {
return $this->rawData; return $this->rawData;
} }
return $this->getProcessedData($this->rawData); /*
* Status is unknown?
* Let's process the raw data
*/
if (empty($this->status)) {
return $this->getProcessedData($this->rawData);
}
/*
* Oops, the raw data returned by the LimeSurvey's API cannot be processed, because status was provided.
* Well, probably something is broken and... there is no data.
*/
throw new CannotProcessDataException($this->status);
}
/**
* Returns status, information returned instead of usual/normal result
*
* @return string
*/
public function getStatus()
{
return $this->status;
} }
/** /**
@@ -119,4 +154,23 @@ class Result
return $this->resultProcessor; return $this->resultProcessor;
} }
/**
* Sets status, information returned instead of usual/normal result and raw data returned by the LimeSurvey's API
*
* @param array $rawData Raw data returned by the LimeSurvey's API
*/
private function setRawDataAndStatus(array $rawData)
{
/*
* Status was provided?
* Well, probably something is broken and... there is no data
*/
if (isset($rawData['status'])) {
$this->status = trim($rawData['status']);
$rawData = [];
}
$this->rawData = $rawData;
}
} }

View File

@@ -0,0 +1,60 @@
<?php
/**
* (c) Meritoo.pl, http://www.meritoo.pl
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Meritoo\LimeSurvey\Test\ApiClient\Exception;
use Generator;
use Meritoo\Common\Test\Base\BaseTestCase;
use Meritoo\Common\Type\OopVisibilityType;
use Meritoo\LimeSurvey\ApiClient\Exception\CannotProcessDataException;
/**
* Test case of an exception used while raw data returned by the LimeSurvey's API cannot be processed
*
* @author Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
* @copyright Meritoo.pl
*/
class CannotProcessDataExceptionTest extends BaseTestCase
{
public function testConstructorVisibilityAndArguments()
{
static::assertConstructorVisibilityAndArguments(CannotProcessDataException::class, OopVisibilityType::IS_PUBLIC, 1, 1);
}
/**
* @param string $reason Reason why data cannot be processed, e.g. "Invalid user name or password"
* @param string $expectedMessage Expected exception's message
*
* @dataProvider provideReason
*/
public function testConstructorMessage($reason, $expectedMessage)
{
$exception = new CannotProcessDataException($reason);
static::assertEquals($expectedMessage, $exception->getMessage());
}
/**
* Provides reason why data cannot be processed
*
* @return Generator
*/
public function provideReason()
{
$template = 'Raw data returned by the LimeSurvey\'s API cannot be processed. Reason: \'%s\'.';
yield[
'unknown',
sprintf($template, 'unknown'),
];
yield[
'Invalid user name or password',
sprintf($template, 'Invalid user name or password'),
];
}
}

View File

@@ -12,6 +12,7 @@ use DateTime;
use Meritoo\Common\Test\Base\BaseTestCase; use Meritoo\Common\Test\Base\BaseTestCase;
use Meritoo\Common\Type\OopVisibilityType; use Meritoo\Common\Type\OopVisibilityType;
use Meritoo\LimeSurvey\ApiClient\Base\Result\BaseItem; use Meritoo\LimeSurvey\ApiClient\Base\Result\BaseItem;
use Meritoo\LimeSurvey\ApiClient\Exception\CannotProcessDataException;
use Meritoo\LimeSurvey\ApiClient\Result\Result; use Meritoo\LimeSurvey\ApiClient\Result\Result;
use Meritoo\LimeSurvey\ApiClient\Type\MethodType; use Meritoo\LimeSurvey\ApiClient\Type\MethodType;
use PHPUnit_Framework_MockObject_MockObject; use PHPUnit_Framework_MockObject_MockObject;
@@ -46,28 +47,43 @@ class ResultTest extends BaseTestCase
private $notIterableData; private $notIterableData;
/** /**
* Mock of the tested class. * Status provided instead of real data.
* With empty data returned by the LimeSurvey's API. * An array with one key: "status".
* *
* @var PHPUnit_Framework_MockObject_MockObject * @var array
*/ */
private $emptyDataMock; private $statusInsteadData;
/** /**
* Result with empty data returned by the LimeSurvey's API.
* Mock of the tested class. * Mock of the tested class.
* With iterable, not empty data.
* *
* @var PHPUnit_Framework_MockObject_MockObject * @var PHPUnit_Framework_MockObject_MockObject
*/ */
private $iterableDataMock; private $emptyDataResult;
/** /**
* Result with iterable, not empty data.
* Mock of the tested class. * Mock of the tested class.
* With not iterable, not empty data.
* *
* @var PHPUnit_Framework_MockObject_MockObject * @var PHPUnit_Framework_MockObject_MockObject
*/ */
private $notIterableDataMock; private $iterableDataResult;
/**
* Result with not iterable, not empty data.
* Mock of the tested class.
*
* @var PHPUnit_Framework_MockObject_MockObject
*/
private $notIterableDataResult;
/**
* Result with status provided instead of real data
*
* @var Result
*/
private $statusInsteadDataResult;
public function testConstructorVisibilityAndArguments() public function testConstructorVisibilityAndArguments()
{ {
@@ -76,15 +92,15 @@ class ResultTest extends BaseTestCase
public function testIsEmpty() public function testIsEmpty()
{ {
static::assertTrue($this->emptyDataMock->isEmpty()); static::assertTrue($this->emptyDataResult->isEmpty());
static::assertFalse($this->iterableDataMock->isEmpty()); static::assertFalse($this->iterableDataResult->isEmpty());
} }
public function testGetDataUsingProcessedData() public function testGetDataUsingProcessedData()
{ {
$emptyData = $this->emptyDataMock->getData(); $emptyData = $this->emptyDataResult->getData();
$iterableData = $this->iterableDataMock->getData(); $iterableData = $this->iterableDataResult->getData();
$notIterableData = $this->notIterableDataMock->getData(); $notIterableData = $this->notIterableDataResult->getData();
static::assertEmpty($emptyData); static::assertEmpty($emptyData);
static::assertNotEmpty($iterableData); static::assertNotEmpty($iterableData);
@@ -97,8 +113,8 @@ class ResultTest extends BaseTestCase
public function testGetDataUsingRawData() public function testGetDataUsingRawData()
{ {
$emptyData = $this->emptyDataMock->getData(true); $emptyData = $this->emptyDataResult->getData(true);
$iterableData = $this->iterableDataMock->getData(true); $iterableData = $this->iterableDataResult->getData(true);
static::assertEmpty($emptyData); static::assertEmpty($emptyData);
static::assertNotEmpty($iterableData); static::assertNotEmpty($iterableData);
@@ -110,6 +126,12 @@ class ResultTest extends BaseTestCase
static::assertEquals($this->iterableData, $iterableData); static::assertEquals($this->iterableData, $iterableData);
} }
public function testGetDataUsingProcessedDataWhoCannotBeProcessed()
{
$this->expectException(CannotProcessDataException::class);
$this->statusInsteadDataResult->getData();
}
public function testGetProcessedDataVisibilityAndArguments() public function testGetProcessedDataVisibilityAndArguments()
{ {
static::assertMethodVisibilityAndArguments(Result::class, 'getProcessedData', OopVisibilityType::IS_PRIVATE, 1, 1); static::assertMethodVisibilityAndArguments(Result::class, 'getProcessedData', OopVisibilityType::IS_PRIVATE, 1, 1);
@@ -120,6 +142,20 @@ class ResultTest extends BaseTestCase
static::assertMethodVisibilityAndArguments(Result::class, 'getResultProcessor', OopVisibilityType::IS_PRIVATE); static::assertMethodVisibilityAndArguments(Result::class, 'getResultProcessor', OopVisibilityType::IS_PRIVATE);
} }
public function testGetStatusWhenIsNotProvided()
{
$result = new Result(MethodType::ADD_PARTICIPANTS, []);
static::assertEquals(null, $result->getStatus());
static::assertEquals([], $result->getData(true));
}
public function testGetStatusWhenIsProvided()
{
static::assertEquals($this->statusInsteadData['status'], $this->statusInsteadDataResult->getStatus());
static::assertEquals([], $this->statusInsteadDataResult->getData(true));
}
/** /**
* {@inheritdoc{ * {@inheritdoc{
*/ */
@@ -149,24 +185,29 @@ class ResultTest extends BaseTestCase
], ],
]; ];
$emptyDataArguments = [ $this->statusInsteadData = [
'status' => 'Invalid data',
];
$emptyData = [
MethodType::LIST_SURVEYS, MethodType::LIST_SURVEYS,
$this->emptyData, $this->emptyData,
]; ];
$iterableDataArguments = [ $iterableData = [
MethodType::LIST_SURVEYS, MethodType::LIST_SURVEYS,
$this->iterableData, $this->iterableData,
]; ];
$notIterableDataArguments = [ $notIterableData = [
MethodType::GET_PARTICIPANT_PROPERTIES, MethodType::GET_PARTICIPANT_PROPERTIES,
$this->notIterableData, $this->notIterableData,
]; ];
$this->emptyDataMock = $this->getResultMock($emptyDataArguments); $this->emptyDataResult = $this->getResultMock($emptyData);
$this->iterableDataMock = $this->getResultMock($iterableDataArguments); $this->iterableDataResult = $this->getResultMock($iterableData);
$this->notIterableDataMock = $this->getResultMock($notIterableDataArguments); $this->notIterableDataResult = $this->getResultMock($notIterableData);
$this->statusInsteadDataResult = new Result(MethodType::LIST_PARTICIPANTS, $this->statusInsteadData);
} }
/** /**