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

added hourly and money budgets to activity, project and customer (#843)

Browse Source
This commit is contained in:
Kevin Papst
2019-06-11 13:18:57 +02:00
committed by GitHub
parent 833968a87d
commit 5702d7afa8
118 changed files with 1743 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/Entity/ActivityTest.php
View File

@@ -10,11 +10,12 @@
namespace App\Tests\Entity;
use App\Entity\Activity;
use PHPUnit\Framework\TestCase;
/**
* @covers \App\Entity\Activity
*/
class ActivityTest extends AbstractEntityTest
class ActivityTest extends TestCase
{
public function testDefaultValues()
{
@@ -28,6 +29,8 @@ class ActivityTest extends AbstractEntityTest
$this->assertNull($sut->getFixedRate());
$this->assertNull($sut->getHourlyRate());
$this->assertNull($sut->getColor());
$this->assertEquals(0.0, $sut->getBudget());
$this->assertEquals(0, $sut->getTimeBudget());
}
public function testSetterAndGetter()
@@ -48,7 +51,14 @@ class ActivityTest extends AbstractEntityTest
$this->assertInstanceOf(Activity::class, $sut->setFixedRate(13.47));
$this->assertEquals(13.47, $sut->getFixedRate());
$this->assertInstanceOf(Activity::class, $sut->setHourlyRate(99));
$this->assertEquals(99, $sut->getHourlyRate());
$this->assertInstanceOf(Activity::class, $sut->setBudget(12345.67));
$this->assertEquals(12345.67, $sut->getBudget());
$this->assertInstanceOf(Activity::class, $sut->setTimeBudget(937321));
$this->assertEquals(937321, $sut->getTimeBudget());
}
}

3
tests/Entity/ConfigurationTest.php
View File

@@ -10,11 +10,12 @@
namespace App\Tests\Entity;
use App\Entity\Configuration;
use PHPUnit\Framework\TestCase;
/**
* @covers \App\Entity\Configuration
*/
class ConfigurationTest extends AbstractEntityTest
class ConfigurationTest extends TestCase
{
public function testDefaultValues()
{

12
tests/Entity/CustomerTest.php
View File

@@ -10,11 +10,12 @@
namespace App\Tests\Entity;
use App\Entity\Customer;
use PHPUnit\Framework\TestCase;
/**
* @covers \App\Entity\Customer
*/
class CustomerTest extends AbstractEntityTest
class CustomerTest extends TestCase
{
public function testDefaultValues()
{
@@ -43,6 +44,8 @@ class CustomerTest extends AbstractEntityTest
$this->assertNull($sut->getFixedRate());
$this->assertNull($sut->getHourlyRate());
$this->assertNull($sut->getColor());
$this->assertEquals(0.0, $sut->getBudget());
$this->assertEquals(0, $sut->getTimeBudget());
}
public function testSetterAndGetter()
@@ -84,7 +87,14 @@ class CustomerTest extends AbstractEntityTest
$this->assertInstanceOf(Customer::class, $sut->setFixedRate(13.47));
$this->assertEquals(13.47, $sut->getFixedRate());
$this->assertInstanceOf(Customer::class, $sut->setHourlyRate(99));
$this->assertEquals(99, $sut->getHourlyRate());
$this->assertInstanceOf(Customer::class, $sut->setBudget(12345.67));
$this->assertEquals(12345.67, $sut->getBudget());
$this->assertInstanceOf(Customer::class, $sut->setTimeBudget(937321));
$this->assertEquals(937321, $sut->getTimeBudget());
}
}

5
tests/Entity/AbstractEntityTest.php → tests/Entity/EntityValidationTestTrait.php
View File

@@ -9,13 +9,12 @@
namespace App\Tests\Entity;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
use Symfony\Component\Validator\ConstraintViolationInterface;
/**
* @covers \App\Entity\Timesheet
* Classes using this MUST extend \Symfony\Bundle\FrameworkBundle\Test\KernelTestCase
*/
abstract class AbstractEntityTest extends KernelTestCase
trait EntityValidationTestTrait
{
/**
* @param object $entity

3
tests/Entity/InvoiceTemplateTest.php
View File

@@ -10,11 +10,12 @@
namespace App\Tests\Entity;
use App\Entity\InvoiceTemplate;
use PHPUnit\Framework\TestCase;
/**
* @covers \App\Entity\InvoiceTemplate
*/
class InvoiceTemplateTest extends AbstractEntityTest
class InvoiceTemplateTest extends TestCase
{
protected function assertIsFluent($actual)
{

18
tests/Entity/ProjectTest.php
View File

@@ -11,11 +11,12 @@ namespace App\Tests\Entity;
use App\Entity\Customer;
use App\Entity\Project;
use PHPUnit\Framework\TestCase;
/**
* @covers \App\Entity\Project
*/
class ProjectTest extends AbstractEntityTest
class ProjectTest extends TestCase
{
public function testDefaultValues()
{
@@ -26,7 +27,6 @@ class ProjectTest extends AbstractEntityTest
$this->assertNull($sut->getOrderNumber());
$this->assertNull($sut->getComment());
$this->assertTrue($sut->getVisible());
$this->assertEquals(0.0, $sut->getBudget());
$this->assertNull($sut->getFixedRate());
$this->assertNull($sut->getHourlyRate());
self::assertIsIterable($sut->getTimesheets());
@@ -34,6 +34,8 @@ class ProjectTest extends AbstractEntityTest
self::assertIsIterable($sut->getActivities());
self::assertEmpty($sut->getActivities());
$this->assertNull($sut->getColor());
$this->assertEquals(0.0, $sut->getBudget());
$this->assertEquals(0, $sut->getTimeBudget());
}
public function testSetterAndGetter()
@@ -59,12 +61,16 @@ class ProjectTest extends AbstractEntityTest
$this->assertInstanceOf(Project::class, $sut->setVisible(false));
$this->assertFalse($sut->getVisible());
$this->assertInstanceOf(Project::class, $sut->setFixedRate(13.47));
$this->assertEquals(13.47, $sut->getFixedRate());
$this->assertInstanceOf(Project::class, $sut->setHourlyRate(99));
$this->assertEquals(99, $sut->getHourlyRate());
$this->assertInstanceOf(Project::class, $sut->setBudget(12345.67));
$this->assertEquals(12345.67, $sut->getBudget());
$this->assertInstanceOf(Project::class, $sut->setFixedRate(13.47));
$this->assertEquals(13.47, $sut->getFixedRate());
$this->assertInstanceOf(Project::class, $sut->setHourlyRate(99));
$this->assertEquals(99, $sut->getHourlyRate());
$this->assertInstanceOf(Project::class, $sut->setTimeBudget(937321));
$this->assertEquals(937321, $sut->getTimeBudget());
}
}

3
tests/Entity/TagTest.php
View File

@@ -11,11 +11,12 @@ namespace App\Tests\Entity;
use App\Entity\Tag;
use App\Entity\Timesheet;
use PHPUnit\Framework\TestCase;
/**
* @covers \App\Entity\Tag
*/
class TagTest extends AbstractEntityTest
class TagTest extends TestCase
{
public function testDefaultValues()
{

193
tests/Entity/TimesheetTest.php
View File

@@ -16,11 +16,12 @@ use App\Entity\Tag;
use App\Entity\Timesheet;
use App\Entity\User;
use Doctrine\Common\Collections\ArrayCollection;
use PHPUnit\Framework\TestCase;
/**
* @covers \App\Entity\Timesheet
*/
class TimesheetTest extends AbstractEntityTest
class TimesheetTest extends TestCase
{
public function testDefaultValues()
{
@@ -66,196 +67,6 @@ class TimesheetTest extends AbstractEntityTest
return $entity;
}
public function testValidationNeedsActivity()
{
$entity = new Timesheet();
$entity
->setUser(new User())
->setProject(new Project())
->setBegin(new \DateTime())
;
$this->assertHasViolationForField($entity, 'activity');
}
public function testValidationNeedsProject()
{
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity(new Activity())
->setBegin(new \DateTime())
;
$this->assertHasViolationForField($entity, 'project');
}
public function testValidationProjectMismatch()
{
$customer = new Customer();
$project = (new Project())->setName('foo')->setCustomer($customer);
$project2 = (new Project())->setName('bar')->setCustomer($customer);
$activity = (new Activity())->setName('hello-world')->setProject($project);
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity($activity)
->setProject($project2)
->setBegin(new \DateTime())
;
$this->assertHasViolationForField($entity, 'project');
}
public function testValidationCustomerInvisible()
{
$customer = (new Customer())->setVisible(false);
$project = (new Project())->setName('foo')->setCustomer($customer);
$activity = (new Activity())->setName('hello-world')->setProject($project);
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
;
$this->assertHasViolationForField($entity, 'customer');
}
public function testValidationCustomerInvisibleDoesNotTriggerOnStoppedEntites()
{
$customer = (new Customer())->setVisible(false);
$project = (new Project())->setName('foo')->setCustomer($customer);
$activity = (new Activity())->setName('hello-world')->setProject($project);
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
$this->assertHasNoViolations($entity);
}
public function testValidationProjectInvisible()
{
$customer = new Customer();
$project = (new Project())->setName('foo')->setCustomer($customer)->setVisible(false);
$activity = (new Activity())->setName('hello-world')->setProject($project);
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
;
$this->assertHasViolationForField($entity, 'project');
}
public function testValidationProjectInvisibleDoesNotTriggerOnStoppedEntites()
{
$customer = new Customer();
$project = (new Project())->setName('foo')->setCustomer($customer)->setVisible(false);
$activity = (new Activity())->setName('hello-world')->setProject($project);
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
$this->assertHasNoViolations($entity);
}
public function testValidationActivityInvisible()
{
$customer = new Customer();
$project = (new Project())->setName('foo')->setCustomer($customer);
$activity = (new Activity())->setName('hello-world')->setProject($project)->setVisible(false);
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
;
$this->assertHasViolationForField($entity, 'activity');
}
public function testValidationActivityInvisibleDoesNotTriggerOnStoppedEntites()
{
$customer = new Customer();
$project = (new Project())->setName('foo')->setCustomer($customer);
$activity = (new Activity())->setName('hello-world')->setProject($project)->setVisible(false);
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
$this->assertHasNoViolations($entity);
}
public function testValidationEndNotEarlierThanBegin()
{
$entity = $this->getEntity();
$begin = new \DateTime();
$end = clone $begin;
$end = $end->modify('-1 second');
$entity->setBegin($begin);
$entity->setEnd($end);
$this->assertHasViolationForField($entity, 'end');
// allow same begin and end
$entity = $this->getEntity();
$begin = new \DateTime();
$end = clone $begin;
$entity->setBegin($begin);
$entity->setEnd($end);
$this->assertHasViolationForField($entity, []);
}
public function testDurationMustBeGreatorOrEqualThanZero()
{
$entity = $this->getEntity();
$begin = new \DateTime();
$end = clone $begin;
$entity->setBegin($begin);
$entity->setEnd($end);
$entity->setDuration(-1);
$this->assertHasViolationForField($entity, 'duration');
// allow zero duration
$entity = $this->getEntity();
$begin = new \DateTime();
$end = clone $begin;
$entity->setBegin($begin);
$entity->setEnd($end);
$entity->setDuration(0);
$this->assertHasViolationForField($entity, []);
}
public function testTags()
{
$sut = new Timesheet();

237
tests/Entity/TimesheetValidationTest.php Normal file
View File

@@ -0,0 +1,237 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Tests\Entity;
use App\Entity\Activity;
use App\Entity\Customer;
use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
/**
* @covers \App\Entity\Timesheet
* @group integration
*/
class TimesheetValidationTest extends KernelTestCase
{
use EntityValidationTestTrait;
protected function getEntity()
{
$customer = new Customer();
$customer->setName('Test Customer');
$project = new Project();
$project->setName('Test Project');
$project->setCustomer($customer);
$activity = new Activity();
$activity->setName('Test');
$activity->setProject($project);
$entity = new Timesheet();
$entity->setUser(new User());
$entity->setActivity($activity);
$entity->setProject($project);
return $entity;
}
public function testValidationNeedsActivity()
{
$entity = new Timesheet();
$entity
->setUser(new User())
->setProject(new Project())
->setBegin(new \DateTime())
;
$this->assertHasViolationForField($entity, 'activity');
}
public function testValidationNeedsProject()
{
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity(new Activity())
->setBegin(new \DateTime())
;
$this->assertHasViolationForField($entity, 'project');
}
public function testValidationProjectMismatch()
{
$customer = new Customer();
$project = (new Project())->setName('foo')->setCustomer($customer);
$project2 = (new Project())->setName('bar')->setCustomer($customer);
$activity = (new Activity())->setName('hello-world')->setProject($project);
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity($activity)
->setProject($project2)
->setBegin(new \DateTime())
;
$this->assertHasViolationForField($entity, 'project');
}
public function testValidationCustomerInvisible()
{
$customer = (new Customer())->setVisible(false);
$project = (new Project())->setName('foo')->setCustomer($customer);
$activity = (new Activity())->setName('hello-world')->setProject($project);
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
;
$this->assertHasViolationForField($entity, 'customer');
}
public function testValidationCustomerInvisibleDoesNotTriggerOnStoppedEntites()
{
$customer = (new Customer())->setVisible(false);
$project = (new Project())->setName('foo')->setCustomer($customer);
$activity = (new Activity())->setName('hello-world')->setProject($project);
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
$this->assertHasNoViolations($entity);
}
public function testValidationProjectInvisible()
{
$customer = new Customer();
$project = (new Project())->setName('foo')->setCustomer($customer)->setVisible(false);
$activity = (new Activity())->setName('hello-world')->setProject($project);
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
;
$this->assertHasViolationForField($entity, 'project');
}
public function testValidationProjectInvisibleDoesNotTriggerOnStoppedEntites()
{
$customer = new Customer();
$project = (new Project())->setName('foo')->setCustomer($customer)->setVisible(false);
$activity = (new Activity())->setName('hello-world')->setProject($project);
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
$this->assertHasNoViolations($entity);
}
public function testValidationActivityInvisible()
{
$customer = new Customer();
$project = (new Project())->setName('foo')->setCustomer($customer);
$activity = (new Activity())->setName('hello-world')->setProject($project)->setVisible(false);
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
;
$this->assertHasViolationForField($entity, 'activity');
}
public function testValidationActivityInvisibleDoesNotTriggerOnStoppedEntites()
{
$customer = new Customer();
$project = (new Project())->setName('foo')->setCustomer($customer);
$activity = (new Activity())->setName('hello-world')->setProject($project)->setVisible(false);
$entity = new Timesheet();
$entity
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
$this->assertHasNoViolations($entity);
}
public function testValidationEndNotEarlierThanBegin()
{
$entity = $this->getEntity();
$begin = new \DateTime();
$end = clone $begin;
$end = $end->modify('-1 second');
$entity->setBegin($begin);
$entity->setEnd($end);
$this->assertHasViolationForField($entity, 'end');
// allow same begin and end
$entity = $this->getEntity();
$begin = new \DateTime();
$end = clone $begin;
$entity->setBegin($begin);
$entity->setEnd($end);
$this->assertHasViolationForField($entity, []);
}
public function testDurationMustBeGreatorOrEqualThanZero()
{
$entity = $this->getEntity();
$begin = new \DateTime();
$end = clone $begin;
$entity->setBegin($begin);
$entity->setEnd($end);
$entity->setDuration(-1);
$this->assertHasViolationForField($entity, 'duration');
// allow zero duration
$entity = $this->getEntity();
$begin = new \DateTime();
$end = clone $begin;
$entity->setBegin($begin);
$entity->setEnd($end);
$entity->setDuration(0);
$this->assertHasViolationForField($entity, []);
}
}

57
tests/Entity/UserTest.php
View File

@@ -12,11 +12,12 @@ namespace App\Tests\Entity;
use App\Entity\User;
use App\Entity\UserPreference;
use Doctrine\Common\Collections\ArrayCollection;
use PHPUnit\Framework\TestCase;
/**
* @covers \App\Entity\User
*/
class UserTest extends AbstractEntityTest
class UserTest extends TestCase
{
public function testDefaultValues()
{
@@ -40,60 +41,6 @@ class UserTest extends AbstractEntityTest
$this->assertEquals('Mr. Code Blaster', $user->getTitle());
}
public function getInvalidTestData()
{
return [
['', ''],
[null, null],
['xx', 'test@'], // too short username
[str_pad('#', 61, '-'), 'test@x.'], // too long username
[str_pad('#', 61, '-'), 'test@x.', ['xxxxx']], // too short password and invalid role
];
}
/**
* @dataProvider getInvalidTestData
*/
public function testInvalidValues($username, $email, $roles = [])
{
$defaultFields = [
'username', 'email'
];
$user = new User();
$user->setUsername($username);
$user->setEmail($email);
if (!empty($roles)) {
$user->setRoles($roles);
$defaultFields[] = 'roles';
}
$this->assertHasViolationForField($user, $defaultFields);
}
public function getValidTestData()
{
return [
[str_pad('#', 3, '-'), 'test@x.x'], // shortest possible username
[str_pad('#', 60, '-'), 'test@x.x', ['ROLE_TEAMLEAD']], // longest possible password and valid role
];
}
/**
* @dataProvider getValidTestData
*/
public function testValidValues($username, $email, $roles = [])
{
$user = new User();
$user->setUsername($username);
$user->setEmail($email);
if (!empty($roles)) {
$user->setRoles($roles);
}
$this->assertHasNoViolations($user);
}
public function testDatetime()
{
$date = new \DateTime('+1 day');

76
tests/Entity/UserValidationTest.php Normal file
View File

@@ -0,0 +1,76 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Tests\Entity;
use App\Entity\User;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
/**
* @covers \App\Entity\User
* @group integration
*/
class UserValidationTest extends KernelTestCase
{
use EntityValidationTestTrait;
public function getInvalidTestData()
{
return [
['', ''],
[null, null],
['xx', 'test@'], // too short username
[str_pad('#', 61, '-'), 'test@x.'], // too long username
[str_pad('#', 61, '-'), 'test@x.', ['xxxxx']], // too short password and invalid role
];
}
/**
* @dataProvider getInvalidTestData
*/
public function testInvalidValues($username, $email, $roles = [])
{
$defaultFields = [
'username', 'email'
];
$user = new User();
$user->setUsername($username);
$user->setEmail($email);
if (!empty($roles)) {
$user->setRoles($roles);
$defaultFields[] = 'roles';
}
$this->assertHasViolationForField($user, $defaultFields);
}
public function getValidTestData()
{
return [
[str_pad('#', 3, '-'), 'test@x.x'], // shortest possible username
[str_pad('#', 60, '-'), 'test@x.x', ['ROLE_TEAMLEAD']], // longest possible password and valid role
];
}
/**
* @dataProvider getValidTestData
*/
public function testValidValues($username, $email, $roles = [])
{
$user = new User();
$user->setUsername($username);
$user->setEmail($email);
if (!empty($roles)) {
$user->setRoles($roles);
}
$this->assertHasNoViolations($user);
}
}