From 63e7ddf5115cf4460941002b58099460eb57966a Mon Sep 17 00:00:00 2001 From: Meritoo Date: Fri, 27 Oct 2017 12:05:12 +0200 Subject: [PATCH] Tests - use common method to create/prepare date --- tests/Result/Item/ParticipantTest.php | 7 +++-- tests/Result/Item/SurveyTest.php | 5 ++-- tests/Result/ResultTest.php | 4 +-- tests/Service/ParticipantServiceTest.php | 8 ++--- tests/Utilities/DateUtility.php | 38 ++++++++++++++++++++++++ 5 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 tests/Utilities/DateUtility.php diff --git a/tests/Result/Item/ParticipantTest.php b/tests/Result/Item/ParticipantTest.php index fbb4c74..d62f8df 100644 --- a/tests/Result/Item/ParticipantTest.php +++ b/tests/Result/Item/ParticipantTest.php @@ -14,6 +14,7 @@ use Meritoo\Common\Type\OopVisibilityType; use Meritoo\LimeSurvey\ApiClient\Result\Item\Participant; use Meritoo\LimeSurvey\ApiClient\Result\Processor\ResultProcessor; use Meritoo\LimeSurvey\ApiClient\Type\MethodType; +use Meritoo\LimeSurvey\Test\ApiClient\Utilities\DateUtility; /** * Test case of the one item of the result/data: full data of participant @@ -196,7 +197,7 @@ class ParticipantTest extends BaseTestCase 'completed' => 'N', 'usesleft' => 10, 'validfrom' => null, - 'validuntil' => (new DateTime())->format('Y-m-d H:i:s'), + 'validuntil' => DateUtility::getDateTime(), ], [ 'tid' => '456', @@ -212,9 +213,9 @@ class ParticipantTest extends BaseTestCase 'sent' => 'Y', 'remindersent' => 'N', 'remindercount' => 1, - 'completed' => (new DateTime())->format('Y-m-d H:i'), + 'completed' => DateUtility::getDateTime(false), 'usesleft' => 5, - 'validfrom' => (new DateTime())->format('Y-m-d H:i:s'), + 'validfrom' => DateUtility::getDateTime(), 'validuntil' => null, ], ]; diff --git a/tests/Result/Item/SurveyTest.php b/tests/Result/Item/SurveyTest.php index 593d9ee..d015fbd 100644 --- a/tests/Result/Item/SurveyTest.php +++ b/tests/Result/Item/SurveyTest.php @@ -14,6 +14,7 @@ use Meritoo\Common\Type\OopVisibilityType; use Meritoo\LimeSurvey\ApiClient\Result\Item\Survey; use Meritoo\LimeSurvey\ApiClient\Result\Processor\ResultProcessor; use Meritoo\LimeSurvey\ApiClient\Type\MethodType; +use Meritoo\LimeSurvey\Test\ApiClient\Utilities\DateUtility; /** * Test case of the one item of the result/data: survey @@ -99,13 +100,13 @@ class SurveyTest extends BaseTestCase 'sid' => '123', 'surveyls_title' => 'Test', 'startdate' => null, - 'expires' => (new DateTime())->format('Y-m-d H:i:s'), + 'expires' => DateUtility::getDateTime(), 'active' => 'N', ], [ 'sid' => '456', 'surveyls_title' => 'Another Test', - 'startdate' => (new DateTime())->format('Y-m-d H:i:s'), + 'startdate' => DateUtility::getDateTime(), 'expires' => null, 'active' => 'Y', ], diff --git a/tests/Result/ResultTest.php b/tests/Result/ResultTest.php index a176a1c..33e5912 100644 --- a/tests/Result/ResultTest.php +++ b/tests/Result/ResultTest.php @@ -8,13 +8,13 @@ namespace Meritoo\LimeSurvey\Test\ApiClient\Result\Result; -use DateTime; use Meritoo\Common\Test\Base\BaseTestCase; use Meritoo\Common\Type\OopVisibilityType; use Meritoo\LimeSurvey\ApiClient\Base\Result\BaseItem; use Meritoo\LimeSurvey\ApiClient\Exception\CannotProcessDataException; use Meritoo\LimeSurvey\ApiClient\Result\Result; use Meritoo\LimeSurvey\ApiClient\Type\MethodType; +use Meritoo\LimeSurvey\Test\ApiClient\Utilities\DateUtility; use PHPUnit_Framework_MockObject_MockObject; /** @@ -179,7 +179,7 @@ class ResultTest extends BaseTestCase [ 'sid' => '456', 'surveyls_title' => 'Another Test', - 'startdate' => (new DateTime())->format('Y-m-d H:i:s'), + 'startdate' => DateUtility::getDateTime(), 'expires' => null, 'active' => 'Y', ], diff --git a/tests/Service/ParticipantServiceTest.php b/tests/Service/ParticipantServiceTest.php index cfe969c..e437aff 100644 --- a/tests/Service/ParticipantServiceTest.php +++ b/tests/Service/ParticipantServiceTest.php @@ -8,7 +8,6 @@ namespace Meritoo\LimeSurvey\Test\ApiClient\Service; -use DateTime; use Exception; use Meritoo\Common\Collection\Collection; use Meritoo\Common\Test\Base\BaseTestCase; @@ -23,6 +22,7 @@ use Meritoo\LimeSurvey\ApiClient\Result\Collection\ParticipantsDetails; use Meritoo\LimeSurvey\ApiClient\Result\Item\Participant; use Meritoo\LimeSurvey\ApiClient\Service\ParticipantService; use Meritoo\LimeSurvey\ApiClient\Type\ReasonType; +use Meritoo\LimeSurvey\Test\ApiClient\Utilities\DateUtility; use PHPUnit_Framework_MockObject_MockObject; /** @@ -207,10 +207,10 @@ class ParticipantServiceTest extends BaseTestCase 'sent' => 'Y', 'remindersent' => 'N', 'remindercount' => 0, - 'completed' => (new DateTime())->format('Y-m-d H:i:s'), + 'completed' => DateUtility::getDateTime(), 'usesleft' => 10, 'validfrom' => null, - 'validuntil' => (new DateTime())->format('Y-m-d H:i:s'), + 'validuntil' => DateUtility::getDateTime(), ], [ 'tid' => 2, @@ -229,7 +229,7 @@ class ParticipantServiceTest extends BaseTestCase 'completed' => 'N', 'usesleft' => 10, 'validfrom' => null, - 'validuntil' => (new DateTime())->format('Y-m-d H:i:s'), + 'validuntil' => DateUtility::getDateTime(), ], ]; } diff --git a/tests/Utilities/DateUtility.php b/tests/Utilities/DateUtility.php new file mode 100644 index 0000000..7941ed7 --- /dev/null +++ b/tests/Utilities/DateUtility.php @@ -0,0 +1,38 @@ + + * @copyright Meritoo.pl + */ +class DateUtility +{ + /** + * Returns date formatted with long or medium format + * + * @param bool $useLongFormat (optional) If is set to true, long format will be used (default behaviour). + * Otherwise - medium format. + * @return string + */ + public static function getDateTime($useLongFormat = true) + { + $format = 'Y-m-d H:i'; + + if ($useLongFormat) { + $format = 'Y-m-d H:i:s'; + } + + return (new DateTime())->format($format); + } +}