Upgrade tests to PhpUnit 10 (#5252)
This commit is contained in:
@@ -37,7 +37,7 @@ class RateServiceTest extends TestCase
|
||||
return $mock;
|
||||
}
|
||||
|
||||
private function createDateTime(string $datetime = null): \DateTime
|
||||
private static function createDateTime(string $datetime = null): \DateTime
|
||||
{
|
||||
return new \DateTime($datetime ?? 'now', new \DateTimeZone('UTC'));
|
||||
}
|
||||
@@ -45,7 +45,7 @@ class RateServiceTest extends TestCase
|
||||
public function testCalculateWithTimesheetHourlyRate(): void
|
||||
{
|
||||
$record = new Timesheet();
|
||||
$record->setEnd($this->createDateTime());
|
||||
$record->setEnd(self::createDateTime());
|
||||
$record->setDuration(1800);
|
||||
$record->setHourlyRate(100);
|
||||
$record->setActivity(new Activity());
|
||||
@@ -53,13 +53,13 @@ class RateServiceTest extends TestCase
|
||||
|
||||
$sut = new RateService([], $this->getRateRepositoryMock());
|
||||
$rate = $sut->calculate($record);
|
||||
$this->assertEquals(50, $rate->getRate());
|
||||
self::assertEquals(50, $rate->getRate());
|
||||
}
|
||||
|
||||
public function testCalculateWithTimesheetFixedRate(): void
|
||||
{
|
||||
$record = new Timesheet();
|
||||
$record->setEnd($this->createDateTime());
|
||||
$record->setEnd(self::createDateTime());
|
||||
$record->setDuration(1800);
|
||||
$record->setFixedRate(10);
|
||||
// make sure that fixed rate is always applied, even if hourly rate is set
|
||||
@@ -69,10 +69,10 @@ class RateServiceTest extends TestCase
|
||||
|
||||
$sut = new RateService([], $this->getRateRepositoryMock());
|
||||
$rate = $sut->calculate($record);
|
||||
$this->assertEquals(10, $rate->getRate());
|
||||
self::assertEquals(10, $rate->getRate());
|
||||
}
|
||||
|
||||
public function getRateTestData()
|
||||
public static function getRateTestData()
|
||||
{ // expected, expInt, durat, userH, userIn, timeH, timeF, actH, actIn, actF, proH, proIn, proFi, custH, custIn, custF
|
||||
yield 'a0' => [0.0, 0.0, 0, 0, 0, null, null, null, null, false, null, null, false, null, null, false];
|
||||
yield 'a2' => [0.0, 0.0, 0, 0, null, null, null, null, null, false, null, null, false, null, null, false];
|
||||
@@ -137,7 +137,7 @@ class RateServiceTest extends TestCase
|
||||
|
||||
$timesheet = new Timesheet();
|
||||
$timesheet
|
||||
->setEnd($this->createDateTime())
|
||||
->setEnd(self::createDateTime())
|
||||
->setHourlyRate($timesheetHourly)
|
||||
->setFixedRate($timesheetFixed)
|
||||
->setActivity($activity)
|
||||
@@ -180,8 +180,8 @@ class RateServiceTest extends TestCase
|
||||
|
||||
$sut = new RateService([], $this->getRateRepositoryMock($rates));
|
||||
$rate = $sut->calculate($timesheet);
|
||||
$this->assertEquals($expectedRate, $rate->getRate());
|
||||
$this->assertEquals($expectedInternalRate, $rate->getInternalRate());
|
||||
self::assertEquals($expectedRate, $rate->getRate());
|
||||
self::assertEquals($expectedInternalRate, $rate->getInternalRate());
|
||||
}
|
||||
|
||||
protected function getTestUser($rate = 75, $internalRate = 75)
|
||||
@@ -199,17 +199,17 @@ class RateServiceTest extends TestCase
|
||||
public function testCalculateWithEmptyEnd(): void
|
||||
{
|
||||
$record = new Timesheet();
|
||||
$record->setBegin($this->createDateTime());
|
||||
$record->setBegin(self::createDateTime());
|
||||
$record->setDuration(1800);
|
||||
$record->setFixedRate(100);
|
||||
$record->setHourlyRate(100);
|
||||
$record->setActivity(new Activity());
|
||||
|
||||
$this->assertEquals(0, $record->getRate());
|
||||
self::assertEquals(0, $record->getRate());
|
||||
|
||||
$sut = new RateService([], $this->getRateRepositoryMock());
|
||||
$rate = $sut->calculate($record);
|
||||
$this->assertEquals(0, $rate->getRate());
|
||||
self::assertEquals(0, $rate->getRate());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -219,7 +219,7 @@ class RateServiceTest extends TestCase
|
||||
*/
|
||||
public function testCalculateWithRulesByUsersHourlyRate($duration, $rules, $expectedRate): void
|
||||
{
|
||||
$end = $this->createDateTime('12:00:00');
|
||||
$end = self::createDateTime('12:00:00');
|
||||
$start = clone $end;
|
||||
$start->setTimestamp($end->getTimestamp() - $duration);
|
||||
|
||||
@@ -229,19 +229,19 @@ class RateServiceTest extends TestCase
|
||||
$record->setDuration($duration);
|
||||
$record->setActivity(new Activity());
|
||||
|
||||
$this->assertEquals(0, $record->getRate());
|
||||
self::assertEquals(0, $record->getRate());
|
||||
|
||||
$record->setEnd($end);
|
||||
|
||||
$sut = new RateService($rules, $this->getRateRepositoryMock());
|
||||
$rate = $sut->calculate($record);
|
||||
|
||||
$this->assertEquals($expectedRate, $rate->getRate());
|
||||
self::assertEquals($expectedRate, $rate->getRate());
|
||||
}
|
||||
|
||||
public function getRuleDefinitions()
|
||||
public static function getRuleDefinitions()
|
||||
{
|
||||
$start = $this->createDateTime('12:00:00');
|
||||
$start = self::createDateTime('12:00:00');
|
||||
$day = $start->format('l');
|
||||
|
||||
return [
|
||||
|
||||
Reference in New Issue
Block a user