github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-16 17:00:13 -09:00
Code Issues Projects Releases Packages Wiki Activity

added unit test

Browse source
This commit is contained in:
ingmargoudt 2017-03-03 22:28:34 +01:00
parent a0930e3379
commit 6b20d352ca
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java
View file

@ -177,7 +177,7 @@ public class TableModel extends AbstractTableModel implements ICardGrid {
String key1 = cv.getName() + cv.getExpansionSetCode() + cv.getCardNumber(); String key1 = cv.getName() + cv.getExpansionSetCode() + cv.getCardNumber();
for (CardView cardView : cards.values()) { for (CardView cardView : cards.values()) {
String key2 = cardView.getName() + cardView.getExpansionSetCode() + cardView.getCardNumber(); String key2 = cardView.getName() + cardView.getExpansionSetCode() + cardView.getCardNumber();
if ((key1).equals(key2)) { if (key1.equals(key2)) {
view.set(j, cardView); view.set(j, cardView);
break; break;
} }

27
Mage.Client/src/test/java/mage/client/util/CardHelperTest.java Normal file
View file

@ -0,0 +1,27 @@
package mage.client.util;
import mage.client.deckeditor.table.CardHelper;
import mage.constants.CardType;
import mage.view.CardView;
import org.junit.Assert;
import org.junit.Test;
import static org.hamcrest.core.Is.is;
/**
* Created by IGOUDT on 3-3-2017.
*/
public class CardHelperTest {
@Test
public void testCardTypeOrder() {
CardView v = new CardView(true);
v.getCardTypes().add(CardType.CREATURE);
v.getCardTypes().add(CardType.ARTIFACT);
String cardtypeText = CardHelper.getType(v);
Assert.assertThat(cardtypeText, is("Artifact Creature"));
}
}