Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Partial fix for failing refit tests #3853

Merged
merged 2 commits into from
Feb 24, 2024
Merged

Partial fix for failing refit tests #3853

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
648fef3
Partial fix for failing refit tests
Sleet01 Feb 23, 2024
e3585e2
Fix remaining failing refit tests
Sleet01 Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions MekHQ/unittests/mekhq/campaign/parts/RefitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import mekhq.campaign.personnel.Person;
import mekhq.campaign.unit.Unit;
import mekhq.campaign.unit.UnitTestUtilities;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down Expand Up @@ -77,6 +78,11 @@ public class RefitTest {
@Mock
private Warehouse mockWarehouse;

@BeforeAll
static void before() {
EquipmentType.initializeTypes();
}

@BeforeEach
public void beforeEach() {
lenient().when(mockCampaign.getCampaignOptions()).thenReturn(mockCampaignOptions);
Expand Down Expand Up @@ -157,7 +163,7 @@ public void locust1Vto1ETest() {
// Locust 1V to 1E Class D refit steps (in no particular order):
// 1. Remove excess Machine Gun (LA) [120 mins]
// 2. Remove excess Machine Gun (RA) [120 mins]
// 3. Remove Machine Gun Ammo Bin (CT) [120 mins]
// 3. Remove Machine Gun Ammo [Full] Bin (CT) [120 mins]
// 4. Move Medium Laser (CT) to (RA) [120 mins]
// 5. Add Medium Laser to (LA) [120 mins]
// 6. Add Small Laser to (RA) [120 mins]
Expand Down Expand Up @@ -191,7 +197,7 @@ public void locust1Vto1ETest() {
.filter(p -> (p instanceof EquipmentPart) && p.getName().equals("Machine Gun"))
.count());
assertEquals(1, removedParts.stream()
.filter(p -> (p instanceof AmmoBin) && p.getName().equals("Machine Gun Ammo Bin"))
.filter(p -> (p instanceof AmmoBin) && p.getName().equals("Machine Gun Ammo [Full] Bin"))
.count());

// All of the new parts should be from the old unit
Expand Down Expand Up @@ -540,7 +546,7 @@ public void fleaFLE4toFLE15Test() {
// 5. Add Medium Laser (RA) [120 mins]
// 6. Add Machine Gun (LA) [120 mins]
// 7. Add Machine Gun (RA) [120 mins]
// 8. Add Machine Gun Ammo Bin to (CT) [120 mins]
// 8. Add Machine Gun Ammo [Full] Bin to (CT) [120 mins]
// 9. Add 16 points of armor to 10 locations (except the HD).
// a. Add 1 point to (LA) [5 mins]
// b. Add 1 point to (RA) [5 mins]
Expand Down Expand Up @@ -601,7 +607,7 @@ public void fleaFLE4toFLE15Test() {
.filter(p -> (p instanceof MissingEquipmentPart) && p.getName().equals("Machine Gun"))
.count());
assertEquals(1, shoppingCart.stream()
.filter(p -> (p instanceof AmmoBin) && p.getName().equals("Machine Gun Ammo Bin"))
.filter(p -> (p instanceof AmmoBin) && p.getName().equals("Machine Gun Ammo [Full] Bin"))
.count());

// We should have 16 points of standard armor on order
Expand Down Expand Up @@ -767,7 +773,7 @@ public void heavyTrackedApcMgToStandard() throws EntityLoadingException, IOExcep
.filter(p -> (p instanceof EquipmentPart) && p.getName().equals("Machine Gun"))
.count());
assertEquals(1, removedParts.stream()
.filter(p -> (p instanceof AmmoBin) && p.getName().equals("Machine Gun Ammo Bin"))
.filter(p -> (p instanceof AmmoBin) && p.getName().equals("Machine Gun Ammo [Full] Bin"))
.count());

// All of the new parts (except ammo bins) should be from the old unit
Expand Down
Loading