External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 21:02:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for pass action in test framework. Updated assert information for assertPT.

Browse source
This commit is contained in:
magenoxx 2012-04-07 11:07:35 +04:00
parent 3348a29b1a
commit e3f27cbc89
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
View file

@ -116,7 +116,7 @@ public class TestPlayer extends ComputerPlayer<TestPlayer> {
}
}
pass();
return true;
return false;
}
@Override

14
Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
View file

@ -284,8 +284,11 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
throws AssertionError {
int count = 0;
int fit = 0;
for (Permanent permanent : currentGame.getBattlefield().getAllActivePermanents(player.getId())) {
if (permanent.getName().equals(cardName)) {
int foundPower = 0;
int foundToughness = 0;
int found = 0;
for (Permanent permanent : currentGame.getBattlefield().getAllPermanents()) {
if (permanent.getName().equals(cardName) && permanent.getControllerId().equals(player.getId())) {
count++;
if (scope.equals(Filter.ComparisonScope.All)) {
Assert.assertEquals("Power is not the same (" + power + " vs. " + permanent.getPower().getValue() + ")",
@ -295,8 +298,11 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
} else if (scope.equals(Filter.ComparisonScope.Any)) {
if (power == permanent.getPower().getValue() && toughness == permanent.getToughness().getValue()) {
fit++;
break;
break;
}
found++;
foundPower = permanent.getPower().getValue();
foundToughness = permanent.getToughness().getValue();
}
}
}
@ -306,7 +312,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
if (scope.equals(Filter.ComparisonScope.Any)) {
Assert.assertTrue("There is no such creature under player's control with specified power&toughness, player=" + player.getName() +
", cardName=" + cardName, fit > 0);
", cardName=" + cardName + " (found similar: " + found + ", one of them: power=" + foundPower + " toughness=" + foundToughness + ")", fit > 0);
}
}