TorstenHettstedt/PHP-App-Timekeeping
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

refactor/update #30

Merged
TorstenHettstedt merged 15 commits from refactor/update into master 2025-06-16 15:48:34 +02:00
Conversation 1 Commits 15 Files Changed 110
+230 -203
8 changed files with 230 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 41a3c79c91 - Show all commits
api/tests/unit/Controller/AbstractControllerTest.php
+52
View File
@@ -0,0 +1,52 @@
<?php
namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Controller;
use Codeception\Test\Unit;
use Exception;
use PDO;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Container\ContainerInterface;
use Psr\Http\Message\StreamInterface;
use Slim\Psr7\Request;
use Slim\Psr7\Response;
class AbstractControllerTest extends Unit
{
protected const FICTIONAL_STATUS_CODE = 666;
protected ContainerInterface $container;
protected Request $request;
protected Response|MockObject $response;
/**
* @throws Exception
* @throws \PHPUnit\Framework\MockObject\Exception
*/
protected function _before(): void
{
parent::_before();
/** @noinspection SpellCheckingInspection */
$this->container = $this->makeEmpty(ContainerInterface::class, [
'has' => true,
'get' => new PDO(
'pgsql:host=psql.torsten-hettstedt.net;port=5432;dbname=testdb;user=bruce;password=mypass'
),
]);
$this->response = $this->createMock(Response::class);
$this->response->expects($this->any())->method('getStatusCode')->willReturn(self::FICTIONAL_STATUS_CODE);
$this->response->expects($this->any())->method('getBody')->willReturn(
$this->makeEmpty(StreamInterface::class, [
'write' => function (mixed $data) {
$this->assertIsString($data);
$this->assertJson($data);
return strlen($data);
},
'getContents' => 'abc',
])
);
$this->response->expects($this->any())->method('withHeader')->willReturn($this->response);
$this->response->expects($this->any())->method('withStatus')->willReturn($this->response);
}
}
api/tests/unit/Controller/WorkingHoursControllerTest.php
+47 -57
View File
@@ -2,14 +2,13 @@
namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Controller;
use Codeception\Example;
use Codeception\Test\Unit;
use Codeception\Attribute\DataProvider;
use Exception;
use PDO;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface;
use Psr\Http\Message\StreamInterface;
use Psr\Container\NotFoundExceptionInterface;
use Slim\Exception\HttpBadRequestException;
use Slim\Exception\HttpInternalServerErrorException;
use Slim\Exception\HttpNotFoundException;
use Slim\Psr7\Request;
use Slim\Psr7\Response;
@@ -17,51 +16,38 @@ use TorstenHettstedt\TimekeepingApi\Controller\HttpConflictRequestException;
use TorstenHettstedt\TimekeepingApi\Controller\NotDatabasesException;
use TorstenHettstedt\TimekeepingApi\Controller\WorkingHoursController;
class WorkingHoursControllerTest extends Unit
class WorkingHoursControllerTest extends AbstractControllerTest
{
const EXISTING_DATE = '2020-01-28';
const EXISTING_INTERVAL = '07:20:00';
const NEW_DATE = '2020-04-01';
const NEW_INTERVAL = '07:59:00';
protected const FICTIONAL_STATUS_CODE = 666;
public const EXISTING_DATE = '2020-01-28';
public const EXISTING_INTERVAL = '07:20:00';
public const NEW_DATE = '2020-04-01';
public const NEW_INTERVAL = '07:59:00';
protected ContainerInterface $container;
protected Request $request;
protected Response $response;
protected Response|MockObject $response;
/**
* @throws Exception
* @throws \PHPUnit\Framework\MockObject\Exception
*/
protected function _before(): void
{
parent::_before();
/** @noinspection SpellCheckingInspection */
$this->container = $this->makeEmpty(ContainerInterface::class, [
'has' => true,
'get' => new PDO('pgsql:host=psql.torsten-hettstedt.net;port=5432;dbname=testdb;user=bruce;password=mypass'),
]);
$this->request = $this->makeEmpty(Request::class, [
'getParsedBody' => [
'workingDay' => self::EXISTING_DATE,
'workingTime' => self::EXISTING_INTERVAL,
],
]);
$this->response = $this->makeEmpty(Response::class, [
'getBody' => $this->makeEmpty(StreamInterface::class, [
'write' => function (mixed $data) {
$this->assertIsString($data);
$this->assertJson($data);
return strlen($data);
},
]),
'withHeader' => $this->makeEmpty(Response::class, [
'withStatus' => $this->makeEmpty(Response::class),
]),
]);
}
/**
* @throws NotDatabasesException
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
* @throws Exception
*/
public function testConstructWithNonDatabase(): void
@@ -104,12 +90,12 @@ class WorkingHoursControllerTest extends Unit
/**
* @param array<string, string> $queryParams
*
* @dataProvider valideFilterDataProvider
*
* @throws HttpInternalServerErrorException
* @throws ContainerExceptionInterface
* @throws NotDatabasesException
* @throws NotFoundExceptionInterface
* @throws Exception
*/
#[DataProvider('valideFilterDataProvider')]
public function testBrowseWithValideParameter(array $queryParams): void
{
$this->request = $this->makeEmpty(Request::class, [
@@ -117,7 +103,8 @@ class WorkingHoursControllerTest extends Unit
]);
$controller = new WorkingHoursController($this->container);
$response = $controller->browse($this->request, $this->response, []);
$this->assertInstanceOf(Response::class, $response);
$this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
$this->assertNotEmpty($response->getBody()->getContents());
}
/**
@@ -247,12 +234,12 @@ class WorkingHoursControllerTest extends Unit
/**
* @param array<string, string> $queryParams
*
* @dataProvider invalideFilterDataProvider
*
* @throws HttpInternalServerErrorException
* @throws ContainerExceptionInterface
* @throws NotDatabasesException
* @throws NotFoundExceptionInterface
* @throws Exception
*/
#[DataProvider('invalideFilterDataProvider')]
public function testBrowseWithInvalideParameter(array $queryParams): void
{
$this->request = $this->makeEmpty(Request::class, [
@@ -264,9 +251,10 @@ class WorkingHoursControllerTest extends Unit
}
/**
* @throws ContainerExceptionInterface
* @throws NotDatabasesException
* @throws HttpBadRequestException
* @throws HttpNotFoundException
* @throws NotFoundExceptionInterface
* @throws Exception
*/
public function testUpdateExistRecord(): void
{
@@ -274,13 +262,15 @@ class WorkingHoursControllerTest extends Unit
$response = $controller->update($this->request, $this->response, [
'id' => self::EXISTING_DATE,
]);
$this->assertInstanceOf(Response::class, $response);
$this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
$this->assertNotEmpty($response->getBody()->getContents());
}
/**
* @throws ContainerExceptionInterface
* @throws NotDatabasesException
* @throws HttpBadRequestException
* @throws HttpNotFoundException
* @throws NotFoundExceptionInterface
* @throws Exception
*/
public function testUpdateNotExistRecord(): void
{
@@ -312,14 +302,12 @@ class WorkingHoursControllerTest extends Unit
* @param string $date
* @param string $time
*
* @dataProvider invalidCreatDataProvider
*
* @throws HttpBadRequestException
* @throws HttpConflictRequestException
* @throws HttpInternalServerErrorException
* @throws ContainerExceptionInterface
* @throws NotDatabasesException
* @throws NotFoundExceptionInterface
* @throws Exception
*/
#[DataProvider('invalidCreatDataProvider')]
public function testCreatInvalidData(string $date, string $time): void
{
$this->request = $this->makeEmpty(Request::class, [
@@ -334,10 +322,9 @@ class WorkingHoursControllerTest extends Unit
}
/**
* @throws HttpBadRequestException
* @throws ContainerExceptionInterface
* @throws NotDatabasesException
* @throws HttpInternalServerErrorException
* @throws HttpConflictRequestException
* @throws NotFoundExceptionInterface
* @throws Exception
*/
public function testCreatNewRecord(): void
@@ -350,14 +337,14 @@ class WorkingHoursControllerTest extends Unit
]);
$controller = new WorkingHoursController($this->container);
$response = $controller->creat($this->request, $this->response, []);
$this->assertInstanceOf(Response::class, $response);
$this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
$this->assertNotEmpty($response->getBody()->getContents());
}
/**
* @throws HttpBadRequestException
* @throws HttpConflictRequestException
* @throws HttpInternalServerErrorException
* @throws ContainerExceptionInterface
* @throws NotDatabasesException
* @throws NotFoundExceptionInterface
* @throws Exception
*/
public function testCreatExistRecord(): void
@@ -374,9 +361,10 @@ class WorkingHoursControllerTest extends Unit
}
/**
* @throws HttpInternalServerErrorException
* @throws HttpNotFoundException
* @throws ContainerExceptionInterface
* @throws NotDatabasesException
* @throws NotFoundExceptionInterface
* @throws Exception
*/
public function testReadExistRecord(): void
{
@@ -384,13 +372,15 @@ class WorkingHoursControllerTest extends Unit
$response = $controller->read($this->request, $this->response, [
'id' => self::EXISTING_DATE,
]);
$this->assertInstanceOf(Response::class, $response);
$this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
$this->assertNotEmpty($response->getBody()->getContents());
}
/**
* @throws HttpInternalServerErrorException
* @throws HttpNotFoundException
* @throws ContainerExceptionInterface
* @throws NotDatabasesException
* @throws NotFoundExceptionInterface
* @throws Exception
*/
public function testReadNotExistRecord(): void
{
api/tests/unit/Controller/WorkingHoursViewControllerTest.php
+22 -30
View File
@@ -2,50 +2,30 @@
namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Controller;
use Codeception\Test\Unit;
use Exception;
use PDO;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface;
use Psr\Http\Message\StreamInterface;
use Psr\Container\NotFoundExceptionInterface;
use Slim\Psr7\Request;
use Slim\Psr7\Response;
use TorstenHettstedt\TimekeepingApi\Controller\NotDatabasesException;
use TorstenHettstedt\TimekeepingApi\Controller\WorkingHoursViewController;
class WorkingHoursViewControllerTest extends Unit
class WorkingHoursViewControllerTest extends AbstractControllerTest
{
protected ContainerInterface $container;
protected Request $request;
protected Response $response;
/**
* @throws Exception
* @throws \PHPUnit\Framework\MockObject\Exception
*/
protected function _before(): void
{
parent::_before();
/** @noinspection SpellCheckingInspection */
$this->container = $this->makeEmpty(ContainerInterface::class, [
'has' => true,
'get' => new PDO('pgsql:host=psql.torsten-hettstedt.net;port=5432;dbname=testdb;user=bruce;password=mypass')
]);
$this->request = $this->makeEmpty(Request::class, []);
$this->response = $this->makeEmpty(Response::class, [
'getBody' => $this->makeEmpty(StreamInterface::class, [
'write' => function (mixed $data) {
$this->assertIsString($data);
$this->assertJson($data);
return strlen($data);
},
]),
'withHeader' => $this->makeEmpty(Response::class, [
'withStatus' => $this->makeEmpty(Response::class),
]),
]);
$this->request = $this->makeEmpty(Request::class);
}
/**
* @throws NotDatabasesException
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
* @throws Exception
*/
public function testConstructWithNonDatabase(): void
@@ -58,32 +38,44 @@ class WorkingHoursViewControllerTest extends Unit
}
/**
* @throws NotDatabasesException
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
* @throws Exception
*/
public function testBrowseMonthly(): void
{
$controller = new WorkingHoursViewController($this->container);
$response = $controller->browseMonthly($this->request, $this->response, []);
$this->assertInstanceOf(Response::class, $response);
$this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
$this->assertNotEmpty($response->getBody()->getContents());
}
/**
* @throws NotDatabasesException
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
* @throws Exception
*/
public function testBrowseYearly(): void
{
$controller = new WorkingHoursViewController($this->container);
$response = $controller->browseYearly($this->request, $this->response, []);
$this->assertInstanceOf(Response::class, $response);
$this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
$this->assertNotEmpty($response->getBody()->getContents());
}
/**
* @throws NotDatabasesException
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
* @throws Exception
*/
public function testBrowseWeekly(): void
{
$controller = new WorkingHoursViewController($this->container);
$response = $controller->browseWeekly($this->request, $this->response, []);
$this->assertInstanceOf(Response::class, $response);
$this->assertEquals(self::FICTIONAL_STATUS_CODE, $response->getStatusCode());
$this->assertNotEmpty($response->getBody()->getContents());
}
}
api/tests/unit/Middleware/ErrorHandlerTest.php
+4 -3
View File
@@ -5,6 +5,7 @@ namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Middleware;
use Codeception\Stub\Expected;
use Codeception\Test\Unit;
use Exception;
use Psr\Container\ContainerInterface;
use Psr\Http\Message\ResponseFactoryInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
@@ -20,6 +21,7 @@ use TorstenHettstedt\TimekeepingApi\Middleware\ErrorHandler;
class ErrorHandlerTest extends Unit
{
/** @var App<ContainerInterface> */
protected App $app;
protected ServerRequestInterface $request;
protected Exception $exception;
@@ -88,11 +90,10 @@ class ErrorHandlerTest extends Unit
'file' => '/path(to/file',
'getTitle' => Expected::once('The Title'),
]);
$this->logger = $this->makeEmpty(LoggerInterface::class, []);
$this->logger = $this->makeEmpty(LoggerInterface::class);
$middleWare = new ErrorHandler($this->app);
$middleWare($this->request, $this->exception, true, true, true, $this->logger);
}
/**
@@ -105,7 +106,7 @@ class ErrorHandlerTest extends Unit
'code' => 400,
'file' => '/path(to/file',
]);
$this->logger = $this->makeEmpty(LoggerInterface::class, []);
$this->logger = $this->makeEmpty(LoggerInterface::class);
$middleWare = new ErrorHandler($this->app);
$middleWare($this->request, $this->exception, true, true, true, $this->logger);
api/tests/unit/Models/WorkingHoursTest.php
+7 -11
View File
@@ -2,6 +2,7 @@
namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Models;
use Codeception\Attribute\DataProvider;
use Codeception\Test\Unit;
use DateInterval;
use DateTime;
@@ -22,7 +23,7 @@ class WorkingHoursTest extends Unit
}
/**
* @return array[]
* @return array<array<DateTime|DateInterval|array<string,string>>>
*/
public function workingHoursProvider(): array
{
@@ -49,17 +50,13 @@ class WorkingHoursTest extends Unit
/**
* @param DateTime $date
* @param DateInterval $interval
* @param array<string, string> $should_json
*
* @dataProvider workingHoursProvider
* @param array<string, string> $shouldJson
*/
public function testWorkingHoursWithContent(DateTime $date, DateInterval $interval, array $should_json): void
#[DataProvider('workingHoursProvider')]
public function testWorkingHoursWithContent(DateTime $date, DateInterval $interval, array $shouldJson): void
{
$obj = new WorkingHours();
$obj
->setWorkingDay($date)
->setWorkingTime($interval);
$obj->setWorkingDay($date)->setWorkingTime($interval);
$this->assertNotNull($obj->getWorkingDay());
$this->assertInstanceOf(DateTime::class, $obj->getWorkingDay());
@@ -70,7 +67,6 @@ class WorkingHoursTest extends Unit
$this->assertEquals($interval, $obj->getWorkingTime());
$json = $obj->jsonSerialize();
$this->assertIsArray($json);
$this->assertEquals($should_json, $json);
$this->assertEquals($shouldJson, $json);
}
}
api/tests/unit/Models/WorkingHoursViewTest.php
+39 -22
View File
@@ -2,6 +2,7 @@
namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Models;
use Codeception\Attribute\DataProvider;
use Codeception\Test\Unit;
use DateInterval;
use DateTime;
@@ -13,7 +14,7 @@ class WorkingHoursViewTest extends Unit
{
/**
* @return array[]
* @return array<array{DateTime,PeriodDesignationEnum,int,DateInterval,DateInterval,array<string,mixed>}>
*/
public function workingHoursProvider(): array
{
@@ -25,7 +26,11 @@ class WorkingHoursViewTest extends Unit
$absence_time->invert = 1;
return [
[
$date, PeriodDesignationEnum::WEEKLY(), $work_days, $total_hours, $overtime,
$date,
PeriodDesignationEnum::WEEKLY,
$work_days,
$total_hours,
$overtime,
[
'period' => '2020#49',
'periodDesignation' => 'weekly',
@@ -35,7 +40,11 @@ class WorkingHoursViewTest extends Unit
],
],
[
$date, PeriodDesignationEnum::WEEKLY(), $work_days, $total_hours, $absence_time,
$date,
PeriodDesignationEnum::WEEKLY,
$work_days,
$total_hours,
$absence_time,
[
'period' => '2020#49',
'periodDesignation' => 'weekly',
@@ -45,7 +54,11 @@ class WorkingHoursViewTest extends Unit
],
],
[
$date, PeriodDesignationEnum::MONTHLY(), $work_days, $total_hours, $overtime,
$date,
PeriodDesignationEnum::MONTHLY,
$work_days,
$total_hours,
$overtime,
[
'period' => '2020-11',
'periodDesignation' => 'monthly',
@@ -55,7 +68,11 @@ class WorkingHoursViewTest extends Unit
],
],
[
$date, PeriodDesignationEnum::MONTHLY(), $work_days, $total_hours, $absence_time,
$date,
PeriodDesignationEnum::MONTHLY,
$work_days,
$total_hours,
$absence_time,
[
'period' => '2020-11',
'periodDesignation' => 'monthly',
@@ -65,7 +82,12 @@ class WorkingHoursViewTest extends Unit
],
],
[
$date, PeriodDesignationEnum::YEARLY(), $work_days, $total_hours, $overtime, [
$date,
PeriodDesignationEnum::YEARLY,
$work_days,
$total_hours,
$overtime,
[
'period' => '2020',
'periodDesignation' => 'yearly',
'workingDays' => 15,
@@ -74,7 +96,12 @@ class WorkingHoursViewTest extends Unit
],
],
[
$date, PeriodDesignationEnum::YEARLY(), $work_days, $total_hours, $absence_time, [
$date,
PeriodDesignationEnum::YEARLY,
$work_days,
$total_hours,
$absence_time,
[
'period' => '2020',
'periodDesignation' => 'yearly',
'workingDays' => 15,
@@ -91,45 +118,35 @@ class WorkingHoursViewTest extends Unit
* @param int $workingDays
* @param DateInterval $totalHours
* @param DateInterval $overtime
* @param array<string, string> $should_json
*
* @dataProvider workingHoursProvider
* @param array<string, string> $shouldJson
*/
#[DataProvider('workingHoursProvider')]
public function testWorkingHoursViewWithContent(
DateTimeInterface $period,
PeriodDesignationEnum $periodDesignation,
int $workingDays,
DateInterval $totalHours,
DateInterval $overtime,
array $should_json
): void
{
array $shouldJson
): void {
$obj = new WorkingHoursView($period, $periodDesignation, $workingDays, $totalHours, $overtime);
$this->assertNotNull($obj->getPeriod());
$this->assertInstanceOf(DateTimeInterface::class, $obj->getPeriod());
$this->assertEquals($period, $obj->getPeriod());
$this->assertNotNull($obj->getPeriodDesignation());
$this->assertInstanceOf(PeriodDesignationEnum::class, $obj->getPeriodDesignation());
$this->assertEquals($periodDesignation, $obj->getPeriodDesignation());
$this->assertNotNull($obj->getWorkingDays());
$this->assertIsInt($obj->getWorkingDays());
$this->assertEquals($workingDays, $obj->getWorkingDays());
$this->assertNotNull($obj->getTotalHours());
$this->assertInstanceOf(DateInterval::class, $obj->getTotalHours());
$this->assertEquals($totalHours, $obj->getTotalHours());
$this->assertNotNull($obj->getOvertime());
$this->assertInstanceOf(DateInterval::class, $obj->getOvertime());
$this->assertEquals($overtime, $obj->getOvertime());
$json = $obj->jsonSerialize();
$this->assertIsArray($json);
$this->assertEquals($should_json, $json);
$this->assertEquals($shouldJson, $json);
}
}
api/tests/unit/Repositories/WorkingHoursRepositoryTest.php
+21 -23
View File
@@ -2,7 +2,7 @@
namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Repositories;
use Codeception\Example;
use Codeception\Attribute\DataProvider;
use Codeception\Test\Unit;
use DateInterval;
use DateTime;
@@ -18,18 +18,20 @@ use TorstenHettstedt\TimekeepingApi\Repositories\WorkingHoursRepository;
class WorkingHoursRepositoryTest extends Unit
{
const EXISTING_DATE = '2020-01-28';
const EXISTING_INTERVAL = 'PT7H20M';
const NEW_DATE = '2020-04-01';
const NEW_INTERVAL = 'PT7H59M';
const RECORDS_COUNT = 61;
public const EXISTING_DATE = '2020-01-28';
public const EXISTING_INTERVAL = 'PT7H20M';
public const NEW_DATE = '2020-04-01';
public const NEW_INTERVAL = 'PT7H59M';
public const RECORDS_COUNT = 61;
protected PDO $pdoObject;
protected function _before(): void
{
/** @noinspection SpellCheckingInspection */
$this->pdoObject = new PDO('pgsql:host=psql.torsten-hettstedt.net;port=5432;dbname=testdb;user=bruce;password=mypass');
$this->pdoObject = new PDO(
'pgsql:host=psql.torsten-hettstedt.net;port=5432;dbname=testdb;user=bruce;password=mypass'
);
parent::_before();
}
@@ -40,8 +42,8 @@ class WorkingHoursRepositoryTest extends Unit
{
$repository = new WorkingHoursRepository($this->pdoObject);
$models = $repository->findAll();
$this->assertIsArray($models);
$this->assertContainsOnly(WorkingHours::class, $models);
$this->assertContainsOnlyInstancesOf(WorkingHours::class, $models);
$this->assertCount(self::RECORDS_COUNT, $models);
}
@@ -66,16 +68,15 @@ class WorkingHoursRepositoryTest extends Unit
* @param string|null $ende
* @param int $count
*
* @dataProvider valideFilterParameter
*
* @throws Exception
*/
#[DataProvider('valideFilterParameter')]
public function testFindAllWithValideParameter(?string $start, ?string $ende, int $count): void
{
$repository = new WorkingHoursRepository($this->pdoObject);
$models = $repository->findFiltered($start, $ende);
$this->assertIsArray($models);
$this->assertContainsOnly(WorkingHours::class, $models);
$this->assertContainsOnlyInstancesOf(WorkingHours::class, $models);
$this->assertCount($count, $models);
}
@@ -85,22 +86,22 @@ class WorkingHoursRepositoryTest extends Unit
public function invalideFilterParameter(): array
{
return [
['2020-04-31',null],
['2020-04-31', null],
[null, '2020-04-31'],
['2020-04-00','2020-04-31'],
['2020-04-01','2020-04-31'],
['2020-04-00','2020-04-30'],
['2020-04-00', '2020-04-31'],
['2020-04-01', '2020-04-31'],
['2020-04-00', '2020-04-30'],
//
['2020-04', null],
[null, '2020-04'],
['2020-04', '2020-04'],
['2020-04-01','2020-04'],
['2020-04-01', '2020-04'],
['2020-04', '2020-04-30'],
//
['2020', null],
[null, '2020'],
['2020', '2020'],
['2020-04-01','2020'],
['2020-04-01', '2020'],
['2020', '2020-04-30'],
];
}
@@ -109,10 +110,9 @@ class WorkingHoursRepositoryTest extends Unit
* @param string|null $start
* @param string|null $ende
*
* @dataProvider invalideFilterParameter
*
* @throws Exception
*/
#[DataProvider('invalideFilterParameter')]
public function testFindAllWithInvalideParameter(?string $start, ?string $ende): void
{
$repository = new WorkingHoursRepository($this->pdoObject);
@@ -127,7 +127,6 @@ class WorkingHoursRepositoryTest extends Unit
{
$repository = new WorkingHoursRepository($this->pdoObject);
$model = $repository->findByKey(self::EXISTING_DATE);
$this->assertInstanceOf(WorkingHours::class, $model);
$this->assertEquals(new DateTime(self::EXISTING_DATE), $model->getWorkingDay());
$this->assertEquals(new DateInterval(self::EXISTING_INTERVAL), $model->getWorkingTime());
}
@@ -163,7 +162,6 @@ class WorkingHoursRepositoryTest extends Unit
]);
$repository->insert($model);
$model = $repository->findByKey(self::NEW_DATE);
$this->assertInstanceOf(WorkingHours::class, $model);
$this->assertEquals(new DateTime(self::NEW_DATE), $model->getWorkingDay());
$this->assertEquals(new DateInterval(self::NEW_INTERVAL), $model->getWorkingTime());
$this->assertCount(self::RECORDS_COUNT + 1, $repository->findAll());
api/tests/unit/Repositories/WorkingHoursViewRepositoryTest.php
+16 -35
View File
@@ -2,12 +2,12 @@
namespace TorstenHettstedt\TimekeepingApi\Tests\Unit\Repositories;
use Codeception\Attribute\DataProvider;
use Codeception\Test\Unit;
use DateTime;
use DateTimeZone;
use Exception;
use PDO;
use TorstenHettstedt\TimekeepingApi\Models\WorkingHoursView;
use PDO;use TorstenHettstedt\TimekeepingApi\Models\WorkingHoursView;
use TorstenHettstedt\TimekeepingApi\Repositories\RepositoryRecordNotFoundException;
use TorstenHettstedt\TimekeepingApi\Repositories\WorkingHoursWeeklyViewRepository;
use TorstenHettstedt\TimekeepingApi\Repositories\WorkingHoursMonthlyViewRepository;
@@ -25,7 +25,7 @@ class WorkingHoursViewRepositoryTest extends Unit
}
/**
* @return array[]
* @return array<array{string, int}>
*/
public function listObjectProvider(): array
{
@@ -37,7 +37,7 @@ class WorkingHoursViewRepositoryTest extends Unit
}
/**
* @return array[]
* @return array<array{string, string, int, DateTime}>
* @throws Exception
*/
public function existingObjectProvider(): array
@@ -50,7 +50,7 @@ class WorkingHoursViewRepositoryTest extends Unit
}
/**
* @return array[]
* @return array<array{string, string}>
*/
public function notExistingObjectProvider(): array
{
@@ -61,49 +61,30 @@ class WorkingHoursViewRepositoryTest extends Unit
];
}
/**
* @param string $period_class
* @param int $count_records
*
* @dataProvider listObjectProvider
*/
public function testFindAll(string $period_class, int $count_records): void
#[DataProvider(('listObjectProvider'))]
public function testFindAll(string $periodClass, int $countRecords): void
{
$repository = new $period_class($this->pdoObject);
$repository = new $periodClass($this->pdoObject);
$models = $repository->findAll();
$this->assertIsArray($models);
$this->assertContainsOnly(WorkingHoursView::class, $models);
$this->assertCount($count_records, $models);
$this->assertContainsOnlyInstancesOf(WorkingHoursView::class, $models);
$this->assertCount($countRecords, $models);
}
/**
*
* @dataProvider existingObjectProvider
*
* @param string $period_class
* @param string $search
* @param int $workingDays
* @param DateTime $period
*/
public function testExistingFindByKey(string $period_class, string $search, int $workingDays, DateTime $period): void
#[DataProvider(('existingObjectProvider'))]
public function testExistingFindByKey(string $periodClass, string $search, int $workingDays, DateTime $period): void
{
$repository = new $period_class($this->pdoObject);
$repository = new $periodClass($this->pdoObject);
$model = $repository->findByKey($search);
$this->assertInstanceOf(WorkingHoursView::class, $model);
$this->assertEquals($workingDays, $model->getWorkingDays());
$this->assertEquals($period->format('Ymd'), $model->getPeriod()->format('Ymd'));
}
/**
* @param string $period_class
* @param string $search
*
* @dataProvider notExistingObjectProvider
*
*/
public function testNotExistingFindByKey(string $period_class, string $search): void
#[DataProvider(('notExistingObjectProvider'))]
public function testNotExistingFindByKey(string $periodClass, string $search): void
{
$repository = new $period_class($this->pdoObject);
$repository = new $periodClass($this->pdoObject);
$this->expectException(RepositoryRecordNotFoundException::class);
$repository->findByKey($search);
}