dergeorg/SWE1-MTCG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Funktionen Implementiert, Tests angepasst, Java Doc added

Browse Source
This commit is contained in:
Georg Reisinger
2020-10-18 12:35:58 +02:00
parent 061a978f6c
commit 95873d7e6d
23 changed files with 810 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/test/java/CardTest.java
View File

@@ -7,47 +7,48 @@ public class CardTest {
@Test
public void test_getName() {
Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
assertTrue(card.getName() != "");
assertTrue(card.getName().equals("Name"));
}
@Test
public void test_getDamage() {
Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
assertTrue(card.getDamage() >= 0);
assertTrue(card.getDamage() == 10);
}
@Test
public void test_getElementType() {
Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
ElementTyp elementTyp = card.getElementTyp();
assertTrue(elementTyp != null);
assertTrue(elementTyp != ElementTyp.WATER);
}
@Test
public void test_getCardType() {
Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
CardType cardType = card.getCardType();
assertTrue(cardType != null);
assertTrue(cardType != CardType.SPELL);
}
@Test
public void test_getEffectivenessAgainst() {
Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
EffectivnessType effectivnessType = card.getEffectivenessAgainst();
assertTrue(effectivnessType != null);
Card card = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
Card card2 = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
EffectivnessType effectivnessType = card.getEffectivenessAgainst(card2);
assertTrue(effectivnessType != EffectivnessType.NOEFFECT);
}
@Test
public void test_setName() {
Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
boolean result = card.setName("NeuerName");
assertTrue(result);
card.setName("NeuerName");
assertTrue(card.getName().equals("NeuerName"));
}
@Test
public void test_setDamage() {
Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
boolean result = card.setDamage(100);
assertTrue(result);
card.setDamage(100);
assertTrue(card.getDamage() == 100);
}
@Test
public void test_setElementTyp() {
Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
boolean result = card.setElementType(ElementTyp.WATER);
assertTrue(result);
card.setElementType(ElementTyp.FIRE);
assertTrue(card.getElementTyp() == ElementTyp.FIRE);
}
}

28
src/test/java/CardsTest.java
View File

@@ -5,34 +5,40 @@ import java.util.ArrayList;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class CardsTest {
public Card newCard, card;
public Cards cards;
public ArrayList<Card> cardsArrayList;
private Cards newCards, cards, nochNewCards;
private Card newCard, card;
private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;
private Stack stack;
@BeforeEach
void setUp() {
card = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
newCard = new Card("NameNew", 10, ElementTyp.WATER, CardType.SPELL);
cardsArrayList = new ArrayList<Card>();
cardsArrayList2 = new ArrayList<Card>();
cardsArrayList3 = new ArrayList<Card>();
cardsArrayList.add(card);
cardsArrayList2.add(newCard);
cardsArrayList2.add(card);
cards = new Cards(cardsArrayList);
newCards = new Cards(cardsArrayList2);
nochNewCards = new Cards(cardsArrayList3);
stack = new Stack(cards, nochNewCards);
}
@Test
void test_addCard() {
ArrayList<Card> result = cards.getCards();
cards.addCard(newCard);
cardsArrayList.add(newCard);
assertTrue(result == cardsArrayList);
assertTrue(cards.getCards().equals(cardsArrayList2));
}
@Test
void test_delCard() {
boolean result = cards.delCard(newCard);
assertTrue(result);
cards.addCard(newCard);
cards.delCard(newCard);
assertTrue(cards.getCards().equals(cardsArrayList));
}
@Test
void test_getCards() {
ArrayList<Card> result = cards.getCards();
assertTrue(result == cardsArrayList);
assertTrue(cards.getCards().equals(cardsArrayList));
}
}

16
src/test/java/CoinsTest.java
View File

@@ -19,7 +19,7 @@ public class CoinsTest {
coin.addCoin(-10);
fail("Erwartet NegativAmountException - addCoin");
}catch (NegativAmountException negativAmountException) {
assertTrue(negativAmountException.getMessage()=="negativAmountException");
assertTrue(negativAmountException.getMessage().equals("Es kann kein negativer amount an Coins hinzugefügt werden"));
}
}
@@ -30,7 +30,7 @@ public class CoinsTest {
coin.removeCoin(-10);
fail("Erwartet NegativAmountException - removeCoin");
}catch (NegativAmountException negativAmountException) {
assertTrue(negativAmountException.getMessage()=="negativAmountException");
assertTrue(negativAmountException.getMessage().equals("Es kann kein negativer amount an Coins hinzugefügt werden"));
}
}
@@ -47,12 +47,20 @@ public class CoinsTest {
@Test
public void test_changeCoinAmount_true(){
Coins coin = new Coins(10);
assertTrue(coin.changeCoinAmmount(-10));
try {
assertTrue(coin.changeCoinAmmount(10));
} catch (NegativAmountException e) {
e.printStackTrace();
}
}
@Test
public void test_changeCoinAmount_false(){
Coins coin = new Coins(9);
assertFalse(coin.changeCoinAmmount(-10));
try {
assertTrue(coin.changeCoinAmmount(7));
} catch (NegativAmountException e) {
e.printStackTrace();
}
}
}

6
src/test/java/PackageTest.java
View File

@@ -23,13 +23,13 @@ public class PackageTest {
cards = new Cards(cardsArrayList);
newCards = new Cards(cardsArrayList2);
nochNewCards = new Cards(cardsArrayList3);
myPackage = new Package(cards, nochNewCards, "Name", 100);
myPackage = new Package(cards,"Name", 100);
}
@Test
void test_getName() {
String result = myPackage.getName();
assertTrue(result=="Name");
assertTrue(result.equals("Name"));
}
@Test
@@ -42,6 +42,6 @@ public class PackageTest {
void test_setName() {
myPackage.setName("neuName");
String result = myPackage.getName();
assertTrue(result=="neuName");
assertTrue(result.equals("neuName"));
}
}

18
src/test/java/SimpleCardTest.java
View File

@@ -1,18 +0,0 @@
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import static org.mockito.Mockito.mock;
public class SimpleCardTest {
@Test
@DisplayName("Test - getName()")
public void test_getName(){
//arrange
Card mockedA = mock(Card.class); //Erstellt einen Mock
String name = "Neuer Name";
//act
//assert
}
}

11
src/test/java/StackTest.java
View File

@@ -11,6 +11,7 @@ public class StackTest {
private Card newCard, card;
private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;
private Stack stack;
@BeforeEach
void setUp() {
card = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
@@ -20,6 +21,7 @@ public class StackTest {
cardsArrayList3 = new ArrayList<Card>();
cardsArrayList.add(card);
cardsArrayList2.add(newCard);
cardsArrayList2.add(card);
cards = new Cards(cardsArrayList);
newCards = new Cards(cardsArrayList2);
nochNewCards = new Cards(cardsArrayList3);
@@ -29,16 +31,17 @@ public class StackTest {
void test_addDeck() {
stack.addDeck(newCards);
Cards result = stack.getDeck();
assertTrue(result == newCards);
assertTrue(result.equals(newCards));
}
@Test
void test_delDeck() {
boolean result = stack.delDeck(cards);
assertTrue(result);
stack.addDeck(newCards);
stack.delDeck(newCard);
assertTrue(stack.getDeck().equals(cards));
}
@Test
void test_getDeck() {
Cards result = stack.getDeck();
assertTrue(result == cards);
assertTrue(result.equals(cards));
}
}

66
src/test/java/StoreTest.java
View File

@@ -33,7 +33,7 @@ public class StoreTest {
//Coins
Coins coins = new Coins(10);
//User
Credentials credentials = new Credentials();
Credentials credentials = new Credentials("username", "passwort");
user = new User(credentials, "name", "nachname", "email", stack, coins);
userNew = new User(credentials, "nameNew", "nachnameNew", "emailNew", stack, coins);
@@ -51,32 +51,70 @@ public class StoreTest {
user.addTradingDeal(tradingDeal);
ArrayList<TradingDeal> expected = new ArrayList<TradingDeal>();
expected.add(tradingDeal);
assertTrue(user.getTradingDeals() == expected);
Card c1 = new Card("Name", 10, ElementTyp.FIRE, CardType.MONSTER);
Card c2 = new Card("Name1", 12, ElementTyp.FIRE, CardType.SPELL);
Card c3 = new Card("Name2", 13, ElementTyp.WATER, CardType.MONSTER);
Card c4 = new Card("Name3", 14, ElementTyp.WATER, CardType.SPELL);
Card c5 = new Card("Name4", 15, ElementTyp.FIRE, CardType.MONSTER);
Cards deck = new Cards();
Cards stack = new Cards();
deck.addCard(c1);
deck.addCard(c2);
stack.addCard(c3);
stack.addCard(c4);
stack.addCard(c5);
TradingDeal vonDB = new TradingDeal(new User(new Credentials("username", "passwort"), "Name", "Nachname", "Email", new Stack(stack, deck), new Coins(1000)), c1, ElementTyp.FIRE, 10, CardType.SPELL);
expected.add(vonDB);
assertTrue(user.getTradingDeals().equals(expected));
}
@Test
void test_doTrade() {
boolean result = user.doTrading(tradingDeal, tradingDeal);
Card cardtest = new Card("Name", 10, ElementTyp.FIRE, CardType.MONSTER);
TradingDeal tradingDealtest = new TradingDeal(user, cardtest, ElementTyp.WATER, 100, CardType.MONSTER);
boolean result = user.doTrading(tradingDeal, tradingDealtest);
assertTrue(result);
}
@Test
void test_getTradingDeals() {
ArrayList<TradingDeal> result = user.getTradingDeals();
ArrayList<TradingDeal> expected = new ArrayList<TradingDeal>();
Card c1 = new Card("Name", 10, ElementTyp.FIRE, CardType.MONSTER);
Card c2 = new Card("Name1", 12, ElementTyp.FIRE, CardType.SPELL);
Card c3 = new Card("Name2", 13, ElementTyp.WATER, CardType.MONSTER);
Card c4 = new Card("Name3", 14, ElementTyp.WATER, CardType.SPELL);
Card c5 = new Card("Name4", 15, ElementTyp.FIRE, CardType.MONSTER);
Cards deck = new Cards();
Cards stack = new Cards();
deck.addCard(c1);
deck.addCard(c2);
stack.addCard(c3);
stack.addCard(c4);
stack.addCard(c5);
TradingDeal vonDB = new TradingDeal(new User(new Credentials("username", "passwort"), "Name", "Nachname", "Email", new Stack(stack, deck), new Coins(1000)), c1, ElementTyp.FIRE, 10, CardType.SPELL);
expected.add(vonDB);
expected.add(tradingDeal);
assertTrue(result == expected);
assertTrue(result.equals(expected));
}
@Test
void test_getPossibleTradingDeals() {
ArrayList<TradingDeal> result = user.getPossibleTradingDeals();
Card testCard = new Card("Test", 15, ElementTyp.FIRE, CardType.SPELL);
ArrayList<TradingDeal> result = user.getPossibleTradingDeals(testCard);
ArrayList<TradingDeal> expected = new ArrayList<TradingDeal>();
expected.add(tradingDeal);
assertTrue(result == expected);
}
@Test
void test_getAvailableTradingDeals() {
ArrayList<TradingDeal> result = user.getPossibleAvailableTradingDeals();
ArrayList<TradingDeal> expected = new ArrayList<TradingDeal>();
expected.add(tradingDeal);
assertTrue(result == expected);
Card c1 = new Card("Name", 10, ElementTyp.FIRE, CardType.MONSTER);
Card c2 = new Card("Name1", 12, ElementTyp.FIRE, CardType.SPELL);
Card c3 = new Card("Name2", 13, ElementTyp.WATER, CardType.MONSTER);
Card c4 = new Card("Name3", 14, ElementTyp.WATER, CardType.SPELL);
Card c5 = new Card("Name4", 15, ElementTyp.FIRE, CardType.MONSTER);
Cards deck = new Cards();
Cards stack = new Cards();
deck.addCard(c1);
deck.addCard(c2);
stack.addCard(c3);
stack.addCard(c4);
stack.addCard(c5);
TradingDeal vonDB = new TradingDeal(new User(new Credentials("username", "passwort"), "Name", "Nachname", "Email", new Stack(stack, deck), new Coins(1000)), c1, ElementTyp.FIRE, 10, CardType.SPELL);
expected.add(vonDB);
assertTrue(result.equals(expected));
}
}

15
src/test/java/TradingDealTest.java
View File

@@ -33,9 +33,10 @@ public class TradingDealTest {
//Coins
Coins coins = new Coins(10);
//User
Credentials credentials = new Credentials();
Credentials credentials = new Credentials("username", "passwort");
Credentials newCredentials = new Credentials("usernamenew", "passwortnew");
user = new User(credentials, "name", "nachname", "email", stack, coins);
userNew = new User(credentials, "nameNew", "nachnameNew", "emailNew", stack, coins);
userNew = new User(newCredentials, "nameNew", "nachnameNew", "emailNew", stack, coins);
//Trading Deal
Card cardToTrade = card;
@@ -48,12 +49,12 @@ public class TradingDealTest {
@Test
void test_getTradingUser() {
User result = tradingDeal.getTradingUser();
assertTrue(result==user);
assertTrue(result.equals(user));
}
@Test
void test_getCardToTrade() {
Card result = tradingDeal.getCardToTrade();
assertTrue(result==card);
assertTrue(result.equals(card));
}
@Test
void test_getRequiredElementType() {
@@ -62,7 +63,7 @@ public class TradingDealTest {
}
@Test
void test_getRequiredMinDamage() {
int result = tradingDeal.getRequiredMinDamage();
double result = tradingDeal.getRequiredMinDamage();
assertTrue(result==100);
}
@Test
@@ -75,7 +76,7 @@ public class TradingDealTest {
void test_setTradingUser() {
tradingDeal.setTradingUser(userNew);
User result = tradingDeal.getTradingUser();
assertTrue(result==userNew);
assertTrue(result.equals(userNew));
}
@Test
void test_setCardToTrade() {
@@ -92,7 +93,7 @@ public class TradingDealTest {
@Test
void test_setRequiredMinDamage() {
tradingDeal.setRequiredMinDamage(10);
int result = tradingDeal.getRequiredMinDamage();
double result = tradingDeal.getRequiredMinDamage();
assertTrue(result==10);
}
@Test

28
src/test/java/UserTest.java
View File

@@ -30,51 +30,59 @@ public class UserTest {
nochNewCards = new Cards(cardsArrayList3);
stack = new Stack(cards, nochNewCards);
//Package
myPackage = new Package(cards, nochNewCards, "Name", 100);
myPackage = new Package(cards, "Name", 100);
//Coins
Coins coins = new Coins(10);
//User
Credentials credentials = new Credentials();
Credentials credentials = new Credentials("username", "pw");
user = new User(credentials, "name", "nachname", "email", stack, coins);
}
@Test
public void test_getName() {
String result = user.getName();
assertTrue(result != "");
assertTrue(result != "name");
}
@Test
public void test_getNachname() {
String result = user.getNachname();
assertTrue(result != "");
assertTrue(result != "nachname");
}
@Test
public void test_getEmail() {
String result = user.getEmail();
assertTrue(result != "");
assertTrue(result != "email");
}
@Test
public void test_setName() {
String newstring = "new";
String result = user.setName(newstring);
user.setName(newstring);
String result = user.getName();
assertTrue(result != newstring);
}
@Test
public void test_setNachname() {
String newstring = "new";
String result = user.setNachname(newstring);
user.setNachname(newstring);
String result = user.getNachname();
assertTrue(result != newstring);
}
@Test
public void test_setEmail() {
String newstring = "new";
String result = user.setEmail(newstring);
user.setEmail(newstring);
String result = user.getEmail();
assertTrue(result != newstring);
}
@Test
public void test_buyPackage(){
Cards cards = user.buyPackage(myPackage);
assertTrue(cards != null);
Cards cards = null;
try {
cards = new Cards(user.buyPackage(myPackage));
} catch (NegativAmountException e) {
e.printStackTrace();
}
assertTrue(cards.equals(new Cards(myPackage.getCards())));
}
}