Make the unit tests happy

Author: V13Axel

app/Exceptions/AdvancementTooEarlyException.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Exceptions;
+
+use App\Models\Calendar;
+use Exception;
+
+class AdvancementTooEarlyException extends Exception
+{
+    public function __construct(Calendar $calendar)
+    {
+        parent::__construct("Tried to advance {$calendar->name} ({$calendar->hash}), but it's too early.");
+    }
+}

app/Jobs/AdvanceCalendarWithRealTime.php

@@ -4,6 +4,7 @@
 
 use App\Exceptions\AdvancementNotEnabledException;
 use App\Exceptions\AdvancementNotReadyException;
+use App\Exceptions\AdvancementTooEarlyException;
 use App\Exceptions\ClockNotEnabledException;
 use App\Models\Calendar;
 use App\Services\Discord\API\Client;
@@ -87,8 +88,8 @@ private function ensureCalendarShouldAdvance()
         }
 
         // Make sure we haven't accidentally doubled up on running the job
-        if(!$this->calendar->advancement_next_due <= now()->startOfMinute()) {
-            throw new AdvancementNotReadyException($this->calendar);
+        if($this->calendar->advancement_next_due >= now()->startOfMinute()) {
+            throw new AdvancementTooEarlyException($this->calendar);
         }
 
         // Make sure all of the advancement settings are set

setup/extra-preset-jsons

@@ -3,6 +3,8 @@
 namespace Tests\Feature\Calendar;
 
 use App\Exceptions\AdvancementNotEnabledException;
+use App\Exceptions\AdvancementNotReadyException;
+use App\Exceptions\AdvancementTooEarlyException;
 use App\Exceptions\ClockNotEnabledException;
 use App\Jobs\AdvanceCalendarWithRealTime;
 use App\Models\Calendar;
@@ -19,12 +21,12 @@ public function test_automatic_advancement()
     {
         $calendars = $this->getEdgeCases('advancement_testcases');
 
-        if(!$calendars->count()) {
+        if (!$calendars->count()) {
             return;
         }
 
-        $calendars->each(function(Calendar $calendar){
-            collect($calendar->static_data['advancement_testcases'])->each(function($testCase) use ($calendar) {
+        $calendars->each(function (Calendar $calendar) {
+            collect($calendar->static_data['advancement_testcases'])->each(function ($testCase) use ($calendar) {
                 dump(sprintf(
                     "Verifying a real-time advancement test case for %s with at ratio %d real-world %s to %d in-universe %s",
                     $calendar->name,
@@ -34,15 +36,15 @@ public function test_automatic_advancement()
                     $testCase['advancement_settings']['advancement_rate_unit'],
                 ));
 
-                if(isset($testCase['advancement_settings']['advancement_next_due_offset'])) {
+                if (isset($testCase['advancement_settings']['advancement_next_due_offset'])) {
                     dump(sprintf(
                         " - Additionally, pretending we were behind on updates by %d %s",
                         $testCase['advancement_settings']['advancement_next_due_offset'],
                         $testCase['advancement_settings']['advancement_next_due_offset_unit'],
                     ));
                 }
 
-                $testCalendar = clone($calendar);
+                $testCalendar = clone ($calendar);
 
                 /**
                  * 1. Set the current date ✓
@@ -81,19 +83,24 @@ public function test_automatic_advancement()
                 $realRateMethod = "sub" . ucfirst($testCase['advancement_settings']['advancement_real_rate_unit']);
                 $realRateOffset = $testCase['advancement_settings']['advancement_real_rate'];
 
-                if(isset($testCase['advancement_settings']['advancement_next_due_offset'])) {
+                if (isset($testCase['advancement_settings']['advancement_next_due_offset'])) {
                     $realRateMethod = "sub" . ucfirst($testCase['advancement_settings']['advancement_next_due_offset_unit']);
                     $realRateOffset = $testCase['advancement_settings']['advancement_next_due_offset'];
                 }
 
+                $advancementNextDue = now()->$realRateMethod($realRateOffset)->startOfMinute();
+                if (array_key_exists('advancement_next_due_delta', $testCase['advancement_settings'])) {
+                    $deltaMethod = str_replace('sub', 'add', $realRateMethod);
+                    $advancementNextDue = now()->$deltaMethod($testCase['advancement_settings']['advancement_next_due_delta']);
+                }
 
                 $testCalendar->update([
                     'advancement_enabled' => $testCase['advancement_settings']['advancement_enabled'],
                     'advancement_real_rate' => $testCase['advancement_settings']['advancement_real_rate'],
                     'advancement_real_rate_unit' => $testCase['advancement_settings']['advancement_real_rate_unit'],
                     'advancement_rate' => $testCase['advancement_settings']['advancement_rate'],
                     'advancement_rate_unit' => $testCase['advancement_settings']['advancement_rate_unit'],
-                    'advancement_next_due' => now()->$realRateMethod($realRateOffset)->startOfMinute(),
+                    'advancement_next_due' => $advancementNextDue,
                 ]);
 
                 /**
@@ -109,10 +116,13 @@ public function test_automatic_advancement()
                 try {
                     (new AdvanceCalendarWithRealTime($testCalendar))->handle();
                 } catch (\Throwable $thrown) {
-                    if(!$testCalendar->advancement_enabled) {
+                    if ($testCase['advancement_settings']['advancement_next_due_delta'] ?? false) {
+                        $this->assertTrue($thrown instanceof AdvancementTooEarlyException);
+                    }
+                    if (!$testCalendar->advancement_enabled) {
                         $this->assertTrue($thrown instanceof AdvancementNotEnabledException);
                     }
-                    if(!$testCalendar->clock_enabled) {
+                    if (!$testCalendar->clock_enabled) {
                         $this->assertTrue($thrown instanceof ClockNotEnabledException);
                     }
                 }