Merge pull request #1718 from wielebenwir/datengraben/fix-phpunit-sch…

…eduler

Fix #1605 last php unit test

src/Service/Scheduler.php

@@ -213,6 +213,13 @@ public function getJobhook(): string {
 		return $this->jobhook;
 	}
 
+	/**
+	 * @return int timestamp of scheduled event
+	 */
+	public function getTimestamp(): int {
+		return $this->timestamp;
+	}
+
 	/**
 	 * Unschedules the current job.
 	 * This can have multiple reasons:

tests/php/Service/SchedulerTest.php

@@ -72,29 +72,35 @@ public function testReSchedule() {
 		);
 	}
 
+	/**
+	 * Tests custom recurrences via wp cron interfaces
+	 */
 	public function testCustomRecurrence() {
+
+		$thirty_minutes = 'thirty_minutes';
+
 		$customSchedule = new Scheduler(
 			'test2',
 			'CommonsBooking\Tests\Service\dummyFunction',
-			'thirty_minutes',
+			$thirty_minutes,
 			'',
 			array($this->dummyOptionsKey,$this->dummyFieldId),
 			$this->dummyUpdateHook
 		);
 		$this->jobhooks[] = $customSchedule->getJobhook();
-
-		// Should contain custom cron intervals, because Scheduler(...) adds filter 
-		$this->assertContains( 'thirty_minutes', array_keys( wp_get_schedules() ) );
 
-		$now = new DateTime('now', new \DateTimeZone('UTC'));
-		$nowTS = $now->getTimestamp();
+		// Should contain custom cron intervals, because Scheduler(...) adds filter
+		$this->assertContains( $thirty_minutes, array_keys( wp_get_schedules() ) );
+
 		$this->assertEquals(
-			$nowTS,
-			wp_next_scheduled($customSchedule->getJobhook())
+			// returns timestamp which is used to set internal event object (via wp_schedule_event in Scheduler class)
+			$customSchedule->getTimestamp(),
+			// returns timestamp from internal event object identified by job hook
+			wp_next_scheduled( $customSchedule->getJobhook() )
 		);
 
 		$event = wp_get_scheduled_event($customSchedule->getJobhook());
-		$this->assertEquals('thirty_minutes',$event->schedule);
+		$this->assertEquals( $thirty_minutes , $event->schedule );
 
 	}