Skip to content

Commit 68010b0

Browse files
authored
Merge branch 'master' into factionStandingContractPay
2 parents c7a79f5 + a7b089e commit 68010b0

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

MekHQ/unittests/mekhq/campaign/universe/factionStanding/FactionStandingsTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import mekhq.campaign.universe.Faction;
5353
import mekhq.campaign.universe.Factions;
5454
import org.junit.jupiter.api.BeforeEach;
55-
import org.junit.jupiter.api.Disabled;
5655
import org.junit.jupiter.api.Test;
5756
import org.junit.jupiter.params.ParameterizedTest;
5857
import org.junit.jupiter.params.provider.Arguments;
@@ -193,7 +192,6 @@ private static Stream<Arguments> provideContractAcceptCases() {
193192
5.0, REGARD_DELTA_CONTRACT_ACCEPT_ENEMY_CLAN, REGARD_DELTA_CONTRACT_ACCEPT_ENEMY_ALLY_NORMAL));
194193
}
195194

196-
@Disabled
197195
@ParameterizedTest(name = "{0}")
198196
@MethodSource(value = "provideContractAcceptCases")
199197
void test_processAcceptContract_various(String testName, String primaryFaction, double primaryStart,

0 commit comments

Comments
 (0)