/stats + /score + Performace Bugfixes + Removed unused + completed doc + Battle Bugfixes + other bugs
This commit is contained in:
		@@ -1,58 +1,50 @@
 | 
			
		||||
import at.reisinger.Card;
 | 
			
		||||
import at.reisinger.CardType;
 | 
			
		||||
import at.reisinger.EffectivnessType;
 | 
			
		||||
import at.reisinger.ElementTyp;
 | 
			
		||||
import at.reisinger.obj.Card;
 | 
			
		||||
import at.reisinger.enums.CardType;
 | 
			
		||||
import at.reisinger.enums.ElementTyp;
 | 
			
		||||
import org.junit.jupiter.api.Test;
 | 
			
		||||
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.assertTrue;
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.*;
 | 
			
		||||
 | 
			
		||||
public class CardTest {
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_getName() {
 | 
			
		||||
        Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
 | 
			
		||||
        assertTrue(card.getName().equals("Name"));
 | 
			
		||||
        assertEquals(card.getName(), "Name");
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_getDamage() {
 | 
			
		||||
        Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
 | 
			
		||||
        assertTrue(card.getDamage() == 10);
 | 
			
		||||
        assertEquals(card.getDamage(), 10);
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_getElementType() {
 | 
			
		||||
        Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
 | 
			
		||||
        ElementTyp elementTyp = card.getElementTyp();
 | 
			
		||||
        assertTrue(elementTyp == ElementTyp.WATER);
 | 
			
		||||
        assertSame(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);
 | 
			
		||||
    }
 | 
			
		||||
    @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);
 | 
			
		||||
        assertSame(cardType, CardType.SPELL);
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_setName() {
 | 
			
		||||
        Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
 | 
			
		||||
        card.setName("NeuerName");
 | 
			
		||||
        assertTrue(card.getName().equals("NeuerName"));
 | 
			
		||||
        assertEquals(card.getName(), "NeuerName");
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_setDamage() {
 | 
			
		||||
        Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
 | 
			
		||||
        card.setDamage(100);
 | 
			
		||||
        assertTrue(card.getDamage() == 100);
 | 
			
		||||
        assertEquals(card.getDamage(), 100);
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_setElementTyp() {
 | 
			
		||||
        Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
 | 
			
		||||
        card.setElementType(ElementTyp.FIRE);
 | 
			
		||||
        assertTrue(card.getElementTyp() == ElementTyp.FIRE);
 | 
			
		||||
        assertSame(card.getElementTyp(), ElementTyp.FIRE);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,27 +1,27 @@
 | 
			
		||||
import at.reisinger.Card;
 | 
			
		||||
import at.reisinger.CardType;
 | 
			
		||||
import at.reisinger.Cards;
 | 
			
		||||
import at.reisinger.ElementTyp;
 | 
			
		||||
import at.reisinger.obj.Card;
 | 
			
		||||
import at.reisinger.enums.CardType;
 | 
			
		||||
import at.reisinger.obj.Cards;
 | 
			
		||||
import at.reisinger.enums.ElementTyp;
 | 
			
		||||
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;
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.*;
 | 
			
		||||
 | 
			
		||||
public class CardsTest {
 | 
			
		||||
    private Cards cards, cards2, cards3;
 | 
			
		||||
    private Card newCard, card, newerCard;
 | 
			
		||||
    private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;
 | 
			
		||||
    private Card newCard;
 | 
			
		||||
    private Card card;
 | 
			
		||||
    private ArrayList<Card> cardsArrayList;
 | 
			
		||||
 | 
			
		||||
    @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>();
 | 
			
		||||
        Card newerCard = new Card("NameNewerer", 100, ElementTyp.FIRE, CardType.MONSTER);
 | 
			
		||||
        cardsArrayList = new ArrayList<>();
 | 
			
		||||
        ArrayList<Card> cardsArrayList2 = new ArrayList<>();
 | 
			
		||||
        ArrayList<Card> cardsArrayList3 = new ArrayList<>();
 | 
			
		||||
        cardsArrayList.add(card);
 | 
			
		||||
        cardsArrayList2.add(newCard);
 | 
			
		||||
        cardsArrayList2.add(card);
 | 
			
		||||
@@ -66,11 +66,11 @@ public class CardsTest {
 | 
			
		||||
 | 
			
		||||
        cards.delCard(newCard);
 | 
			
		||||
 | 
			
		||||
        assertTrue(cards.getCards().equals(cardsArrayList));
 | 
			
		||||
        assertEquals(cardsArrayList, cards.getCards());
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_getCards() {
 | 
			
		||||
        assertTrue(cards.getCards().equals(cardsArrayList));
 | 
			
		||||
        assertEquals(cardsArrayList, cards.getCards());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,10 +1,8 @@
 | 
			
		||||
import at.reisinger.Coins;
 | 
			
		||||
import at.reisinger.NegativAmountException;
 | 
			
		||||
import at.reisinger.obj.Coins;
 | 
			
		||||
import org.junit.jupiter.api.Test;
 | 
			
		||||
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.assertTrue;
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.fail;
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.assertFalse;
 | 
			
		||||
 | 
			
		||||
public class CoinsTest {
 | 
			
		||||
 | 
			
		||||
@@ -14,55 +12,4 @@ public class CoinsTest {
 | 
			
		||||
        assertTrue(coin.getCoinAmount() >= 0);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_addCoinException(){
 | 
			
		||||
        try {
 | 
			
		||||
            Coins coin = new Coins(10);
 | 
			
		||||
            coin.addCoin(-10);
 | 
			
		||||
            fail("Erwartet at.reisinger.NegativAmountException - addCoin");
 | 
			
		||||
        }catch (NegativAmountException negativAmountException) {
 | 
			
		||||
            assertTrue(negativAmountException.getMessage().equals("Es kann kein negativer amount an at.reisinger.Coins hinzugefügt werden"));
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_removeCoinException(){
 | 
			
		||||
        try {
 | 
			
		||||
            Coins coin = new Coins(10);
 | 
			
		||||
            coin.removeCoin(-10);
 | 
			
		||||
            fail("Erwartet at.reisinger.NegativAmountException - removeCoin");
 | 
			
		||||
        }catch (NegativAmountException negativAmountException) {
 | 
			
		||||
            assertTrue(negativAmountException.getMessage().equals("Es kann kein negativer amount an at.reisinger.Coins hinzugefügt werden"));
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_removeCoin(){
 | 
			
		||||
            Coins coin = new Coins(10);
 | 
			
		||||
        try {
 | 
			
		||||
            assertTrue(coin.removeCoin(10));
 | 
			
		||||
        } catch (NegativAmountException e) {
 | 
			
		||||
            e.printStackTrace();
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_changeCoinAmount_true(){
 | 
			
		||||
        Coins coin = new Coins(10);
 | 
			
		||||
        try {
 | 
			
		||||
            assertTrue(coin.changeCoinAmmount(10));
 | 
			
		||||
        } catch (NegativAmountException e) {
 | 
			
		||||
            e.printStackTrace();
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_changeCoinAmount_false(){
 | 
			
		||||
        Coins coin = new Coins(9);
 | 
			
		||||
        try {
 | 
			
		||||
            assertTrue(coin.changeCoinAmmount(7));
 | 
			
		||||
        } catch (NegativAmountException e) {
 | 
			
		||||
            e.printStackTrace();
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,49 +1,49 @@
 | 
			
		||||
import at.reisinger.*;
 | 
			
		||||
import at.reisinger.Package;
 | 
			
		||||
import at.reisinger.obj.Card;
 | 
			
		||||
import at.reisinger.obj.Cards;
 | 
			
		||||
import at.reisinger.obj.Package;
 | 
			
		||||
import at.reisinger.enums.CardType;
 | 
			
		||||
import at.reisinger.enums.ElementTyp;
 | 
			
		||||
import org.junit.jupiter.api.BeforeEach;
 | 
			
		||||
import org.junit.jupiter.api.Test;
 | 
			
		||||
 | 
			
		||||
import java.util.ArrayList;
 | 
			
		||||
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.assertTrue;
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.assertEquals;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
public class PackageTest {
 | 
			
		||||
    private Cards newCards, cards, nochNewCards;
 | 
			
		||||
    private Card newCard, card;
 | 
			
		||||
    private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;
 | 
			
		||||
    private Package myPackage;
 | 
			
		||||
    @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>();
 | 
			
		||||
        Card card = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
 | 
			
		||||
        Card newCard = new Card("NameNew", 10, ElementTyp.WATER, CardType.SPELL);
 | 
			
		||||
        ArrayList<Card> cardsArrayList = new ArrayList<>();
 | 
			
		||||
        ArrayList<Card> cardsArrayList2 = new ArrayList<>();
 | 
			
		||||
        ArrayList<Card> cardsArrayList3 = new ArrayList<>();
 | 
			
		||||
        cardsArrayList.add(card);
 | 
			
		||||
        cardsArrayList2.add(newCard);
 | 
			
		||||
        cards = new Cards(cardsArrayList);
 | 
			
		||||
        newCards = new Cards(cardsArrayList2);
 | 
			
		||||
        nochNewCards = new Cards(cardsArrayList3);
 | 
			
		||||
        Cards cards = new Cards(cardsArrayList);
 | 
			
		||||
        Cards newCards = new Cards(cardsArrayList2);
 | 
			
		||||
        Cards nochNewCards = new Cards(cardsArrayList3);
 | 
			
		||||
        myPackage = new Package(cards,"Name", 100);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_getName() {
 | 
			
		||||
        String result = myPackage.getName();
 | 
			
		||||
        assertTrue(result.equals("Name"));
 | 
			
		||||
        assertEquals(result, "Name");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_getPrice() {
 | 
			
		||||
        int result = myPackage.getPrice();
 | 
			
		||||
        assertTrue(result==100);
 | 
			
		||||
        assertEquals(result, 100);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_setName() {
 | 
			
		||||
        myPackage.setName("neuName");
 | 
			
		||||
        String result = myPackage.getName();
 | 
			
		||||
        assertTrue(result.equals("neuName"));
 | 
			
		||||
        assertEquals(result, "neuName");
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,48 +0,0 @@
 | 
			
		||||
import at.reisinger.*;
 | 
			
		||||
import org.junit.jupiter.api.BeforeEach;
 | 
			
		||||
import org.junit.jupiter.api.Test;
 | 
			
		||||
 | 
			
		||||
import java.util.ArrayList;
 | 
			
		||||
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.assertTrue;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
public class StackTest {
 | 
			
		||||
    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_addDeck() {
 | 
			
		||||
        stack.addDeck(newCards);
 | 
			
		||||
        Cards result = stack.getDeck();
 | 
			
		||||
        assertTrue(result.equals(newCards));
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_delDeck() {
 | 
			
		||||
        stack.addDeck(newCards);
 | 
			
		||||
        stack.delDeck(newCard);
 | 
			
		||||
        assertTrue(stack.getDeck().equals(cards));
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_getDeck() {
 | 
			
		||||
        Cards result = stack.getDeck();
 | 
			
		||||
        assertTrue(result.equals(nochNewCards));
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,147 +0,0 @@
 | 
			
		||||
import at.reisinger.*;
 | 
			
		||||
import at.reisinger.Package;
 | 
			
		||||
import org.junit.jupiter.api.BeforeEach;
 | 
			
		||||
import org.junit.jupiter.api.Test;
 | 
			
		||||
 | 
			
		||||
import java.util.ArrayList;
 | 
			
		||||
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.assertTrue;
 | 
			
		||||
 | 
			
		||||
public class StoreTest {
 | 
			
		||||
 | 
			
		||||
    private TradingDeal tradingDeal;
 | 
			
		||||
    private Cards newCards, cards, nochNewCards;
 | 
			
		||||
    private Card newCard, card;
 | 
			
		||||
    private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;
 | 
			
		||||
    private Stack stack;
 | 
			
		||||
    private User user, userNew;
 | 
			
		||||
    private Store store;
 | 
			
		||||
 | 
			
		||||
    @BeforeEach
 | 
			
		||||
    void setUp() {
 | 
			
		||||
        //at.reisinger.Stack
 | 
			
		||||
        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>();
 | 
			
		||||
        cardsArrayList3 = new ArrayList<Card>();
 | 
			
		||||
        cardsArrayList.add(card);
 | 
			
		||||
        cardsArrayList2.add(newCard);
 | 
			
		||||
        cards = new Cards(cardsArrayList);
 | 
			
		||||
        newCards = new Cards(cardsArrayList2);
 | 
			
		||||
        nochNewCards = new Cards(cardsArrayList3);
 | 
			
		||||
        stack = new Stack(cards, nochNewCards);
 | 
			
		||||
 | 
			
		||||
        //at.reisinger.Coins
 | 
			
		||||
        Coins coins = new Coins(10);
 | 
			
		||||
        //at.reisinger.User
 | 
			
		||||
        Credentials credentials = new Credentials("username", "passwort");
 | 
			
		||||
        user = new User(credentials, "name", "nachname", "email", coins, "BIO", "IMAGE");
 | 
			
		||||
        userNew = new User(credentials, "nameNew", "nachnameNew", "emailNew", coins, "BIO", "IMAGE");
 | 
			
		||||
 | 
			
		||||
        //Trading Deal
 | 
			
		||||
        Card cardToTrade = card;
 | 
			
		||||
        ElementTyp requiredElementType = ElementTyp.FIRE;
 | 
			
		||||
        double requiredMinDamage = 100;
 | 
			
		||||
        CardType requiredCardType = CardType.MONSTER;
 | 
			
		||||
        tradingDeal = new TradingDeal("ID", cardToTrade, requiredElementType, requiredMinDamage, requiredCardType, "NAME");
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
/*
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_addTradingDeal() {
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        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);
 | 
			
		||||
        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 Coins(1000), "BIO", "IMAGE");
 | 
			
		||||
        ArrayList<TradingDeal> tradingDeals = new ArrayList<TradingDeal>();
 | 
			
		||||
        ArrayList<Package> packages = new ArrayList<at.reisinger.Package>();
 | 
			
		||||
        tradingDeals.add(new TradingDeal(user, c1, ElementTyp.FIRE, 10, CardType.MONSTER));
 | 
			
		||||
        packages.add(new at.reisinger.Package(stack, "Test at.reisinger.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", 100, 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);
 | 
			
		||||
        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 Coins(1000), "BIO", "IMAGE");
 | 
			
		||||
        ArrayList<TradingDeal> tradingDeals = new ArrayList<TradingDeal>();
 | 
			
		||||
        ArrayList<at.reisinger.Package> packages = new ArrayList<at.reisinger.Package>();
 | 
			
		||||
        tradingDeals.add(new TradingDeal(user, c1, ElementTyp.FIRE, 10, CardType.MONSTER));
 | 
			
		||||
        packages.add(new at.reisinger.Package(stack, "Test at.reisinger.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", 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);
 | 
			
		||||
        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);
 | 
			
		||||
        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 Coins(1000), "BIO", "IMAGE"), c1, ElementTyp.FIRE, 10, CardType.SPELL);
 | 
			
		||||
        expected.add(vonDB);
 | 
			
		||||
        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()));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 */
 | 
			
		||||
}
 | 
			
		||||
@@ -1,43 +1,40 @@
 | 
			
		||||
import at.reisinger.*;
 | 
			
		||||
import at.reisinger.enums.CardType;
 | 
			
		||||
import at.reisinger.enums.ElementTyp;
 | 
			
		||||
import at.reisinger.obj.*;
 | 
			
		||||
import org.junit.jupiter.api.BeforeEach;
 | 
			
		||||
import org.junit.jupiter.api.Test;
 | 
			
		||||
 | 
			
		||||
import java.util.ArrayList;
 | 
			
		||||
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.assertTrue;
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.*;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
public class TradingDealTest {
 | 
			
		||||
 | 
			
		||||
    private TradingDeal tradingDeal;
 | 
			
		||||
    private Cards newCards, cards, nochNewCards;
 | 
			
		||||
    private Card newCard, card;
 | 
			
		||||
    private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;
 | 
			
		||||
    private Stack stack;
 | 
			
		||||
    private User user, userNew;
 | 
			
		||||
 | 
			
		||||
    @BeforeEach
 | 
			
		||||
    void setUp() {
 | 
			
		||||
        //at.reisinger.Stack
 | 
			
		||||
        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>();
 | 
			
		||||
        ArrayList<Card> cardsArrayList = new ArrayList<>();
 | 
			
		||||
        ArrayList<Card> cardsArrayList2 = new ArrayList<>();
 | 
			
		||||
        ArrayList<Card> cardsArrayList3 = new ArrayList<>();
 | 
			
		||||
        cardsArrayList.add(card);
 | 
			
		||||
        cardsArrayList2.add(newCard);
 | 
			
		||||
        cards = new Cards(cardsArrayList);
 | 
			
		||||
        newCards = new Cards(cardsArrayList2);
 | 
			
		||||
        nochNewCards = new Cards(cardsArrayList3);
 | 
			
		||||
        stack = new Stack(cards, nochNewCards);
 | 
			
		||||
        Cards cards = new Cards(cardsArrayList);
 | 
			
		||||
        Cards newCards = new Cards(cardsArrayList2);
 | 
			
		||||
        Cards nochNewCards = new Cards(cardsArrayList3);
 | 
			
		||||
 | 
			
		||||
        //at.reisinger.Coins
 | 
			
		||||
        //at.reisinger.obj.Coins
 | 
			
		||||
        Coins coins = new Coins(10);
 | 
			
		||||
        //at.reisinger.User
 | 
			
		||||
        //at.reisinger.obj.User
 | 
			
		||||
        Credentials credentials = new Credentials("username", "passwort");
 | 
			
		||||
        Credentials newCredentials = new Credentials("usernamenew", "passwortnew");
 | 
			
		||||
        user = new User(credentials, "name", "nachname", "email", coins, "BIO", "IMAGE");
 | 
			
		||||
        userNew = new User(newCredentials, "nameNew", "nachnameNew", "emailNew", coins, "BIO", "IMAGE");
 | 
			
		||||
        User user = new User(credentials, "name", "nachname", "email", coins, "BIO", "IMAGE");
 | 
			
		||||
        User userNew = new User(newCredentials, "nameNew", "nachnameNew", "emailNew", coins, "BIO", "IMAGE");
 | 
			
		||||
 | 
			
		||||
        //Trading Deal
 | 
			
		||||
        Card cardToTrade = card;
 | 
			
		||||
@@ -47,14 +44,6 @@ public class TradingDealTest {
 | 
			
		||||
        tradingDeal = new TradingDeal("ID", cardToTrade, requiredElementType, requiredMinDamage, requiredCardType, "NAME");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /*
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_getTradingUser() {
 | 
			
		||||
        User result = tradingDeal.getTradingUser();
 | 
			
		||||
        assertTrue(result.equals(user));
 | 
			
		||||
    }
 | 
			
		||||
    */
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_getCardToTrade() {
 | 
			
		||||
        Card result = tradingDeal.getCardToTrade();
 | 
			
		||||
@@ -63,50 +52,41 @@ public class TradingDealTest {
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_getRequiredElementType() {
 | 
			
		||||
        ElementTyp result = tradingDeal.getRequiredElementType();
 | 
			
		||||
        assertTrue(result==ElementTyp.FIRE);
 | 
			
		||||
        assertSame(result, ElementTyp.FIRE);
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_getRequiredMinDamage() {
 | 
			
		||||
        double result = tradingDeal.getRequiredMinDamage();
 | 
			
		||||
        assertTrue(result==100);
 | 
			
		||||
        assertEquals(result, 100);
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_getRequiredCardType() {
 | 
			
		||||
        CardType result = tradingDeal.getRequiredCardType();
 | 
			
		||||
        assertTrue(result==CardType.MONSTER);
 | 
			
		||||
        assertSame(result, CardType.MONSTER);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /*
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_setTradingUser() {
 | 
			
		||||
        tradingDeal.setTradingUser(userNew);
 | 
			
		||||
        User result = tradingDeal.getTradingUser();
 | 
			
		||||
        assertTrue(result.equals(userNew));
 | 
			
		||||
    }
 | 
			
		||||
    */
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_setCardToTrade() {
 | 
			
		||||
        tradingDeal.setCardToTrade(newCard);
 | 
			
		||||
        Card result = tradingDeal.getCardToTrade();
 | 
			
		||||
        assertTrue(result==newCard);
 | 
			
		||||
        assertSame(result, newCard);
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_setRequiredElementType() {
 | 
			
		||||
        tradingDeal.setRequiredElementType(ElementTyp.WATER);
 | 
			
		||||
        ElementTyp result = tradingDeal.getRequiredElementType();
 | 
			
		||||
        assertTrue(result==ElementTyp.WATER);
 | 
			
		||||
        assertSame(result, ElementTyp.WATER);
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_setRequiredMinDamage() {
 | 
			
		||||
        tradingDeal.setRequiredMinDamage(10);
 | 
			
		||||
        double result = tradingDeal.getRequiredMinDamage();
 | 
			
		||||
        assertTrue(result==10);
 | 
			
		||||
        assertEquals(result, 10);
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    void test_setRequiredCardType() {
 | 
			
		||||
        tradingDeal.setRequiredCardType(CardType.SPELL);
 | 
			
		||||
        CardType result = tradingDeal.getRequiredCardType();
 | 
			
		||||
        assertTrue(result==CardType.SPELL);
 | 
			
		||||
        assertSame(result, CardType.SPELL);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,59 +1,58 @@
 | 
			
		||||
import at.reisinger.*;
 | 
			
		||||
import at.reisinger.Package;
 | 
			
		||||
import at.reisinger.obj.*;
 | 
			
		||||
import at.reisinger.enums.CardType;
 | 
			
		||||
import at.reisinger.enums.ElementTyp;
 | 
			
		||||
import at.reisinger.obj.Package;
 | 
			
		||||
import org.junit.jupiter.api.BeforeEach;
 | 
			
		||||
import org.junit.jupiter.api.Test;
 | 
			
		||||
 | 
			
		||||
import java.util.ArrayList;
 | 
			
		||||
import java.util.Objects;
 | 
			
		||||
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.assertEquals;
 | 
			
		||||
import static org.junit.jupiter.api.Assertions.assertTrue;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
public class UserTest {
 | 
			
		||||
    private TradingDeal tradingDeal;
 | 
			
		||||
    private Cards newCards, cards, nochNewCards;
 | 
			
		||||
    private Card newCard, card;
 | 
			
		||||
    private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;
 | 
			
		||||
    private Stack stack;
 | 
			
		||||
    private User user;
 | 
			
		||||
    private at.reisinger.Package myPackage;
 | 
			
		||||
    private Package myPackage;
 | 
			
		||||
 | 
			
		||||
    @BeforeEach
 | 
			
		||||
    void setUp() {
 | 
			
		||||
        //at.reisinger.Stack
 | 
			
		||||
        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>();
 | 
			
		||||
        Card card = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
 | 
			
		||||
        Card newCard = new Card("NameNew", 10, ElementTyp.WATER, CardType.SPELL);
 | 
			
		||||
        ArrayList<Card> cardsArrayList = new ArrayList<>();
 | 
			
		||||
        ArrayList<Card> cardsArrayList2 = new ArrayList<>();
 | 
			
		||||
        ArrayList<Card> cardsArrayList3 = new ArrayList<>();
 | 
			
		||||
        cardsArrayList.add(card);
 | 
			
		||||
        cardsArrayList2.add(newCard);
 | 
			
		||||
        cards = new Cards(cardsArrayList);
 | 
			
		||||
        newCards = new Cards(cardsArrayList2);
 | 
			
		||||
        nochNewCards = new Cards(cardsArrayList3);
 | 
			
		||||
        stack = new Stack(cards, nochNewCards);
 | 
			
		||||
        //at.reisinger.Package
 | 
			
		||||
        Cards cards = new Cards(cardsArrayList);
 | 
			
		||||
        Cards newCards = new Cards(cardsArrayList2);
 | 
			
		||||
        Cards nochNewCards = new Cards(cardsArrayList3);
 | 
			
		||||
        //at.reisinger.obj.Package
 | 
			
		||||
        myPackage = new Package(cards, "Name", 100);
 | 
			
		||||
 | 
			
		||||
        //at.reisinger.Coins
 | 
			
		||||
        //at.reisinger.obj.Coins
 | 
			
		||||
        Coins coins = new Coins(10);
 | 
			
		||||
        //at.reisinger.User
 | 
			
		||||
        //at.reisinger.obj.User
 | 
			
		||||
        Credentials credentials = new Credentials("username", "pw");
 | 
			
		||||
        user = new User(credentials, "name", "nachname", "email", coins, "BIO", "IMAGE");
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_getName() {
 | 
			
		||||
        String result = user.getName();
 | 
			
		||||
        assertTrue(result.equals("name"));
 | 
			
		||||
        assertEquals(result, "name");
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_getNachname() {
 | 
			
		||||
        String result = user.getNachname();
 | 
			
		||||
        assertTrue(result.equals("nachname"));
 | 
			
		||||
        assertEquals(result, "nachname");
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_getEmail() {
 | 
			
		||||
        String result = user.getEmail();
 | 
			
		||||
        assertTrue(result.equals("email"));
 | 
			
		||||
        assertEquals(result, "email");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
@@ -61,30 +60,26 @@ public class UserTest {
 | 
			
		||||
        String newstring = "new";
 | 
			
		||||
        user.setName(newstring);
 | 
			
		||||
        String result = user.getName();
 | 
			
		||||
        assertTrue(result.equals(newstring));
 | 
			
		||||
        assertEquals(newstring, result);
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_setNachname() {
 | 
			
		||||
        String newstring = "new";
 | 
			
		||||
        user.setNachname(newstring);
 | 
			
		||||
        String result = user.getNachname();
 | 
			
		||||
        assertTrue(result.equals(newstring));
 | 
			
		||||
        assertEquals(newstring, result);
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_setEmail() {
 | 
			
		||||
        String newstring = "new";
 | 
			
		||||
        user.setEmail(newstring);
 | 
			
		||||
        String result = user.getEmail();
 | 
			
		||||
        assertTrue(result.equals(newstring));
 | 
			
		||||
        assertEquals(newstring, result);
 | 
			
		||||
    }
 | 
			
		||||
    @Test
 | 
			
		||||
    public void test_buyPackage(){
 | 
			
		||||
        Cards cards = null;
 | 
			
		||||
        try {
 | 
			
		||||
        Cards cards;
 | 
			
		||||
            cards = new Cards(user.buyPackage(myPackage));
 | 
			
		||||
        } catch (NegativAmountException e) {
 | 
			
		||||
            e.printStackTrace();
 | 
			
		||||
        }
 | 
			
		||||
        assertTrue(cards.equals(new Cards(myPackage.getCards())));
 | 
			
		||||
        assertTrue(Objects.requireNonNull(cards).equals(new Cards(myPackage.getCards())));
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user