external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

forge-gui-desktop: tests: refactor (rename)

Browse Source 
Affected namespaces:
forge.card
(referenced by forge.deck and forge.gamesimulationtests)
This commit is contained in:
Leandro Doctors
2022-04-17 16:32:52 -03:00
parent bfb210c4ca
commit bb9af66a44
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/test/java/forge/card/CardDbTestCase.java → forge-gui-desktop/src/test/java/forge/card/CardDbCardMockTestCase.java
View File

@@ -14,7 +14,7 @@ import java.util.*;
import static org.testng.Assert.*;
public class CardDbTestCase extends ForgeCardMockTestCase {
public class CardDbCardMockTestCase extends CardMockTestCase {
protected LegacyCardDb legacyCardDb;
protected CardDb cardDb;

2
forge-gui-desktop/src/test/java/forge/card/CardDbTestLazyCardLoading.java → forge-gui-desktop/src/test/java/forge/card/CardDbLazyCardLoadingCardMockTestCase.java
View File

@@ -10,7 +10,7 @@ import org.testng.annotations.Test;
import static org.testng.Assert.*;
public class CardDbTestLazyCardLoading extends ForgeCardMockTestCase {
public class CardDbLazyCardLoadingCardMockTestCase extends CardMockTestCase {
protected CardDb cardDb;

2
forge-gui-desktop/src/test/java/forge/card/CardDbPerformanceTests.java
View File

@@ -10,7 +10,7 @@ import java.util.TreeSet;
import static org.testng.Assert.assertNotNull;
public class CardDbPerformanceTests extends CardDbTestCase {
public class CardDbPerformanceTests extends CardDbCardMockTestCase {
private Set<String> fullDbCardNames = new TreeSet<>();

2
forge-gui-desktop/src/test/java/forge/card/CardDbTestWithNoImage.java → forge-gui-desktop/src/test/java/forge/card/CardDbWithNoImageCardDbMockTestCase.java
View File

@@ -20,7 +20,7 @@ import static org.testng.Assert.assertNotNull;
* Note: Run test for the class, being subclass will also run all
* other tests as regression.
*/
public class CardDbTestWithNoImage extends CardDbTestCase {
public class CardDbWithNoImageCardDbMockTestCase extends CardDbCardMockTestCase {
@Override
@BeforeMethod

2
forge-gui-desktop/src/test/java/forge/card/CardEditionCollectionTestCase.java → forge-gui-desktop/src/test/java/forge/card/CardEditionCollectionCardMockTestCase.java
View File

@@ -10,7 +10,7 @@ import java.util.List;
import static org.testng.Assert.assertEquals;
public class CardEditionCollectionTestCase extends ForgeCardMockTestCase {
public class CardEditionCollectionCardMockTestCase extends CardMockTestCase {
@Test
public void testGetTheLatestOfAllTheOriginalEditionsOfCardsInPoolWithOriginalSets(){

4
forge-gui-desktop/src/test/java/forge/card/ForgeCardMockTestCase.java → forge-gui-desktop/src/test/java/forge/card/CardMockTestCase.java
View File

@@ -35,7 +35,7 @@ import java.util.ResourceBundle;
ForgeConstants.class, Localizer.class})
@SuppressStaticInitializationFor({"forge.ImageCache", "forge.localinstance.properties.ForgeConstants"})
@PowerMockIgnore({"javax.xml.*", "org.xml.sax.*", "com.sun.org.apache.xerces.*", "org.w3c.dom.*", "org.springframework.context.*", "org.apache.log4j.*"})
public class ForgeCardMockTestCase extends PowerMockTestCase {
public class CardMockTestCase extends PowerMockTestCase {
public static final String MOCKED_LOCALISED_STRING = "any localised string";
@@ -73,7 +73,7 @@ public class ForgeCardMockTestCase extends PowerMockTestCase {
Field fAssetsDir = PowerMockito.field(ForgeConstants.class, "ASSETS_DIR");
fAssetsDir.set(ForgeConstants.class, assetDir);
// User Dir
String homeDir = ForgeCardMockTestCase.getUserDir();
String homeDir = CardMockTestCase.getUserDir();
Field fUserDir = PowerMockito.field(ForgeConstants.class, "USER_DIR");
fUserDir.set(ForgeConstants.class, homeDir);
// User Pref Dir

2
forge-gui-desktop/src/test/java/forge/card/CardRequestTestCase.java → forge-gui-desktop/src/test/java/forge/card/CardRequestTest.java
View File

@@ -8,7 +8,7 @@ import org.testng.annotations.Test;
import static org.testng.Assert.*;
@Test(timeOut = 1000, enabled = true)
public class CardRequestTestCase {
public class CardRequestTest {
private String cardName;
private String edition;

18
forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java
View File

@@ -3,7 +3,7 @@ package forge.deck;
import forge.StaticData;
import forge.card.CardDb;
import forge.card.CardEdition;
import forge.card.ForgeCardMockTestCase;
import forge.card.CardMockTestCase;
import forge.card.MagicColor;
import forge.item.IPaperCard;
import forge.item.PaperCard;
@@ -19,7 +19,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
public class DeckRecognizerTest extends ForgeCardMockTestCase {
public class DeckRecognizerTest extends CardMockTestCase {
private Set<String> mtgUniqueCardNames;
private Set<String> mtgUniqueSetCodes;
@@ -348,7 +348,7 @@ public class DeckRecognizerTest extends ForgeCardMockTestCase {
" //Colorless----", "(green)",
"// Multicolor", "// MultiColour"};
String cname = ForgeCardMockTestCase.MOCKED_LOCALISED_STRING;
String cname = CardMockTestCase.MOCKED_LOCALISED_STRING;
String[] expectedTokenText = new String[] {
String.format("%s {U}", cname), String.format("%s {R}", cname),
String.format("%s {W}", cname), String.format("%s {B}", cname),
@@ -377,7 +377,7 @@ public class DeckRecognizerTest extends ForgeCardMockTestCase {
String[] mixedSymbols = new String[] {
"{u} White", "{R}-black", "White {g}", "// {b} Blue", "(green|{r})"
};
String cname = ForgeCardMockTestCase.MOCKED_LOCALISED_STRING;
String cname = CardMockTestCase.MOCKED_LOCALISED_STRING;
String[] expectedTokenText = new String[] {
String.format("%s/%s %s", cname, cname, "{WU}"),
String.format("%s/%s %s", cname, cname, "{BR}"),
@@ -412,7 +412,7 @@ public class DeckRecognizerTest extends ForgeCardMockTestCase {
String[] manaSymbols = new String[] {"{WU}", "{UB}", "{BR}", "{GW}", "{RG}",
"{WB}", "{UR}", "{BG}", "{RW}", "{GU}"};
String cname = ForgeCardMockTestCase.MOCKED_LOCALISED_STRING;
String cname = CardMockTestCase.MOCKED_LOCALISED_STRING;
String[] expectedTokenText = new String[] {
String.format("%s/%s %s", cname, cname, "{WU}"),
String.format("%s/%s %s", cname, cname, "{UB}"),
@@ -470,7 +470,7 @@ public class DeckRecognizerTest extends ForgeCardMockTestCase {
DeckRecognizer recognizer = new DeckRecognizer();
String[] cmcTokens = new String[] {"Blue Colourless", "Red Multicolour", "Colorless White",
"// Multicolour ", "(green|Colourless)"};
String cname = ForgeCardMockTestCase.MOCKED_LOCALISED_STRING;
String cname = CardMockTestCase.MOCKED_LOCALISED_STRING;
String[] expectedTokenText = new String[] {
String.format("%s {U} // %s {C}", cname, cname),
String.format("%s {R} // %s {W}{U}{B}{R}{G}", cname, cname),
@@ -492,7 +492,7 @@ public class DeckRecognizerTest extends ForgeCardMockTestCase {
String[] cmcTokens = new String[] {"Colorless Colourless", "Multicolor Multicolour",
"Colorless colourless"};
String cname = ForgeCardMockTestCase.MOCKED_LOCALISED_STRING;
String cname = CardMockTestCase.MOCKED_LOCALISED_STRING;
String[] expectedTokenText = new String[] {
String.format("%s {C}", cname),
String.format("%s {W}{U}{B}{R}{G}", cname),
@@ -592,13 +592,13 @@ public class DeckRecognizerTest extends ForgeCardMockTestCase {
t = recognizer.recogniseNonCardToken("//Blue");
assertNotNull(t);
assertEquals(t.getType(), TokenType.MANA_COLOUR);
assertEquals(t.getText(), String.format("%s {U}", ForgeCardMockTestCase.MOCKED_LOCALISED_STRING));
assertEquals(t.getText(), String.format("%s {U}", CardMockTestCase.MOCKED_LOCALISED_STRING));
assertEquals(t.getQuantity(), 0);
t = recognizer.recogniseNonCardToken("(Colorless)");
assertNotNull(t);
assertEquals(t.getType(), TokenType.MANA_COLOUR);
assertEquals(t.getText(), String.format("%s {C}", ForgeCardMockTestCase.MOCKED_LOCALISED_STRING));
assertEquals(t.getText(), String.format("%s {C}", CardMockTestCase.MOCKED_LOCALISED_STRING));
assertEquals(t.getQuantity(), 0);
t = recognizer.recogniseNonCardToken("//Planes");

4
forge-gui-desktop/src/test/java/forge/gamesimulationtests/BaseGameSimulationTest.java
View File

@@ -3,7 +3,7 @@ package forge.gamesimulationtests;
import forge.ImageCache;
import forge.ImageKeys;
import forge.Singletons;
import forge.card.ForgeCardMockTestCase;
import forge.card.CardMockTestCase;
import forge.game.GameLogFormatter;
import forge.gamesimulationtests.util.GameWrapper;
import forge.gamesimulationtests.util.player.PlayerSpecification;
@@ -29,7 +29,7 @@ import java.util.ResourceBundle;
ForgeConstants.class, Localizer.class, Sentry.class, GameLogFormatter.class})
@SuppressStaticInitializationFor({"forge.ImageCache", "forge.localinstance.properties.ForgeConstants"})
@PowerMockIgnore({"javax.xml.*", "org.xml.sax.*", "com.sun.org.apache.xerces.*", "org.w3c.dom.*", "org.springframework.context.*", "org.apache.log4j.*"})
public class BaseGameSimulationTest extends ForgeCardMockTestCase {
public class BaseGameSimulationTest extends CardMockTestCase {
@BeforeMethod
@Override