Fixed Framework pom - removed fixed src folder. Minor fixes to ManaTest.

This commit is contained in:
LevelX2 2015-12-01 22:43:56 +01:00
parent 595a55b7c5
commit 87fc4d53dc
2 changed files with 2 additions and 42 deletions

View file

@ -39,9 +39,6 @@
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View file

@ -1,11 +1,11 @@
package test.java.mage;
package mage;
import static junit.framework.Assert.assertTrue;
import static junit.framework.TestCase.assertFalse;
import mage.constants.ColoredManaSymbol;
import mage.constants.ManaType;
import mage.filter.FilterMana;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@ -20,7 +20,6 @@ public class ManaTest {
@Rule
public ExpectedException expectedException = ExpectedException.none();
@Test
public void shouldNotAllowNullCopyConstructor() {
// given
@ -32,7 +31,6 @@ public class ManaTest {
new Mana(nullMana);
}
@Test
public void shouldCreateManaFromCopy() {
// given
@ -50,7 +48,6 @@ public class ManaTest {
assertEquals(0, copy.getWhite());
}
@Test
public void shouldCreateManaFromGreenColoredManaSymbol() {
// given
@ -67,7 +64,6 @@ public class ManaTest {
assertEquals(0, mana.getWhite());
}
@Test
public void shouldCreateManaFromRedColoredManaSymbol() {
// given
@ -84,7 +80,6 @@ public class ManaTest {
assertEquals(0, mana.getWhite());
}
@Test
public void shouldCreateManaFromBlackColoredManaSymbol() {
// given
@ -101,7 +96,6 @@ public class ManaTest {
assertEquals(0, mana.getWhite());
}
@Test
public void shouldCreateManaFromBlueColoredManaSymbol() {
// given
@ -118,7 +112,6 @@ public class ManaTest {
assertEquals(0, mana.getWhite());
}
@Test
public void shouldCreateManaFromWhiteColoredManaSymbol() {
// given
@ -135,7 +128,6 @@ public class ManaTest {
assertEquals(1, mana.getWhite());
}
@Test
public void shouldNotCreateManaFromNullColoredManaSymbol() {
// given
@ -148,7 +140,6 @@ public class ManaTest {
new Mana(nullSymbol);
}
@Test
public void shouldCreateManaFromIntegers() {
@ -165,7 +156,6 @@ public class ManaTest {
assertEquals(7, mana.getAny());
}
@Test
public void shouldNotAllowNegativeIntegers() {
// given
@ -177,7 +167,6 @@ public class ManaTest {
assertEquals(0, mana.getRed());
}
@Test
public void shouldCreateRedMana() {
@ -188,7 +177,6 @@ public class ManaTest {
assertEquals(1, mana.getRed());
}
@Test
public void shouldCreateGreenMana() {
@ -199,7 +187,6 @@ public class ManaTest {
assertEquals(1, mana.getGreen());
}
@Test
public void shouldCreateBlueMana() {
@ -210,7 +197,6 @@ public class ManaTest {
assertEquals(1, mana.getBlue());
}
@Test
public void shouldCreateWhiteMana() {
@ -221,7 +207,6 @@ public class ManaTest {
assertEquals(1, mana.getWhite());
}
@Test
public void shouldCreateBlackMana() {
@ -232,7 +217,6 @@ public class ManaTest {
assertEquals(1, mana.getBlack());
}
@Test
public void shouldCreateColorlessMana() {
@ -243,7 +227,6 @@ public class ManaTest {
assertEquals(1, mana.getColorless());
}
@Test
public void shouldNotAllowNegativeRedMana() {
// given
@ -255,7 +238,6 @@ public class ManaTest {
assertEquals(0, mana.getRed());
}
@Test
public void shouldNotAllowNegativeGreenMana() {
// given
@ -267,7 +249,6 @@ public class ManaTest {
assertEquals(0, mana.getGreen());
}
@Test
public void shouldNotAllowNegativeBlueMana() {
// given
@ -279,7 +260,6 @@ public class ManaTest {
assertEquals(0, mana.getBlue());
}
@Test
public void shouldNotAllowNegativeWhiteMana() {
// given
@ -291,7 +271,6 @@ public class ManaTest {
assertEquals(0, mana.getWhite());
}
@Test
public void shouldNotAllowNegativeBlackMana() {
// given
@ -303,7 +282,6 @@ public class ManaTest {
assertEquals(0, mana.getBlack());
}
@Test
public void shouldNotAllowNegativeColorlessMana() {
// given
@ -315,14 +293,12 @@ public class ManaTest {
assertEquals(0, mana.getColorless());
}
@Test
public void shouldAddMana() {
// given
Mana thisMana = new Mana(1, 2, 3, 4, 5, 6, 7);
Mana thatMana = new Mana(1, 2, 3, 4, 5, 6, 7);
// when
thisMana.add(thatMana);
@ -336,7 +312,6 @@ public class ManaTest {
assertEquals(14, thisMana.getAny());
}
@Test
public void shouldIncreaseRedMana() {
// given
@ -349,7 +324,6 @@ public class ManaTest {
assertEquals(1, mana.getRed());
}
@Test
public void shouldIncreaseGreenMana() {
// given
@ -429,7 +403,6 @@ public class ManaTest {
assertEquals(1, thisMana.getAny());
}
@Test
public void shouldSubtractCost() {
// given
@ -449,7 +422,6 @@ public class ManaTest {
assertEquals(1, thisMana.getAny());
}
@Test
public void shouldUseExistingManaToPayColorless() {
// given
@ -467,7 +439,6 @@ public class ManaTest {
assertEquals(1, available.getRed());
}
@Test
public void shouldThrowExceptionOnUnavailableColorless() {
// given
@ -484,7 +455,6 @@ public class ManaTest {
available.subtractCost(cost);
}
@Test
public void shouldReturnCount() {
// given
@ -503,7 +473,6 @@ public class ManaTest {
assertEquals(5, filteredMana);
}
@Test
public void shouldReturnString() {
// given
@ -534,7 +503,6 @@ public class ManaTest {
assertEquals(0, mana.getAny());
}
@Test
public void shouldReturnCopy() {
// given
@ -568,7 +536,6 @@ public class ManaTest {
assertEquals(1, whiteMana);
}
@Test
public void shouldGetColorByManaType() {
// given
@ -591,7 +558,6 @@ public class ManaTest {
assertEquals(1, colorlessMana);
}
@Test
public void shouldSetManaFromType() {
// given
@ -628,7 +594,6 @@ public class ManaTest {
assertFalse(mana == newMana);
}
@Test
public void shouldHaveEqualManaValue() {
// given
@ -642,7 +607,6 @@ public class ManaTest {
assertTrue(equalMana);
}
@Test
public void shouldGetDifferentColors() {
// given
@ -657,7 +621,6 @@ public class ManaTest {
assertEquals(2, colors);
}
@Test
public void shouldNotSetManaLessThanZero() {
// given