Merge branch 'master' into DM-5997

MegaMek · Sep 15, 2024 · b909b6d · b909b6d
2 parents a9e6949 + 47235cc
commit b909b6d
Show file tree

Hide file tree

Showing 59 changed files with 1,505 additions and 1,603 deletions.
diff --git a/megamek/unittests/megamek/client/bot/ChatProcessorTest.java b/megamek/unittests/megamek/client/bot/ChatProcessorTest.java
@@ -19,6 +19,24 @@
  */
 package megamek.client.bot;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Vector;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentMatchers;
+
 import megamek.client.bot.princess.BehaviorSettingsFactory;
 import megamek.client.bot.princess.CardinalEdge;
 import megamek.client.bot.princess.ChatCommands;
@@ -28,25 +46,13 @@
 import megamek.common.Game;
 import megamek.common.Player;
 import megamek.common.event.GamePlayerChatEvent;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentMatchers;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Vector;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
 
 /**
  * User: Deric "Netzilla" Page (deric dot page at usa dot net)
  * Date: 8/17/13
  * Time: 9:32 AM
  */
-public class ChatProcessorTest {
+class ChatProcessorTest {
 
         private static BotClient mockBotHal;
         private static final Game MOCK_GAME = mock(Game.class);
@@ -57,7 +63,7 @@ public class ChatProcessorTest {
         private static Player mockHumanPlayerKirk;
 
         @BeforeAll
-        public static void beforeAll() {
+        static void beforeAll() {
                 mockHumanPlayerDave = mock(Player.class);
                 mockHumanPlayerKirk = mock(Player.class);
                 mockBotPlayerHal = mock(Player.class);
@@ -108,7 +114,7 @@ public static void beforeAll() {
         }
 
         @Test
-        public void testAdditionalPrincessCommands() {
+        void testAdditionalPrincessCommands() {
                 final ChatProcessor testChatProcessor = new ChatProcessor();
 
                 final Board mockBoard = mock(Board.class);
@@ -537,7 +543,7 @@ public void testAdditionalPrincessCommands() {
 
                 // Test a chat message not directed at Princess.
                 mockChatEvent = mock(GamePlayerChatEvent.class);
-                chatMessage = "MovementDisplay: tried to select non-existant entity: -1";
+                chatMessage = "MovementDisplay: tried to select non-existent entity: -1";
                 when(mockChatEvent.getMessage()).thenReturn(chatMessage);
                 when(mockChatEvent.getPlayer()).thenReturn(null);
                 mockPrincess = spy(new Princess(mockBotPlayerVGer.getName(), "test", 1));

diff --git a/megamek/unittests/megamek/client/bot/princess/AeroPathUtilTest.java b/megamek/unittests/megamek/client/bot/princess/AeroPathUtilTest.java
@@ -45,24 +45,9 @@ void testAssertWillStallOnAtmosphereGroundMap() {
 		assertFalse(result);
 	}
 
-	@Test
-	void testAssertWillStallNotOnAtmosphereGroundMap() {
-		final Entity mockEntity = MockGenerators.generateMockAerospace(0, 0);
-		when(mockEntity.isAirborne()).thenReturn(true);
-
-		final MovePath mockPath = MockGenerators.generateMockPath(16, 16, mockEntity);
-		when(mockPath.isOnAtmosphericGroundMap()).thenReturn(true);
-		when(mockPath.getFinalVelocity()).thenReturn(0);
-
-		boolean result = AeroPathUtil.willStall(mockPath);
-		assertTrue(result);
-	}
-
 	@Test
 	void testAssertWillStallAsSpheroidDropshipWithVLAND() {
 		final Entity mockEntity = MockGenerators.generateMockAerospace(0, 0);
-		when(mockEntity.isAirborne()).thenReturn(true);
-		when(mockEntity.isAero()).thenReturn(true);
 		when(mockEntity.isSpheroid()).thenReturn(true);
 
 		final MovePath mockPath = MockGenerators.generateMockPath(16, 16, mockEntity);
@@ -79,7 +64,6 @@ void testAssertWillStallAsSpheroidDropshipWithVLAND() {
 	@Test
 	void testAssertWillCrashWithOutLandOrVland() {
 		final Entity mockEntity = MockGenerators.generateMockAerospace(0, 0);
-		when(mockEntity.isAero()).thenReturn(true);
 
 		final MovePath mockPath = MockGenerators.generateMockPath(16, 16, mockEntity);
 		when(mockPath.getFinalVelocity()).thenReturn(1);
@@ -91,7 +75,6 @@ void testAssertWillCrashWithOutLandOrVland() {
 	@Test
 	void testAssertWillCrashWithLandOrVland() {
 		final Entity mockEntity = MockGenerators.generateMockAerospace(0, 0);
-		when(mockEntity.isAero()).thenReturn(true);
 
 		final MovePath mockPath = MockGenerators.generateMockPath(16, 16, mockEntity);
 		when(mockPath.getFinalVelocity()).thenReturn(0);
@@ -101,5 +84,4 @@ void testAssertWillCrashWithLandOrVland() {
 		boolean result = AeroPathUtil.willCrash(mockPath);
 		assertFalse(result);
 	}
-
 }