JUnit verbessert
This commit is contained in:
		@@ -18,20 +18,20 @@ public class CardTest {
 | 
			
		||||
    public void test_getElementType() {
 | 
			
		||||
        Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
 | 
			
		||||
        ElementTyp elementTyp = card.getElementTyp();
 | 
			
		||||
        assertTrue(elementTyp != ElementTyp.WATER);
 | 
			
		||||
        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 != CardType.SPELL);
 | 
			
		||||
        assertTrue(cardType == CardType.SPELL);
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_getEffectivenessAgainst() {
 | 
			
		||||
        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);
 | 
			
		||||
        assertTrue(effectivnessType == EffectivnessType.NOEFFECT);
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_setName() {
 | 
			
		||||
 
 | 
			
		||||
@@ -2,38 +2,66 @@ import org.junit.jupiter.api.BeforeEach;
 | 
			
		||||
import org.junit.jupiter.api.Test;
 | 
			
		||||
import java.util.ArrayList;
 | 
			
		||||
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.assertFalse;
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.assertTrue;
 | 
			
		||||
 | 
			
		||||
public class CardsTest {
 | 
			
		||||
    private Cards newCards, cards, nochNewCards;
 | 
			
		||||
    private Card newCard, card;
 | 
			
		||||
    private Cards  cards, cards2, cards3;
 | 
			
		||||
    private Card newCard, card, newerCard;
 | 
			
		||||
    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);
 | 
			
		||||
        newerCard = new Card("NameNewerer", 100, ElementTyp.FIRE, CardType.MONSTER);
 | 
			
		||||
        cardsArrayList = new ArrayList<Card>();
 | 
			
		||||
        cardsArrayList2 = new ArrayList<Card>();
 | 
			
		||||
        cardsArrayList3 = new ArrayList<Card>();
 | 
			
		||||
        cardsArrayList.add(card);
 | 
			
		||||
        cardsArrayList2.add(newCard);
 | 
			
		||||
        cardsArrayList2.add(card);
 | 
			
		||||
        cardsArrayList3.add(newerCard);
 | 
			
		||||
        cards = new Cards(cardsArrayList);
 | 
			
		||||
        newCards = new Cards(cardsArrayList2);
 | 
			
		||||
        nochNewCards = new Cards(cardsArrayList3);
 | 
			
		||||
        stack = new Stack(cards, nochNewCards);
 | 
			
		||||
        cards2 = new Cards(cardsArrayList2);
 | 
			
		||||
        cards3 = new Cards(cardsArrayList3);
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_addCard() {
 | 
			
		||||
        System.out.println(cards.getCards().toString());
 | 
			
		||||
        cards.addCard(newCard);
 | 
			
		||||
        assertTrue(cards.getCards().equals(cardsArrayList2));
 | 
			
		||||
        System.out.println(cards.getCards().toString());
 | 
			
		||||
        System.out.println(cards2.getCards().toString());
 | 
			
		||||
        assertTrue(cards.equals(cards2));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_addCard2() {
 | 
			
		||||
        cards.addCard(newCard);
 | 
			
		||||
        assertFalse(cards.equals(cards3));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_equals() {
 | 
			
		||||
        assertFalse(cards.equals(cards2));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_contains() {
 | 
			
		||||
        assertTrue(cards2.containsCard(card));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_contains2() {
 | 
			
		||||
        assertFalse(cards.containsCard(newCard));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_delCard() {
 | 
			
		||||
        cards.addCard(newCard);
 | 
			
		||||
 | 
			
		||||
        cards.delCard(newCard);
 | 
			
		||||
 | 
			
		||||
        assertTrue(cards.getCards().equals(cardsArrayList));
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
 
 | 
			
		||||
@@ -42,6 +42,6 @@ public class StackTest {
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_getDeck() {
 | 
			
		||||
        Cards result = stack.getDeck();
 | 
			
		||||
        assertTrue(result.equals(cards));
 | 
			
		||||
        assertTrue(result.equals(nochNewCards));
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -18,7 +18,7 @@ public class StoreTest {
 | 
			
		||||
    @BeforeEach
 | 
			
		||||
    void setUp() {
 | 
			
		||||
        //Stack
 | 
			
		||||
        card = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
 | 
			
		||||
        card = new Card("Name", 100, ElementTyp.WATER, CardType.MONSTER);
 | 
			
		||||
        newCard = new Card("NameNew", 10, ElementTyp.WATER, CardType.SPELL);
 | 
			
		||||
        cardsArrayList = new ArrayList<Card>();
 | 
			
		||||
        cardsArrayList2 = new ArrayList<Card>();
 | 
			
		||||
@@ -48,28 +48,41 @@ public class StoreTest {
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_addTradingDeal() {
 | 
			
		||||
        user.addTradingDeal(tradingDeal);
 | 
			
		||||
        ArrayList<TradingDeal> expected = new ArrayList<TradingDeal>();
 | 
			
		||||
        expected.add(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);
 | 
			
		||||
        assertTrue(user.getTradingDeals().equals(expected));
 | 
			
		||||
        ArrayList<Card> deckArrList = new ArrayList<Card>();
 | 
			
		||||
        ArrayList<Card> stackArrList = new ArrayList<Card>();
 | 
			
		||||
        deckArrList.add(c1);
 | 
			
		||||
        deckArrList.add(c2);
 | 
			
		||||
        stackArrList.add(c3);
 | 
			
		||||
        stackArrList.add(c4);
 | 
			
		||||
        stackArrList.add(c5);
 | 
			
		||||
        Cards deck = new Cards(deckArrList);
 | 
			
		||||
        Cards stack = new Cards(stackArrList);
 | 
			
		||||
        User user = new User(new Credentials("username", "passwort"), "Name", "Nachname", "Email", new Stack(stack, deck), new Coins(1000));
 | 
			
		||||
        ArrayList<TradingDeal> tradingDeals = new ArrayList<TradingDeal>();
 | 
			
		||||
        ArrayList<Package> packages = new ArrayList<Package>();
 | 
			
		||||
        tradingDeals.add(new TradingDeal(user, c1, ElementTyp.FIRE, 10, CardType.MONSTER));
 | 
			
		||||
        packages.add(new Package(stack, "Test Package", 100));
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        System.out.println(user.getTradingDeals().toString());
 | 
			
		||||
 | 
			
		||||
        user.addTradingDeal(new TradingDeal(user, c1, ElementTyp.FIRE, 10, CardType.MONSTER));
 | 
			
		||||
        System.out.println(user.getTradingDeals().toString());
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        System.out.println(tradingDeals.toString());
 | 
			
		||||
        assertTrue(user.getTradingDeals().get(0).dealOk(tradingDeals.get(0)));
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_doTrade() {
 | 
			
		||||
        Card cardtest = new Card("Name", 10, ElementTyp.FIRE, CardType.MONSTER);
 | 
			
		||||
        Card cardtest = new Card("Name", 100, ElementTyp.FIRE, CardType.MONSTER);
 | 
			
		||||
        TradingDeal tradingDealtest = new TradingDeal(user, cardtest, ElementTyp.WATER, 100, CardType.MONSTER);
 | 
			
		||||
        boolean result = user.doTrading(tradingDeal, tradingDealtest);
 | 
			
		||||
        assertTrue(result);
 | 
			
		||||
@@ -78,27 +91,33 @@ public class StoreTest {
 | 
			
		||||
    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.equals(expected));
 | 
			
		||||
        ArrayList<Card> deckArrList = new ArrayList<Card>();
 | 
			
		||||
        ArrayList<Card> stackArrList = new ArrayList<Card>();
 | 
			
		||||
        deckArrList.add(c1);
 | 
			
		||||
        deckArrList.add(c2);
 | 
			
		||||
        stackArrList.add(c3);
 | 
			
		||||
        stackArrList.add(c4);
 | 
			
		||||
        stackArrList.add(c5);
 | 
			
		||||
        Cards deck = new Cards(deckArrList);
 | 
			
		||||
        Cards stack = new Cards(stackArrList);
 | 
			
		||||
        User user = new User(new Credentials("username", "passwort"), "Name", "Nachname", "Email", new Stack(stack, deck), new Coins(1000));
 | 
			
		||||
        ArrayList<TradingDeal> tradingDeals = new ArrayList<TradingDeal>();
 | 
			
		||||
        ArrayList<Package> packages = new ArrayList<Package>();
 | 
			
		||||
        tradingDeals.add(new TradingDeal(user, c1, ElementTyp.FIRE, 10, CardType.MONSTER));
 | 
			
		||||
        packages.add(new Package(stack, "Test Package", 100));
 | 
			
		||||
 | 
			
		||||
        assertTrue(result.get(0).dealOk(new TradingDeal(user, c1, ElementTyp.FIRE, 10, CardType.MONSTER)));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_getPossibleTradingDeals() {
 | 
			
		||||
        Card testCard = new Card("Test", 15, ElementTyp.FIRE, CardType.SPELL);
 | 
			
		||||
        Card testCard = new Card("Test", 10, ElementTyp.FIRE, CardType.MONSTER);
 | 
			
		||||
        ArrayList<TradingDeal> result = user.getPossibleTradingDeals(testCard);
 | 
			
		||||
        ArrayList<TradingDeal> expected = new ArrayList<TradingDeal>();
 | 
			
		||||
        Card c1 = new Card("Name", 10, ElementTyp.FIRE, CardType.MONSTER);
 | 
			
		||||
@@ -106,15 +125,19 @@ public class StoreTest {
 | 
			
		||||
        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);
 | 
			
		||||
        ArrayList<Card> deckArrList = new ArrayList<Card>();
 | 
			
		||||
        ArrayList<Card> stackArrList = new ArrayList<Card>();
 | 
			
		||||
        deckArrList.add(c1);
 | 
			
		||||
        deckArrList.add(c2);
 | 
			
		||||
        stackArrList.add(c3);
 | 
			
		||||
        stackArrList.add(c4);
 | 
			
		||||
        stackArrList.add(c5);
 | 
			
		||||
        Cards deck = new Cards(deckArrList);
 | 
			
		||||
        Cards stack = new Cards(stackArrList);
 | 
			
		||||
        TradingDeal vonDB = new TradingDeal(new User(new Credentials("username", "passwort"), "DerName", "Nachname", "Email", new Stack(stack, deck), new Coins(1000)), c1, ElementTyp.FIRE, 10, CardType.SPELL);
 | 
			
		||||
        expected.add(vonDB);
 | 
			
		||||
        assertTrue(result.equals(expected));
 | 
			
		||||
        System.out.println(result.get(0).getCardToTrade().getName());
 | 
			
		||||
        System.out.println(expected.get(0).getCardToTrade().getName());
 | 
			
		||||
        assertTrue(result.get(0).getCardToTrade().equals(expected.get(0).getCardToTrade()));
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -41,17 +41,17 @@ public class UserTest {
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_getName() {
 | 
			
		||||
        String result = user.getName();
 | 
			
		||||
        assertTrue(result != "name");
 | 
			
		||||
        assertTrue(result.equals("name"));
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_getNachname() {
 | 
			
		||||
        String result = user.getNachname();
 | 
			
		||||
        assertTrue(result != "nachname");
 | 
			
		||||
        assertTrue(result.equals("nachname"));
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_getEmail() {
 | 
			
		||||
        String result = user.getEmail();
 | 
			
		||||
        assertTrue(result != "email");
 | 
			
		||||
        assertTrue(result.equals("email"));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
@@ -59,21 +59,21 @@ public class UserTest {
 | 
			
		||||
        String newstring = "new";
 | 
			
		||||
        user.setName(newstring);
 | 
			
		||||
        String result = user.getName();
 | 
			
		||||
        assertTrue(result != newstring);
 | 
			
		||||
        assertTrue(result.equals(newstring));
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_setNachname() {
 | 
			
		||||
        String newstring = "new";
 | 
			
		||||
        user.setNachname(newstring);
 | 
			
		||||
        String result = user.getNachname();
 | 
			
		||||
        assertTrue(result != newstring);
 | 
			
		||||
        assertTrue(result.equals(newstring));
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_setEmail() {
 | 
			
		||||
        String newstring = "new";
 | 
			
		||||
        user.setEmail(newstring);
 | 
			
		||||
        String result = user.getEmail();
 | 
			
		||||
        assertTrue(result != newstring);
 | 
			
		||||
        assertTrue(result.equals(newstring));
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_buyPackage(){
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user