ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code reformat

Browse Source 
Reformatted new unit tests to follow existing java style.  Fleshed out existing helper functions to have shadow variants where any freeps variants existed.
This commit is contained in:
Christian 'ketura' McCarty
2021-01-26 01:11:02 -06:00
parent 2a08b6c063
commit 167ff78801
2 changed files with 57 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTest.java
View File

@@ -24,19 +24,15 @@ public class GenericCardTest extends AbstractAtTest {
LastCardID = 100;
if(freepsIDs != null)
{
for(String name : freepsIDs.keySet())
{
if(freepsIDs != null) {
for(String name : freepsIDs.keySet()) {
String id = freepsIDs.get(name);
freepsCards.put(name, CreateCard(P1, id));
}
}
if(shadowIDs != null)
{
for(String name : shadowIDs.keySet())
{
if(shadowIDs != null) {
for(String name : shadowIDs.keySet()) {
String id = shadowIDs.get(name);
shadowCards.put(name, CreateCard(P2, id));
}
@@ -44,21 +40,17 @@ public class GenericCardTest extends AbstractAtTest {
Map<String, Collection<String>> deckCards = new HashMap<String, Collection<String>>();
if(freepsdeck == null)
{
if(freepsdeck == null) {
deckCards.put(P1, new ArrayList<String>());
}
else
{
else {
deckCards.put(P1, freepsdeck);
}
if(shadowdeck == null)
{
if(shadowdeck == null) {
deckCards.put(P2, new ArrayList<String>());
}
else
{
else {
deckCards.put(P2, shadowdeck);
}
@@ -69,8 +61,7 @@ public class GenericCardTest extends AbstractAtTest {
return new PhysicalCardImpl(LastCardID++, cardID, playerID, _library.getLotroCardBlueprint(cardID));
}
public void Setup(Map<String, Collection<String>> deckCards) throws DecisionResultInvalidException
{
public void Setup(Map<String, Collection<String>> deckCards) throws DecisionResultInvalidException {
initializeSimplestGame(deckCards);
}
@@ -78,10 +69,12 @@ public class GenericCardTest extends AbstractAtTest {
skipMulligans();
}
public PhysicalCardImpl GetFreepsCard(String cardName) { return freepsCards.get(cardName); }
public PhysicalCardImpl GetShadowCard(String cardName) { return shadowCards.get(cardName); }
public List<String> FreepsGetAvailableActions() { return GetAvailableActions(P1); }
public List<String> ShadowGetAvailableActions() { return GetAvailableActions(P2); }
public List<String> GetAvailableActions(String playerID)
{
public List<String> GetAvailableActions(String playerID) {
AwaitingDecision decision = _userFeedback.getAwaitingDecision(playerID);
return Arrays.asList((String[])decision.getDecisionParameters().get("actionText"));
}
@@ -90,84 +83,66 @@ public class GenericCardTest extends AbstractAtTest {
public AwaitingDecision ShadowGetAwaitingDecision() { return GetAwaitingDecision(P2); }
public AwaitingDecision GetAwaitingDecision(String playerID) { return _userFeedback.getAwaitingDecision(playerID); }
public void FreepsUseAction(String name) throws DecisionResultInvalidException {
playerDecided(P1, getCardActionId(P1, name));
}
public void FreepsUseAction(String name) throws DecisionResultInvalidException { playerDecided(P1, getCardActionId(P1, name)); }
public void ShadowUseAction(String name) throws DecisionResultInvalidException { playerDecided(P2, getCardActionId(P2, name)); }
public int FreepsGetWoundsOn(String cardName)
{
return GetWoundsOn(freepsCards.get(cardName));
}
public int ShadowGetWoundsOn(String cardName)
{
return GetWoundsOn(shadowCards.get(cardName));
}
public int GetWoundsOn(PhysicalCardImpl card)
{
return _game.getGameState().getWounds(card);
}
public int FreepsGetWoundsOn(String cardName) { return GetWoundsOn(GetFreepsCard(cardName)); }
public int ShadowGetWoundsOn(String cardName) { return GetWoundsOn(GetShadowCard(cardName)); }
public int GetWoundsOn(PhysicalCardImpl card) { return _game.getGameState().getWounds(card); }
public int GetFreepsHandCount() { return GetPlayerHandCount(P1); }
public int GetShadowHandCount() { return GetPlayerHandCount(P2); }
public int GetPlayerHandCount(String player)
{
return _game.getGameState().getHand(player).size();
}
public int GetFreepsDeckCount() { return GetPlayerDeckCount(P1); }
public int GetShadowDeckCount() { return GetPlayerDeckCount(P2); }
public int GetPlayerDeckCount(String player)
{
return _game.getGameState().getDeck(player).size();
}
public Phase GetCurrentPhase()
{
return _game.getGameState().getCurrentPhase();
}
public Phase GetCurrentPhase() { return _game.getGameState().getCurrentPhase(); }
public Boolean FreepsActionAvailable(String action)
{
return ActionAvailable(P1, action);
}
public Boolean ActionAvailable(String player, String action)
{
public Boolean FreepsActionAvailable(String action) { return ActionAvailable(P1, action); }
public Boolean ShadowActionAvailable(String action) { return ActionAvailable(P2, action); }
public Boolean ActionAvailable(String player, String action) {
List<String> actions = GetAvailableActions(player);
return actions.stream().anyMatch(x -> x.startsWith(action));
}
public void SetTwilight(int amount)
{
_game.getGameState().setTwilight(amount);
}
public void FreepsMoveCardToHand(String cardName) { MoveCardToZone(P1, freepsCards.get(cardName), Zone.HAND); }
public void FreepsMoveCardToHand(String cardName) { MoveCardToZone(P1, GetFreepsCard(cardName), Zone.HAND); }
public void FreepsMoveCardToHand(PhysicalCardImpl card) { MoveCardToZone(P1, card, Zone.HAND); }
public void ShadowMoveCardToHand(String cardName) { MoveCardToZone(P2, GetShadowCard(cardName), Zone.HAND); }
public void ShadowMoveCardToHand(PhysicalCardImpl card) { MoveCardToZone(P2, card, Zone.HAND); }
public void FreepsMoveCardToDeck(String cardName) { MoveCardToZone(P1, freepsCards.get(cardName), Zone.DECK); }
public void FreepsMoveCardToDeck(String cardName) { MoveCardToZone(P1, GetFreepsCard(cardName), Zone.DECK); }
public void FreepsMoveCardToDeck(PhysicalCardImpl card) { MoveCardToZone(P1, card, Zone.DECK); }
public void ShadowMoveCardToDeck(String cardName) { MoveCardToZone(P2, GetShadowCard(cardName), Zone.DECK); }
public void ShadowMoveCardToDeck(PhysicalCardImpl card) { MoveCardToZone(P2, card, Zone.DECK); }
public void FreepsMoveCharToTable(String cardName) { MoveCardToZone(P1, freepsCards.get(cardName), Zone.FREE_CHARACTERS); }
public void FreepsMoveCharToTable(String cardName) { MoveCardToZone(P1, GetFreepsCard(cardName), Zone.FREE_CHARACTERS); }
public void FreepsMoveCharToTable(PhysicalCardImpl card)
{
MoveCardToZone(P1, card, Zone.FREE_CHARACTERS);
}
public void FreepsMove(String cardID, Zone zone)
public void ShadowMoveCharToTable(String cardName) { MoveCardToZone(P2, GetShadowCard(cardName), Zone.SHADOW_CHARACTERS); }
public void ShadowMoveCharToTable(PhysicalCardImpl card)
{
MoveCardToZone(P1, freepsCards.get(cardID), zone);
}
public void ShadowMove(String cardID, Zone zone)
{
MoveCardToZone(P2, shadowCards.get(cardID), zone);
MoveCardToZone(P2, card, Zone.SHADOW_CHARACTERS);
}
public void MoveCardToZone(String player, PhysicalCardImpl card, Zone zone)
public void FreepsMoveCardToZone(String cardID, Zone zone)
{
MoveCardToZone(P1, GetFreepsCard(cardID), zone);
}
public void ShadowMoveCardToZone(String cardID, Zone zone)
{
MoveCardToZone(P2, GetShadowCard(cardID), zone);
}
public void MoveCardToZone(String player, PhysicalCardImpl card, Zone zone) {
_game.getGameState().addCardToZone(_game, card, zone);
}
@@ -175,49 +150,35 @@ public class GenericCardTest extends AbstractAtTest {
public List<String> ShadowGetADParamAsList(String paramName) { return Arrays.asList((String[])GetAwaitingDecisionParam(P2, paramName)); }
public Object FreepsGetADParam(String paramName) { return GetAwaitingDecisionParam(P1, paramName); }
public Object ShadowGetADParam(String paramName) { return GetAwaitingDecisionParam(P2, paramName); }
public Object GetAwaitingDecisionParam(String playerID, String paramName)
{
public Object GetAwaitingDecisionParam(String playerID, String paramName) {
AwaitingDecision decision = _userFeedback.getAwaitingDecision(P1);
return decision.getDecisionParameters().get(paramName);
}
public Map<String, Object> GetAwaitingDecisionParams(String playerID)
{
public Map<String, Object> GetAwaitingDecisionParams(String playerID) {
AwaitingDecision decision = _userFeedback.getAwaitingDecision(P1);
return decision.getDecisionParameters();
}
public void FreepsPlayCharFromHand(String cardName) throws DecisionResultInvalidException
{
PhysicalCardImpl card = freepsCards.get(cardName);
public void FreepsPlayCharFromHand(String cardName) throws DecisionResultInvalidException {
PhysicalCardImpl card = GetFreepsCard(cardName);
List<String> availableIds = FreepsGetADParamAsList("cardId");
Integer index = availableIds.indexOf(String.valueOf(card.getCardId()));
playerDecided(P1, index.toString());
}
public void FreepsAddWoundsToChar(String cardName, int count)
{
AddWoundsToChar(freepsCards.get(cardName), count);
}
public void AddWoundsToChar(PhysicalCardImpl card, int count)
{
public void FreepsAddWoundsToChar(String cardName, int count) { AddWoundsToChar(GetFreepsCard(cardName), count); }
public void ShadowAddWoundsToChar(String cardName, int count) { AddWoundsToChar(GetShadowCard(cardName), count); }
public void AddWoundsToChar(PhysicalCardImpl card, int count) {
for(int i = 0; i < count; i++)
{
AddWoundToChar(card);
}
}
public void AddWoundToChar(PhysicalCardImpl card) { _game.getGameState().addWound(card); }
public void AddWoundToChar(PhysicalCardImpl card)
{
_game.getGameState().addWound(card);
}
public void SkipToNextFreepsTurn()
{
}
public void SetTwilight(int amount) { _game.getGameState().setTwilight(amount); }
}

17
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/Elrond_LoRErrataTest.java
View File

@@ -58,11 +58,10 @@ public class Elrond_LoRErrataTest
}
@Test
public void FellowshipActionExertsTwiceToDrawACard() throws DecisionResultInvalidException, CardNotFoundException
{
public void FellowshipActionExertsTwiceToDrawACard() throws DecisionResultInvalidException, CardNotFoundException {
//Pre-game setup
GenericCardTest scenario = GetSimpleDeckScenario();
PhysicalCardImpl elrond = scenario.freepsCards.get("elrond");
PhysicalCardImpl elrond = scenario.GetFreepsCard("elrond");
scenario.FreepsMoveCharToTable(elrond);
scenario.StartGame();
@@ -79,14 +78,12 @@ public class Elrond_LoRErrataTest
scenario.FreepsUseAction("Use Elrond");
Assert.assertEquals(2, scenario.GetWoundsOn(elrond));
Assert.assertEquals(0, scenario.GetFreepsDeckCount());
Assert.assertEquals(1, scenario.GetFreepsHandCount());
Assert.assertEquals(0, scenario.GetFreepsDeckCount());
}
@Test
public void CardCanPlayIfGandalfInPlay() throws DecisionResultInvalidException, CardNotFoundException
{
public void CardCanPlayIfGandalfInPlay() throws DecisionResultInvalidException, CardNotFoundException {
//Pre-game setup
GenericCardTest scenario = GetSimpleSpotScenario();
scenario.FreepsMoveCardToHand("elrond");
@@ -102,8 +99,7 @@ public class Elrond_LoRErrataTest
}
@Test
public void CardCanPlayIfElfInPlay() throws DecisionResultInvalidException, CardNotFoundException
{
public void CardCanPlayIfElfInPlay() throws DecisionResultInvalidException, CardNotFoundException {
//Pre-game setup
GenericCardTest scenario = GetSimpleSpotScenario();
scenario.FreepsMoveCardToHand("elrond");
@@ -119,8 +115,7 @@ public class Elrond_LoRErrataTest
}
@Test
public void AllyHealsCappedAt2() throws DecisionResultInvalidException, CardNotFoundException
{
public void AllyHealsCappedAt2() throws DecisionResultInvalidException, CardNotFoundException {
//Pre-game setup
GenericCardTest scenario = GetHome3AllyScenario();
scenario.FreepsMoveCharToTable("elrond");