Skip to content

Commit

Permalink
Resolve PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@sixlettervariables
sixlettervariables committed Dec 30, 2020
1 parent af79489 commit 30aeaf1
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions MekHQ/unittests/mekhq/campaign/market/ContractMarketAtBGenerationTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void addMercWithoutRetainerAtBContractSucceeds() {
when(campaign.getFactionCode()).thenReturn("MERC");
when(campaign.getRetainerEmployerCode()).thenReturn(null);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -182,7 +182,7 @@ public void addMercWithoutRetainerMinorPowerAtBContractSucceeds() {
when(campaign.getFactionCode()).thenReturn("MERC");
when(campaign.getRetainerEmployerCode()).thenReturn(null);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -278,7 +278,7 @@ public void addMercWithoutRetainerEmployerNeutralAtBContractSucceeds() {
when(campaign.getFactionCode()).thenReturn("MERC");
when(campaign.getRetainerEmployerCode()).thenReturn(null);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -374,7 +374,7 @@ public void addMercWithoutRetainerEmployerNeutralAtWarAtBContractSucceeds() {
when(campaign.getFactionCode()).thenReturn("MERC");
when(campaign.getRetainerEmployerCode()).thenReturn(null);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -471,7 +471,7 @@ public void mercEmployerRetries() {
when(campaign.getFactionCode()).thenReturn("MERC");
when(campaign.getRetainerEmployerCode()).thenReturn(null);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -569,7 +569,7 @@ public void mercEmployerRetriesFail() {
when(campaign.getFactionCode()).thenReturn("MERC");
when(campaign.getRetainerEmployerCode()).thenReturn(null);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

Factions factions = mock(Factions.class);
Expand All @@ -592,7 +592,7 @@ public void mercMissiongTargetRetries() {
when(campaign.getFactionCode()).thenReturn("MERC");
when(campaign.getRetainerEmployerCode()).thenReturn(null);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -689,7 +689,7 @@ public void mercMissionTargetRetriesFail() {
when(campaign.getFactionCode()).thenReturn("MERC");
when(campaign.getRetainerEmployerCode()).thenReturn(null);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -780,7 +780,7 @@ public void mercJumpPathRetries() {
when(campaign.getFactionCode()).thenReturn("MERC");
when(campaign.getRetainerEmployerCode()).thenReturn(null);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -877,7 +877,7 @@ public void mercJumpPathFails() {
when(campaign.getFactionCode()).thenReturn("MERC");
when(campaign.getRetainerEmployerCode()).thenReturn(null);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -971,7 +971,7 @@ public void addMercWithRetainerAtBContractSucceeds() {
when(campaign.getFactionCode()).thenReturn("MERC");
when(campaign.getRetainerEmployerCode()).thenReturn(employer);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -1067,7 +1067,7 @@ public void addMercWithRetainerMinorPowerAtBContractSucceeds() {
when(campaign.getFactionCode()).thenReturn("MERC");
when(campaign.getRetainerEmployerCode()).thenReturn(employer);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -1163,7 +1163,7 @@ public void addMercWithRetainerEmployerNeutralAtBContractSucceeds() {
when(campaign.getFactionCode()).thenReturn("MERC");
when(campaign.getRetainerEmployerCode()).thenReturn(employer);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -1259,7 +1259,7 @@ public void addMercWithRetainerEmployerNeutralAtWarAtBContractSucceeds() {
when(campaign.getFactionCode()).thenReturn("MERC");
when(campaign.getRetainerEmployerCode()).thenReturn(employer);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -1355,7 +1355,7 @@ public void nonMercAtBContractSucceeds() {
when(campaign.getFactionCode()).thenReturn(employer);
when(campaign.getRetainerEmployerCode()).thenReturn(null);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -1451,7 +1451,7 @@ public void nonMercMinorPowerAtBContractSucceeds() {
when(campaign.getFactionCode()).thenReturn(employer);
when(campaign.getRetainerEmployerCode()).thenReturn(null);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -1547,7 +1547,7 @@ public void nonMercNeutralAtBContractSucceeds() {
when(campaign.getFactionCode()).thenReturn(employer);
when(campaign.getRetainerEmployerCode()).thenReturn(null);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down Expand Up @@ -1643,7 +1643,7 @@ public void nonMercNeutralAtWarAtBContractSucceeds() {
when(campaign.getFactionCode()).thenReturn(employer);
when(campaign.getRetainerEmployerCode()).thenReturn(null);
when(campaign.getUnitRatingMod()).thenReturn(unitRating);
when(campaign.getLocalDate()).thenReturn(LocalDate.of(gameYear, 1, 1));
when(campaign.getLocalDate()).thenReturn(LocalDate.ofYearDay(gameYear, 1));
when(campaign.getGameYear()).thenReturn(gameYear);

CampaignOptions campaignOptions = mock(CampaignOptions.class);
Expand Down

0 comments on commit 30aeaf1

Please sign in to comment.