minor #49774 [Scheduler] Fix unit tests (Jean-Beru)

fabpot · fabpot · commit aadd302a0a2d · 2023-03-23T06:05:00.000+01:00
This PR was squashed before being merged into the 6.3 branch. Discussion ---------- [Scheduler] Fix unit tests | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | no  | Deprecations? | no  | Tickets | | License | MIT | Doc PR | This PR fixes unit tests for the Scheduler component Commits ------- c2bd30c [Scheduler] Fix unit tests
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTestCase.php b/src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTestCase.php
@@ -20,9 +20,9 @@ abstract class AbstractTriggerTestCase extends TestCase
     /**
      * @dataProvider providerGetNextRunDate
      */
-    public function testGetNextRunDate(TriggerInterface $trigger, array $expected)
+    public function testGetNextRunDate(\DateTimeImmutable $from, TriggerInterface $trigger, array $expected)
     {
-        $this->assertEquals($expected, $this->getNextRunDates($trigger));
+        $this->assertEquals($expected, $this->getNextRunDates($from, $trigger));
     }
 
     abstract public static function providerGetNextRunDate(): iterable;
@@ -34,11 +34,11 @@ protected static function createTrigger(string $interval): DatePeriodTrigger
         );
     }
 
-    private function getNextRunDates(TriggerInterface $trigger): array
+    private function getNextRunDates(\DateTimeImmutable $from, TriggerInterface $trigger): array
     {
         $dates = [];
         $i = 0;
-        $next = new \DateTimeImmutable();
+        $next = $from;
         while ($i++ < 20) {
             $next = $trigger->getNextRunDate($next);
             if (!$next) {
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php
@@ -18,6 +18,7 @@ class DatePeriodTriggerTest extends AbstractTriggerTestCase
     public static function providerGetNextRunDate(): iterable
     {
         yield [
+            new \DateTimeImmutable('2023-03-19 13:45'),
             self::createTrigger('next tuesday'),
             [
                 new \DateTimeImmutable('2023-03-21 13:45:00'),
@@ -37,6 +38,7 @@ public static function providerGetNextRunDate(): iterable
         ];
 
         yield [
+            new \DateTimeImmutable('2023-03-19 13:45'),
             self::createTrigger('last day of next month'),
             [
                 new \DateTimeImmutable('2023-04-30 13:45:00'),
@@ -45,6 +47,7 @@ public static function providerGetNextRunDate(): iterable
         ];
 
         yield [
+            new \DateTimeImmutable('2023-03-19 13:45'),
             self::createTrigger('first monday of next month'),
             [
                 new \DateTimeImmutable('2023-04-03 13:45:00'),

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@ abstract class AbstractTriggerTestCase extends TestCase`
`20`	`20`	`/**`
`21`	`21`	`* @dataProvider providerGetNextRunDate`
`22`	`22`	`*/`
`23`		`- public function testGetNextRunDate(TriggerInterface $trigger, array $expected)`
	`23`	`+ public function testGetNextRunDate(\DateTimeImmutable $from, TriggerInterface $trigger, array $expected)`
`24`	`24`	`{`
`25`		`- $this->assertEquals($expected, $this->getNextRunDates($trigger));`
	`25`	`+ $this->assertEquals($expected, $this->getNextRunDates($from, $trigger));`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`abstract public static function providerGetNextRunDate(): iterable;`
`@@ -34,11 +34,11 @@ protected static function createTrigger(string $interval): DatePeriodTrigger`
`34`	`34`	`);`
`35`	`35`	`}`
`36`	`36`
`37`		`- private function getNextRunDates(TriggerInterface $trigger): array`
	`37`	`+ private function getNextRunDates(\DateTimeImmutable $from, TriggerInterface $trigger): array`
`38`	`38`	`{`
`39`	`39`	`$dates = [];`
`40`	`40`	`$i = 0;`
`41`		`- $next = new \DateTimeImmutable();`
	`41`	`+ $next = $from;`
`42`	`42`	`while ($i++ < 20) {`
`43`	`43`	`$next = $trigger->getNextRunDate($next);`
`44`	`44`	`if (!$next) {`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ class DatePeriodTriggerTest extends AbstractTriggerTestCase`
`18`	`18`	`public static function providerGetNextRunDate(): iterable`
`19`	`19`	`{`
`20`	`20`	`yield [`
	`21`	`+ new \DateTimeImmutable('2023-03-19 13:45'),`
`21`	`22`	`self::createTrigger('next tuesday'),`
`22`	`23`	`[`
`23`	`24`	`new \DateTimeImmutable('2023-03-21 13:45:00'),`
`@@ -37,6 +38,7 @@ public static function providerGetNextRunDate(): iterable`
`37`	`38`	`];`
`38`	`39`
`39`	`40`	`yield [`
	`41`	`+ new \DateTimeImmutable('2023-03-19 13:45'),`
`40`	`42`	`self::createTrigger('last day of next month'),`
`41`	`43`	`[`
`42`	`44`	`new \DateTimeImmutable('2023-04-30 13:45:00'),`
`@@ -45,6 +47,7 @@ public static function providerGetNextRunDate(): iterable`
`45`	`47`	`];`
`46`	`48`
`47`	`49`	`yield [`
	`50`	`+ new \DateTimeImmutable('2023-03-19 13:45'),`
`48`	`51`	`self::createTrigger('first monday of next month'),`
`49`	`52`	`[`
`50`	`53`	`new \DateTimeImmutable('2023-04-03 13:45:00'),`