From 3e430cc827f41747bf50c30c6c3acc3be2ee2e83 Mon Sep 17 00:00:00 2001 From: XxFran10xX <318299142+XxFran10xX@users.noreply.github.com> Date: Thu, 12 Nov 2026 12:57:17 +0100 Subject: [PATCH] test: blank campaign templates in the schedule lifecycle test CampaignScheduleLifecycleCoverageTest loads no battle templates and only passed while Cache.battleCampaignTemplateField/Siege were still blank. A test that ran the config loader earlier in the same JVM (for example ConfigLoaderBattleTemplateDefaultsTest) leaves them set, and scheduling then failed with "Unknown battle template". Test order differs between CI runners, so main's build and the v4.32.2 release failed on it while the PR build passed. Remember and blank both, as CampaignBattleBoundaryCoverageTest already does. Co-Authored-By: Claude Opus 5.5 --- .../schedule/CampaignScheduleLifecycleCoverageTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/test/java/net/tfminecraft/simplefactions/war/campaign/schedule/CampaignScheduleLifecycleCoverageTest.java b/src/test/java/net/tfminecraft/simplefactions/war/campaign/schedule/CampaignScheduleLifecycleCoverageTest.java index 2043a1f9..72b03615 100644 --- a/src/test/java/net/tfminecraft/simplefactions/war/campaign/schedule/CampaignScheduleLifecycleCoverageTest.java +++ b/src/test/java/net/tfminecraft/simplefactions/war/campaign/schedule/CampaignScheduleLifecycleCoverageTest.java @@ -81,7 +81,13 @@ void setup() throws Exception { "warFirstBattleAtBorder", "warProvincesBetweenBattles", "warBattleWindowStartHour", - "warBattleWindowEndHour")) rig.remember(Cache.class, field); + "warBattleWindowEndHour", + "battleCampaignTemplateField", + "battleCampaignTemplateSiege")) rig.remember(Cache.class, field); + // No campaign templates are loaded here; a test that ran the config loader earlier in the + // same JVM leaves field_default/siege_default set, and scheduling would then fail on them. + Cache.battleCampaignTemplateField = ""; + Cache.battleCampaignTemplateSiege = ""; Cache.warFirstBattleAtBorder = true; Cache.warProvincesBetweenBattles = 1; Cache.warBattleWindowStartHour = 21;