From 29abf5e1fbaafe9193504271b452d453b6311e93 Mon Sep 17 00:00:00 2001 From: Scoppio Date: Thu, 9 Jan 2025 16:59:41 -0300 Subject: [PATCH 1/2] fix: fixed error with resolver test --- MekHQ/unittests/mekhq/campaign/autoresolve/ResolverTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/MekHQ/unittests/mekhq/campaign/autoresolve/ResolverTest.java b/MekHQ/unittests/mekhq/campaign/autoresolve/ResolverTest.java index 3fb0868876..5933f0484a 100644 --- a/MekHQ/unittests/mekhq/campaign/autoresolve/ResolverTest.java +++ b/MekHQ/unittests/mekhq/campaign/autoresolve/ResolverTest.java @@ -133,8 +133,7 @@ public static void setupClass() throws IOException { @Mock private BotForce botForce; - @InjectMocks - private Resolver resolver; + @BeforeEach public void setup() { @@ -355,7 +354,7 @@ void autoResolve(Consumer autoResolveConcludedEvent) when(botForce.getTeam()).thenReturn(2); when(botForce.getFullEntityList(any())).thenReturn(entities); - resolver = Resolver.simulationRun(new AtBSetupForces(campaign, units, scenario), SimulationOptions.empty(), new Board(30, 30)); + var resolver = Resolver.simulationRun(new AtBSetupForces(campaign, units, scenario), SimulationOptions.empty(), new Board(30, 30)); autoResolveConcludedEvent.accept(resolver.resolveSimulation()); } From 8ea7a6db87793cabf16b210b8a11bcd02170a6ec Mon Sep 17 00:00:00 2001 From: Daniel L- <103902653+IllianiCBT@users.noreply.github.com> Date: Thu, 9 Jan 2025 14:04:49 -0600 Subject: [PATCH 2/2] Update history.txt --- MekHQ/docs/history.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/MekHQ/docs/history.txt b/MekHQ/docs/history.txt index b655783ed1..a96f30c7c6 100644 --- a/MekHQ/docs/history.txt +++ b/MekHQ/docs/history.txt @@ -258,6 +258,7 @@ MEKHQ VERSION HISTORY: + PR #5676: Corrected Transportation Unit Type Check + Fix #5663: Addresses where the financeTable is empty + Fix #5664: Expanded Contract Automation Functionality to Manually Created AtB Contracts ++ Fix #5728: fixed error with resolver test 0.50.01 (2024-11-10 1800 UTC) + PR #4810: Respecting Trademarks (Mech to Mek)