Proper Compatibility for AC Ammo in MHQ

Author: psikomonkie

MekHQ/src/mekhq/campaign/parts/AmmoStorage.java

@@ -31,9 +31,6 @@
 import java.io.PrintWriter;
 import java.util.Objects;
 
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
 import megamek.common.AmmoType;
 import megamek.common.ITechnology;
 import megamek.common.TargetRoll;
@@ -48,6 +45,8 @@
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.work.IAcquisitionWork;
 import mekhq.utilities.MHQXMLUtility;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 /**
  * This will be a special type of part that will only exist as spares
@@ -152,6 +151,8 @@ public boolean isSameAmmoType(AmmoType otherAmmoType) {
      * is compatible with this instance's ammo.
      *
      * @param otherAmmoType The other {@code AmmoType}.
+     * @return False if the ammo does not support "compatibility" or is not compatible, true if the ammo type
+     * supports compatibility and is compatible
      */
     public boolean isCompatibleAmmo(AmmoType otherAmmoType) {
         return getType().isCompatibleWith(otherAmmoType);

MekHQ/src/mekhq/campaign/parts/equipment/AmmoBin.java

@@ -490,8 +490,9 @@ public boolean isSamePartType(Part part) {
         // AmmoType and number of rounds of ammo (i.e. they are the same
         // irrespective of "munition type" or "bomb type").
         return (getClass() == part.getClass()) &&
-               getType().isCompatibleWith(((AmmoBin) part).getType()) &&
-               (((AmmoBin) part).getFullShots() == getFullShots());
+            ((getType().isCompatibleWith(((AmmoBin) part).getType())) ||
+                   (getType().equals(((AmmoBin) part).getType()))) &&
+            (((AmmoBin) part).getFullShots() == getFullShots());
     }
 
     @Override

MekHQ/unittests/mekhq/campaign/parts/equipment/AmmoBinTest.java

@@ -27,6 +27,29 @@
  */
 package mekhq.campaign.parts.equipment;
 
+import static mekhq.campaign.parts.AmmoUtilities.getAmmoType;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.ParserConfigurationException;
+
 import megamek.Version;
 import megamek.common.AmmoType;
 import megamek.common.Entity;
@@ -43,25 +66,13 @@
 import mekhq.campaign.unit.Unit;
 import mekhq.campaign.work.IAcquisitionWork;
 import mekhq.utilities.MHQXMLUtility;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import static mekhq.campaign.parts.AmmoUtilities.getAmmoType;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
-
 public class AmmoBinTest {
     @Test
     public void deserializationCtorTest() {
@@ -1460,4 +1471,46 @@ public void fixFullBinAfterChangingAmmoType() {
         // ... but the correct amount of our original ammo type unloaded from the bin.
         assertEquals(ammoType.getShots(), quartermaster.getAmmoAvailable(ammoType));
     }
+
+    @Nested
+    class AmmoBinSamePartTypeTests {
+        Campaign mockCampaign;
+        AmmoType ammo1;
+        AmmoType ammo2;
+        int shotsNeeded = 1;
+        int equipmentNum = 42;
+
+        @BeforeEach
+        void beforeEach() {
+            mockCampaign = mock(Campaign.class);
+
+            AmmoMounted mockAmmoRack1 = mock(AmmoMounted.class);
+            AmmoMounted mockAmmoRack2 = mock(AmmoMounted.class);
+
+            when(mockAmmoRack1.getType()).thenReturn(ammo1);
+            when(mockAmmoRack2.getType()).thenReturn(ammo2);
+        }
+
+        @Test void matchingACAmmo () {
+            ammo1 = (AmmoType) AmmoType.get("ISAC5 Ammo");
+            ammo2 = (AmmoType) AmmoType.get("ISAC5 Ammo");
+
+            // Create an Ammo Bin with some ammo ...
+            AmmoBin ammoBin1 = new AmmoBin(0, ammo1, equipmentNum, shotsNeeded, false, false, mockCampaign);
+            AmmoBin ammoBin2 = new AmmoBin(0, ammo2, equipmentNum, shotsNeeded, false, false, mockCampaign);
+
+            assertTrue(ammoBin1.isSamePartType(ammoBin2));
+        }
+
+        @Test void mismatchedACAmmo () {
+            ammo1 = (AmmoType) AmmoType.get("ISAC5 Ammo");
+            ammo2 = (AmmoType) AmmoType.get("ISAC10 Ammo");
+
+            // Create an Ammo Bin with some ammo ...
+            AmmoBin ammoBin1 = new AmmoBin(0, ammo1, equipmentNum, shotsNeeded, false, false, mockCampaign);
+            AmmoBin ammoBin2 = new AmmoBin(0, ammo2, equipmentNum, shotsNeeded, false, false, mockCampaign);
+
+            assertFalse(ammoBin1.isSamePartType(ammoBin2));
+        }
+    }
 }