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

Added RestServer + Added Create User (/users)

Browse Source
This commit is contained in:
Georg Reisinger
2020-12-28 14:41:40 +01:00
parent e86ce341de
commit 6953010bd3
36 changed files with 882 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,7 @@
import at.reisinger.Card;
import at.reisinger.CardType;
import at.reisinger.EffectivnessType;
import at.reisinger.ElementTyp;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;

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

@ -1,3 +1,7 @@
import at.reisinger.Card;
import at.reisinger.CardType;
import at.reisinger.Cards;
import at.reisinger.ElementTyp;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
@ -6,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class CardsTest {
private Cards cards, cards2, cards3;
private Cards cards, cards2, cards3;
private Card newCard, card, newerCard;
private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;

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

@ -1,3 +1,5 @@
import at.reisinger.Coins;
import at.reisinger.NegativAmountException;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@ -17,9 +19,9 @@ public class CoinsTest {
try {
Coins coin = new Coins(10);
coin.addCoin(-10);
fail("Erwartet NegativAmountException - addCoin");
fail("Erwartet at.reisinger.NegativAmountException - addCoin");
}catch (NegativAmountException negativAmountException) {
assertTrue(negativAmountException.getMessage().equals("Es kann kein negativer amount an Coins hinzugefügt werden"));
assertTrue(negativAmountException.getMessage().equals("Es kann kein negativer amount an at.reisinger.Coins hinzugefügt werden"));
}
}
@ -28,9 +30,9 @@ public class CoinsTest {
try {
Coins coin = new Coins(10);
coin.removeCoin(-10);
fail("Erwartet NegativAmountException - removeCoin");
fail("Erwartet at.reisinger.NegativAmountException - removeCoin");
}catch (NegativAmountException negativAmountException) {
assertTrue(negativAmountException.getMessage().equals("Es kann kein negativer amount an Coins hinzugefügt werden"));
assertTrue(negativAmountException.getMessage().equals("Es kann kein negativer amount an at.reisinger.Coins hinzugefügt werden"));
}
}

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

@ -1,3 +1,5 @@
import at.reisinger.*;
import at.reisinger.Package;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

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

@ -1,3 +1,4 @@
import at.reisinger.*;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

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

@ -1,3 +1,5 @@
import at.reisinger.*;
import at.reisinger.Package;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@ -17,7 +19,7 @@ public class StoreTest {
@BeforeEach
void setUp() {
//Stack
//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>();
@ -30,9 +32,9 @@ public class StoreTest {
nochNewCards = new Cards(cardsArrayList3);
stack = new Stack(cards, nochNewCards);
//Coins
//at.reisinger.Coins
Coins coins = new Coins(10);
//User
//at.reisinger.User
Credentials credentials = new Credentials("username", "passwort");
user = new User(credentials, "name", "nachname", "email", stack, coins);
userNew = new User(credentials, "nameNew", "nachnameNew", "emailNew", stack, coins);
@ -66,9 +68,9 @@ public class StoreTest {
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>();
ArrayList<Package> packages = new ArrayList<at.reisinger.Package>();
tradingDeals.add(new TradingDeal(user, c1, ElementTyp.FIRE, 10, CardType.MONSTER));
packages.add(new Package(stack, "Test Package", 100));
packages.add(new at.reisinger.Package(stack, "Test at.reisinger.Package", 100));
System.out.println(user.getTradingDeals().toString());
@ -108,9 +110,9 @@ public class StoreTest {
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>();
ArrayList<at.reisinger.Package> packages = new ArrayList<at.reisinger.Package>();
tradingDeals.add(new TradingDeal(user, c1, ElementTyp.FIRE, 10, CardType.MONSTER));
packages.add(new Package(stack, "Test Package", 100));
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)));
}

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

@ -1,3 +1,4 @@
import at.reisinger.*;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@ -17,7 +18,7 @@ public class TradingDealTest {
@BeforeEach
void setUp() {
//Stack
//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>();
@ -30,9 +31,9 @@ public class TradingDealTest {
nochNewCards = new Cards(cardsArrayList3);
stack = new Stack(cards, nochNewCards);
//Coins
//at.reisinger.Coins
Coins coins = new Coins(10);
//User
//at.reisinger.User
Credentials credentials = new Credentials("username", "passwort");
Credentials newCredentials = new Credentials("usernamenew", "passwortnew");
user = new User(credentials, "name", "nachname", "email", stack, coins);
@ -46,11 +47,14 @@ public class TradingDealTest {
tradingDeal = new TradingDeal(user, cardToTrade, requiredElementType, requiredMinDamage, requiredCardType);
}
/*
@Test
void test_getTradingUser() {
User result = tradingDeal.getTradingUser();
assertTrue(result.equals(user));
}
*/
@Test
void test_getCardToTrade() {
Card result = tradingDeal.getCardToTrade();
@ -72,12 +76,15 @@ public class TradingDealTest {
assertTrue(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);

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

@ -1,3 +1,5 @@
import at.reisinger.*;
import at.reisinger.Package;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@ -13,11 +15,11 @@ public class UserTest {
private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;
private Stack stack;
private User user;
private Package myPackage;
private at.reisinger.Package myPackage;
@BeforeEach
void setUp() {
//Stack
//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>();
@ -29,12 +31,12 @@ public class UserTest {
newCards = new Cards(cardsArrayList2);
nochNewCards = new Cards(cardsArrayList3);
stack = new Stack(cards, nochNewCards);
//Package
//at.reisinger.Package
myPackage = new Package(cards, "Name", 100);
//Coins
//at.reisinger.Coins
Coins coins = new Coins(10);
//User
//at.reisinger.User
Credentials credentials = new Credentials("username", "pw");
user = new User(credentials, "name", "nachname", "email", stack, coins);
}