Merge branch 'MegaMek:master' into issue-3650-rfe-add-ability-to-link…

…-units-2
MegaMek · Jan 9, 2025 · a07fa95 · a07fa95
2 parents 628c13b + 8ea7a6d
commit a07fa95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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)

diff --git 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> 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());
     }