jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Upgrade tests to PhpUnit 10 (#5252)

Browse Source
This commit is contained in:
Kevin Papst
2024-12-22 01:25:30 +01:00
committed by GitHub
parent 9bd37fb695
commit c7f0508707
377 changed files with 3308 additions and 3409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Repository/AbstractRepositoryTest.php → tests/Repository/AbstractRepositoryTestCase.php
View File

@@ -18,7 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
/**
* A base test class for AbstractRepository implementations.
*/
abstract class AbstractRepositoryTest extends KernelTestCase
abstract class AbstractRepositoryTestCase extends KernelTestCase
{
use KernelTestTrait;

8
tests/Repository/InvoiceDocumentRepositoryTest.php
View File

@@ -55,7 +55,7 @@ class InvoiceDocumentRepositoryTest extends TestCase
$sut->getUploadDirectory();
$this->fail('Expected exception was not raised');
} catch (\Exception $ex) {
$this->assertEquals('Unknown upload directory', $ex->getMessage());
self::assertEquals('Unknown upload directory', $ex->getMessage());
}
$path = realpath(__DIR__ . '/../Invoice/templates/');
@@ -87,16 +87,16 @@ class InvoiceDocumentRepositoryTest extends TestCase
{
$sut = new InvoiceDocumentRepository(self::$defaultDirectories);
$all = $sut->findAll();
$this->assertCount(\count(self::$defaultDocuments), $all);
self::assertCount(\count(self::$defaultDocuments), $all);
foreach ($all as $document) {
$this->assertTrue(\in_array($document->getName(), self::$defaultDocuments), 'Missing template: ' . $document->getName());
self::assertTrue(\in_array($document->getName(), self::$defaultDocuments), 'Missing template: ' . $document->getName());
}
foreach (self::$defaultDocuments as $filename) {
$filename = substr($filename, 0, strpos($filename, '.'));
$actual = $sut->findByName($filename);
$this->assertNotNull($actual);
self::assertNotNull($actual);
}
}
}

4
tests/Repository/Loader/AbstractLoaderTest.php → tests/Repository/Loader/AbstractLoaderTestCase.php
View File

@@ -15,9 +15,9 @@ use Doctrine\ORM\Query\Expr;
use Doctrine\ORM\QueryBuilder;
use PHPUnit\Framework\TestCase;
abstract class AbstractLoaderTest extends TestCase
abstract class AbstractLoaderTestCase extends TestCase
{
protected function getEntityManagerMock(int $createQueryBuilderCount, $resultMock = null)
protected function getEntityManagerMock(int $createQueryBuilderCount, mixed $resultMock = null): EntityManager
{
$em = $this->createMock(EntityManager::class);
$qb = $this->createMock(QueryBuilder::class);

2
tests/Repository/Loader/ActivityLoaderTest.php
View File

@@ -16,7 +16,7 @@ use App\Repository\Loader\ActivityLoader;
/**
* @covers \App\Repository\Loader\ActivityLoader
*/
class ActivityLoaderTest extends AbstractLoaderTest
class ActivityLoaderTest extends AbstractLoaderTestCase
{
public function testLoadResults(): void
{

2
tests/Repository/Loader/CustomerLoaderTest.php
View File

@@ -16,7 +16,7 @@ use App\Repository\Query\CustomerQuery;
/**
* @covers \App\Repository\Loader\CustomerLoader
*/
class CustomerLoaderTest extends AbstractLoaderTest
class CustomerLoaderTest extends AbstractLoaderTestCase
{
public function testLoadResults(): void
{

2
tests/Repository/Loader/ProjectLoaderTest.php
View File

@@ -16,7 +16,7 @@ use App\Repository\Loader\ProjectLoader;
/**
* @covers \App\Repository\Loader\ProjectLoader
*/
class ProjectLoaderTest extends AbstractLoaderTest
class ProjectLoaderTest extends AbstractLoaderTestCase
{
public function testLoadResults(): void
{

2
tests/Repository/Loader/TeamLoaderTest.php
View File

@@ -15,7 +15,7 @@ use App\Repository\Loader\TeamLoader;
/**
* @covers \App\Repository\Loader\TeamLoader
*/
class TeamLoaderTest extends AbstractLoaderTest
class TeamLoaderTest extends AbstractLoaderTestCase
{
public function testLoadResults(): void
{

46
tests/Repository/Query/BaseFormTypeQueryTest.php → tests/Repository/Query/AbstractBaseFormTypeQueryTestCase.php
View File

@@ -20,7 +20,7 @@ use PHPUnit\Framework\TestCase;
/**
* @covers \App\Repository\Query\BaseQuery
*/
abstract class BaseFormTypeQueryTest extends TestCase
abstract class AbstractBaseFormTypeQueryTestCase extends TestCase
{
public function assertBaseQuery(BaseFormTypeQuery $sut): void
{
@@ -63,20 +63,20 @@ abstract class BaseFormTypeQueryTest extends TestCase
$expected->setName('foo-bar');
$sut->addActivity($expected);
$this->assertEquals([$expected], $sut->getActivities());
$this->assertTrue($sut->hasActivities());
self::assertEquals([$expected], $sut->getActivities());
self::assertTrue($sut->hasActivities());
$expected2 = new Activity();
$expected2->setName('foo-bar2');
$sut->addActivity($expected2);
$this->assertEquals([$expected, $expected2], $sut->getActivities());
self::assertEquals([$expected, $expected2], $sut->getActivities());
$sut->setActivities([]);
$this->assertEquals([], $sut->getActivities());
$this->assertEquals([], $sut->getActivities());
$this->assertFalse($sut->hasActivities());
$this->assertFalse($sut->hasActivities());
self::assertEquals([], $sut->getActivities());
self::assertEquals([], $sut->getActivities());
self::assertFalse($sut->hasActivities());
self::assertFalse($sut->hasActivities());
}
public function assertCustomer(BaseFormTypeQuery $sut): void
@@ -84,19 +84,19 @@ abstract class BaseFormTypeQueryTest extends TestCase
$expected = new Customer('foo-bar');
$sut->addCustomer($expected);
$this->assertEquals([$expected], $sut->getCustomers());
$this->assertTrue($sut->hasCustomers());
self::assertEquals([$expected], $sut->getCustomers());
self::assertTrue($sut->hasCustomers());
$expected2 = new Customer('foo-bar2');
$sut->addCustomer($expected2);
$this->assertEquals([$expected, $expected2], $sut->getCustomers());
self::assertEquals([$expected, $expected2], $sut->getCustomers());
$sut->setCustomers([]);
$this->assertEquals([], $sut->getCustomers());
$this->assertEquals([], $sut->getCustomers());
$this->assertFalse($sut->hasCustomers());
$this->assertFalse($sut->hasCustomers());
self::assertEquals([], $sut->getCustomers());
self::assertEquals([], $sut->getCustomers());
self::assertFalse($sut->hasCustomers());
self::assertFalse($sut->hasCustomers());
}
public function assertProject(BaseFormTypeQuery $sut): void
@@ -105,23 +105,23 @@ abstract class BaseFormTypeQueryTest extends TestCase
$expected->setName('foo-bar');
$sut->addProject($expected);
$this->assertEquals([$expected], $sut->getProjects());
$this->assertTrue($sut->hasProjects());
self::assertEquals([$expected], $sut->getProjects());
self::assertTrue($sut->hasProjects());
$expected2 = new Project();
$expected2->setName('foo-bar2');
$sut->addProject($expected2);
$this->assertEquals([$expected, $expected2], $sut->getProjects());
self::assertEquals([$expected, $expected2], $sut->getProjects());
$sut->setProjects([]);
$this->assertEquals([], $sut->getProjects());
$this->assertEquals([], $sut->getProjects());
$this->assertFalse($sut->hasProjects());
$this->assertFalse($sut->hasProjects());
self::assertEquals([], $sut->getProjects());
self::assertEquals([], $sut->getProjects());
self::assertFalse($sut->hasProjects());
self::assertFalse($sut->hasProjects());
// make sure int is allowed as well
$sut->setProjects([99]);
$this->assertEquals([99], $sut->getProjects());
self::assertEquals([99], $sut->getProjects());
}
}

2
tests/Repository/Query/ActivityFormTypeQueryTest.php
View File

@@ -16,7 +16,7 @@ use App\Repository\Query\ActivityFormTypeQuery;
* @covers \App\Repository\Query\ActivityFormTypeQuery
* @covers \App\Repository\Query\BaseFormTypeQuery
*/
class ActivityFormTypeQueryTest extends BaseFormTypeQueryTest
class ActivityFormTypeQueryTest extends AbstractBaseFormTypeQueryTestCase
{
public function testQuery(): void
{

62
tests/Repository/Query/BaseQueryTest.php
View File

@@ -210,25 +210,25 @@ class BaseQueryTest extends TestCase
protected function assertActivity(TimesheetQuery $sut): void
{
$this->assertEquals([], $sut->getActivities());
$this->assertFalse($sut->hasActivities());
self::assertEquals([], $sut->getActivities());
self::assertFalse($sut->hasActivities());
$expected = new Activity();
$expected->setName('foo-bar');
$sut->addActivity($expected);
$this->assertEquals([$expected], $sut->getActivities());
$this->assertTrue($sut->hasActivities());
self::assertEquals([$expected], $sut->getActivities());
self::assertTrue($sut->hasActivities());
$expected2 = new Activity();
$expected2->setName('foo-bar2');
$sut->addActivity($expected2);
$this->assertEquals([$expected, $expected2], $sut->getActivities());
self::assertEquals([$expected, $expected2], $sut->getActivities());
$sut->setActivities([]);
$this->assertEquals([], $sut->getActivities());
$this->assertFalse($sut->hasActivities());
self::assertEquals([], $sut->getActivities());
self::assertFalse($sut->hasActivities());
$activity = $this->createMock(Activity::class);
$activity->method('getId')->willReturn(13);
@@ -250,35 +250,35 @@ class BaseQueryTest extends TestCase
foreach ($sut->getActivities() as $activity) {
$ids[] = $activity->getId();
}
$this->assertEquals([13, 27, null, 27], $ids);
self::assertEquals([13, 27, null, 27], $ids);
}
protected function assertCustomer(BaseQuery $sut): void
{
$this->assertTrue(method_exists($sut, 'getCustomers'));
$this->assertTrue(method_exists($sut, 'setCustomers'));
$this->assertTrue(method_exists($sut, 'hasCustomers'));
$this->assertTrue(method_exists($sut, 'addCustomer'));
$this->assertTrue(method_exists($sut, 'getCustomerIds'));
self::assertTrue(method_exists($sut, 'getCustomers'));
self::assertTrue(method_exists($sut, 'setCustomers'));
self::assertTrue(method_exists($sut, 'hasCustomers'));
self::assertTrue(method_exists($sut, 'addCustomer'));
self::assertTrue(method_exists($sut, 'getCustomerIds'));
$this->assertEquals([], $sut->getCustomers());
$this->assertFalse($sut->hasCustomers());
self::assertEquals([], $sut->getCustomers());
self::assertFalse($sut->hasCustomers());
$expected = new Customer('foo-bar');
$sut->addCustomer($expected);
$this->assertEquals([$expected], $sut->getCustomers());
$this->assertTrue($sut->hasCustomers());
self::assertEquals([$expected], $sut->getCustomers());
self::assertTrue($sut->hasCustomers());
$expected2 = new Customer('foo-bar2');
$sut->addCustomer($expected2);
$this->assertEquals([$expected, $expected2], $sut->getCustomers());
$this->assertEquals([], $sut->getCustomerIds());
self::assertEquals([$expected, $expected2], $sut->getCustomers());
self::assertEquals([], $sut->getCustomerIds());
$sut->setCustomers([]);
$this->assertEquals([], $sut->getCustomers());
$this->assertFalse($sut->hasCustomers());
self::assertEquals([], $sut->getCustomers());
self::assertFalse($sut->hasCustomers());
$customer = $this->createMock(Customer::class);
$customer->method('getId')->willReturn(13);
@@ -296,33 +296,33 @@ class BaseQueryTest extends TestCase
$customer->method('getId')->willReturn(27);
$sut->addCustomer($customer);
$this->assertEquals([13, 27], $sut->getCustomerIds());
self::assertEquals([13, 27], $sut->getCustomerIds());
}
protected function assertProject(ActivityQuery $sut): void
{
$this->assertEquals([], $sut->getProjects());
$this->assertFalse($sut->hasProjects());
self::assertEquals([], $sut->getProjects());
self::assertFalse($sut->hasProjects());
$expected = new Project();
$expected->setName('foo-bar');
$sut->setProjects([]);
$this->assertEquals([], $sut->getProjects());
self::assertEquals([], $sut->getProjects());
$sut->addProject($expected);
$this->assertEquals([$expected], $sut->getProjects());
$this->assertTrue($sut->hasProjects());
self::assertEquals([$expected], $sut->getProjects());
self::assertTrue($sut->hasProjects());
$expected2 = new Project();
$expected2->setName('foo-bar2');
$sut->addProject($expected2);
$this->assertEquals([$expected, $expected2], $sut->getProjects());
$this->assertEquals([], $sut->getProjectIds());
self::assertEquals([$expected, $expected2], $sut->getProjects());
self::assertEquals([], $sut->getProjectIds());
$sut->setProjects([]);
$this->assertFalse($sut->hasProjects());
self::assertFalse($sut->hasProjects());
$project = $this->createMock(Project::class);
$project->method('getId')->willReturn(13);
@@ -340,7 +340,7 @@ class BaseQueryTest extends TestCase
$project->method('getId')->willReturn(27);
$sut->addProject($project);
$this->assertEquals([13, 27], $sut->getProjectIds());
self::assertEquals([13, 27], $sut->getProjectIds());
}
protected function assertDateRangeTrait(DateRangeInterface $sut): void

2
tests/Repository/Query/CustomerFormTypeQueryTest.php
View File

@@ -16,7 +16,7 @@ use App\Repository\Query\CustomerFormTypeQuery;
* @covers \App\Repository\Query\CustomerFormTypeQuery
* @covers \App\Repository\Query\BaseFormTypeQuery
*/
class CustomerFormTypeQueryTest extends BaseFormTypeQueryTest
class CustomerFormTypeQueryTest extends AbstractBaseFormTypeQueryTestCase
{
public function testQuery(): void
{

8
tests/Repository/Query/ExportQueryTest.php
View File

@@ -38,21 +38,21 @@ class ExportQueryTest extends TimesheetQueryTest
public function assertMarkAsExported(ExportQuery $sut): void
{
$this->assertFalse($sut->isMarkAsExported());
self::assertFalse($sut->isMarkAsExported());
$sut->setMarkAsExported(true);
$this->assertTrue($sut->isMarkAsExported());
self::assertTrue($sut->isMarkAsExported());
}
public function assertRenderer(ExportQuery $sut): void
{
$this->assertNull($sut->getRenderer());
self::assertNull($sut->getRenderer());
$exportTypes = ['html', 'csv', 'pdf', 'xlsx', 'ods'];
foreach ($exportTypes as $type) {
$sut->setRenderer($type);
$this->assertEquals($type, $sut->getRenderer());
self::assertEquals($type, $sut->getRenderer());
}
}
}

4
tests/Repository/Query/InvoiceArchiveQueryTest.php
View File

@@ -26,8 +26,8 @@ class InvoiceArchiveQueryTest extends BaseQueryTest
$this->assertBaseQuery($sut, 'date', BaseQuery::ORDER_DESC);
$this->assertDateRangeTrait($sut);
$this->assertIsArray($sut->getCustomers());
$this->assertEmpty($sut->getCustomers());
self::assertIsArray($sut->getCustomers());
self::assertEmpty($sut->getCustomers());
self::assertFalse($sut->hasCustomers());
$sut->addCustomer(new Customer('foo'));

2
tests/Repository/Query/ProjectFormTypeQueryTest.php
View File

@@ -16,7 +16,7 @@ use App\Repository\Query\ProjectFormTypeQuery;
* @covers \App\Repository\Query\ProjectFormTypeQuery
* @covers \App\Repository\Query\BaseFormTypeQuery
*/
class ProjectFormTypeQueryTest extends BaseFormTypeQueryTest
class ProjectFormTypeQueryTest extends AbstractBaseFormTypeQueryTestCase
{
public function testQuery(): void
{

2
tests/Repository/Query/TagFormTypeQueryTest.php
View File

@@ -15,7 +15,7 @@ use App\Repository\Query\TagFormTypeQuery;
* @covers \App\Repository\Query\TagFormTypeQuery
* @covers \App\Repository\Query\BaseFormTypeQuery
*/
class TagFormTypeQueryTest extends BaseFormTypeQueryTest
class TagFormTypeQueryTest extends AbstractBaseFormTypeQueryTestCase
{
public function testQuery(): void
{

4
tests/Repository/Query/TeamQueryTest.php
View File

@@ -28,7 +28,7 @@ class TeamQueryTest extends BaseQueryTest
public function assertUsers(TeamQuery $sut): void
{
$this->assertEmpty($sut->getUsers());
self::assertEmpty($sut->getUsers());
$user = $this->createMock(User::class);
$user->method('getId')->willReturn(1);
@@ -47,6 +47,6 @@ class TeamQueryTest extends BaseQueryTest
$sut->addUser($user);
$sut->removeUser($user);
$this->assertCount(2, $sut->getUsers());
self::assertCount(2, $sut->getUsers());
}
}

2
tests/Repository/Query/TimesheetQueryTest.php
View File

@@ -158,7 +158,7 @@ class TimesheetQueryTest extends BaseQueryTest
$sut->setExported(2);
} catch (\InvalidArgumentException $exception) {
$catched = true;
$this->assertEquals('Unknown export state given', $exception->getMessage());
self::assertEquals('Unknown export state given', $exception->getMessage());
}
self::assertTrue($catched);

2
tests/Repository/Query/UserFormTypeQueryTest.php
View File

@@ -15,7 +15,7 @@ use App\Repository\Query\UserFormTypeQuery;
* @covers \App\Repository\Query\UserFormTypeQuery
* @covers \App\Repository\Query\BaseFormTypeQuery
*/
class UserFormTypeQueryTest extends BaseFormTypeQueryTest
class UserFormTypeQueryTest extends AbstractBaseFormTypeQueryTestCase
{
public function testQuery(): void
{

12
tests/Repository/Query/UserQueryTest.php
View File

@@ -28,19 +28,19 @@ class UserQueryTest extends BaseQueryTest
protected function assertRole(UserQuery $sut): void
{
$this->assertNull($sut->getRole());
self::assertNull($sut->getRole());
$sut->setRole('ROLE_USER');
$this->assertEquals('ROLE_USER', $sut->getRole());
self::assertEquals('ROLE_USER', $sut->getRole());
}
protected function assertSearchTeam(UserQuery $sut): void
{
$team = new Team('foo');
$this->assertIsArray($sut->getSearchTeams());
$this->assertEmpty($sut->getSearchTeams());
self::assertIsArray($sut->getSearchTeams());
self::assertEmpty($sut->getSearchTeams());
$sut->setSearchTeams([$team, new Team('foo')]);
$this->assertCount(2, $sut->getSearchTeams());
$this->assertSame($team, $sut->getSearchTeams()[0]);
self::assertCount(2, $sut->getSearchTeams());
self::assertSame($team, $sut->getSearchTeams()[0]);
}
public function testSystemAccount(): void

26
tests/Repository/TagRepositoryTest.php
View File

@@ -17,7 +17,7 @@ use App\Tests\DataFixtures\TagFixtures;
* @covers \App\Repository\TagRepository
* @group integration
*/
class TagRepositoryTest extends AbstractRepositoryTest
class TagRepositoryTest extends AbstractRepositoryTestCase
{
protected function setUp(): void
{
@@ -35,15 +35,15 @@ class TagRepositoryTest extends AbstractRepositoryTest
$repository = $em->getRepository(Tag::class);
$result = $repository->findAllTagNames('2018');
$this->assertIsArray($result);
$this->assertNotEmpty($result);
$this->assertEquals(6, \count($result));
$this->assertEquals('#2018-001', $result[0]);
$this->assertEquals('#2018-002', $result[1]);
$this->assertEquals('#2018-003', $result[2]);
$this->assertEquals('#2018-004', $result[3]);
$this->assertEquals('#2018-005', $result[4]);
$this->assertEquals('#2018-012', $result[5]);
self::assertIsArray($result);
self::assertNotEmpty($result);
self::assertEquals(6, \count($result));
self::assertEquals('#2018-001', $result[0]);
self::assertEquals('#2018-002', $result[1]);
self::assertEquals('#2018-003', $result[2]);
self::assertEquals('#2018-004', $result[3]);
self::assertEquals('#2018-005', $result[4]);
self::assertEquals('#2018-012', $result[5]);
}
public function testFindNoTagNames(): void
@@ -53,8 +53,8 @@ class TagRepositoryTest extends AbstractRepositoryTest
$repository = $em->getRepository(Tag::class);
$result = $repository->findAllTagNames('Nothing');
$this->assertIsArray($result);
$this->assertEmpty($result);
$this->assertEquals(0, \count($result));
self::assertIsArray($result);
self::assertEmpty($result);
self::assertEquals(0, \count($result));
}
}

24
tests/Repository/TimesheetRepositoryTest.php
View File

@@ -25,7 +25,7 @@ use App\Utils\Pagination;
* @covers \App\Repository\TimesheetRepository
* @group integration
*/
class TimesheetRepositoryTest extends AbstractRepositoryTest
class TimesheetRepositoryTest extends AbstractRepositoryTestCase
{
public function testResultTypeForQueryState(): void
{
@@ -36,7 +36,7 @@ class TimesheetRepositoryTest extends AbstractRepositoryTest
$query = new TimesheetQuery();
$result = $repository->getPagerfantaForQuery($query);
$this->assertInstanceOf(Pagination::class, $result);
self::assertInstanceOf(Pagination::class, $result);
self::assertFalse($query->hasQueryHint(TimesheetQueryHint::CUSTOMER_META_FIELDS));
self::assertFalse($query->hasQueryHint(TimesheetQueryHint::PROJECT_META_FIELDS));
self::assertFalse($query->hasQueryHint(TimesheetQueryHint::ACTIVITY_META_FIELDS));
@@ -46,7 +46,7 @@ class TimesheetRepositoryTest extends AbstractRepositoryTest
self::assertTrue($query->hasQueryHint(TimesheetQueryHint::CUSTOMER_META_FIELDS));
self::assertTrue($query->hasQueryHint(TimesheetQueryHint::PROJECT_META_FIELDS));
self::assertTrue($query->hasQueryHint(TimesheetQueryHint::ACTIVITY_META_FIELDS));
$this->assertIsArray($result);
self::assertIsArray($result);
}
public function testSave(): void
@@ -71,9 +71,9 @@ class TimesheetRepositoryTest extends AbstractRepositoryTest
->setActivity($activity)
->setProject($project);
$this->assertNull($timesheet->getId());
self::assertNull($timesheet->getId());
$repository->save($timesheet);
$this->assertNotNull($timesheet->getId());
self::assertNotNull($timesheet->getId());
}
public function testSaveWithTags(): void
@@ -104,13 +104,13 @@ class TimesheetRepositoryTest extends AbstractRepositoryTest
->addTag($tagOne)
->addTag($tagTwo);
$this->assertNull($timesheet->getId());
self::assertNull($timesheet->getId());
$repository->save($timesheet);
$this->assertNotNull($timesheet->getId());
$this->assertEquals(2, $timesheet->getTags()->count());
$this->assertEquals('Travel', $timesheet->getTags()->get(0)->getName());
$this->assertNotNull($timesheet->getTags()->get(0)->getId());
$this->assertEquals('Picture', $timesheet->getTags()->get(1)->getName());
$this->assertNotNull($timesheet->getTags()->get(1)->getId());
self::assertNotNull($timesheet->getId());
self::assertEquals(2, $timesheet->getTags()->count());
self::assertEquals('Travel', $timesheet->getTags()->get(0)->getName());
self::assertNotNull($timesheet->getTags()->get(0)->getId());
self::assertEquals('Picture', $timesheet->getTags()->get(1)->getName());
self::assertNotNull($timesheet->getTags()->get(1)->getId());
}
}