From 4885729c6320fce7fb0cbb5c6584ac67999b5c49 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Thu, 13 Feb 2020 12:11:26 -0500 Subject: [PATCH 01/10] add junit testing suite --- .idea/compiler.xml | 1 + .idea/misc.xml | 3 +++ pom.xml | 15 ++++++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 7a4bf35..3860742 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,6 +7,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4b661a5..3ccb27b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,9 @@ + + \ No newline at end of file From 4b8e8c3c8e7ffc0718690ee2c218a16e4e95886b Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Thu, 13 Feb 2020 16:56:26 -0500 Subject: [PATCH 02/10] added tc/desserts classes --- src/main/java/Models/Desserts.java | 4 ++++ src/main/java/Models/TradingCards.java | 4 ++++ src/main/java/Services/DessertsService.java | 4 ++++ src/main/java/Services/TradingCardService.java | 4 ++++ src/test/java/Models/DessertsTest.java | 4 ++++ src/test/java/Models/TradingCardTest.java | 4 ++++ src/test/java/Services/DessertsServiceTest.java | 4 ++++ src/test/java/Services/TradingCardsServiceTest.java | 4 ++++ 8 files changed, 32 insertions(+) create mode 100644 src/main/java/Models/Desserts.java create mode 100644 src/main/java/Models/TradingCards.java create mode 100644 src/main/java/Services/DessertsService.java create mode 100644 src/main/java/Services/TradingCardService.java create mode 100644 src/test/java/Models/DessertsTest.java create mode 100644 src/test/java/Models/TradingCardTest.java create mode 100644 src/test/java/Services/DessertsServiceTest.java create mode 100644 src/test/java/Services/TradingCardsServiceTest.java diff --git a/src/main/java/Models/Desserts.java b/src/main/java/Models/Desserts.java new file mode 100644 index 0000000..e9dd7af --- /dev/null +++ b/src/main/java/Models/Desserts.java @@ -0,0 +1,4 @@ +package Models; + +public class Desserts { +} diff --git a/src/main/java/Models/TradingCards.java b/src/main/java/Models/TradingCards.java new file mode 100644 index 0000000..aac2f43 --- /dev/null +++ b/src/main/java/Models/TradingCards.java @@ -0,0 +1,4 @@ +package Models; + +public class TradingCards { +} diff --git a/src/main/java/Services/DessertsService.java b/src/main/java/Services/DessertsService.java new file mode 100644 index 0000000..0c1718f --- /dev/null +++ b/src/main/java/Services/DessertsService.java @@ -0,0 +1,4 @@ +package Services; + +public class DessertsService { +} diff --git a/src/main/java/Services/TradingCardService.java b/src/main/java/Services/TradingCardService.java new file mode 100644 index 0000000..1e389f5 --- /dev/null +++ b/src/main/java/Services/TradingCardService.java @@ -0,0 +1,4 @@ +package Services; + +public class TradingCardService { +} diff --git a/src/test/java/Models/DessertsTest.java b/src/test/java/Models/DessertsTest.java new file mode 100644 index 0000000..b41393d --- /dev/null +++ b/src/test/java/Models/DessertsTest.java @@ -0,0 +1,4 @@ +package Models; + +public class DessertsTest { +} diff --git a/src/test/java/Models/TradingCardTest.java b/src/test/java/Models/TradingCardTest.java new file mode 100644 index 0000000..c3e4794 --- /dev/null +++ b/src/test/java/Models/TradingCardTest.java @@ -0,0 +1,4 @@ +package Models; + +public class TradingCardTest { +} diff --git a/src/test/java/Services/DessertsServiceTest.java b/src/test/java/Services/DessertsServiceTest.java new file mode 100644 index 0000000..a03adc2 --- /dev/null +++ b/src/test/java/Services/DessertsServiceTest.java @@ -0,0 +1,4 @@ +package Services; + +public class DessertsServiceTest { +} diff --git a/src/test/java/Services/TradingCardsServiceTest.java b/src/test/java/Services/TradingCardsServiceTest.java new file mode 100644 index 0000000..7f0c0e1 --- /dev/null +++ b/src/test/java/Services/TradingCardsServiceTest.java @@ -0,0 +1,4 @@ +package Services; + +public class TradingCardsServiceTest { +} From 142ece9b74205e7b4881c2ea132cf0806d1ec52d Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Thu, 13 Feb 2020 17:03:07 -0500 Subject: [PATCH 03/10] tc props --- src/main/java/Models/TradingCards.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/Models/TradingCards.java b/src/main/java/Models/TradingCards.java index aac2f43..e73792c 100644 --- a/src/main/java/Models/TradingCards.java +++ b/src/main/java/Models/TradingCards.java @@ -1,4 +1,8 @@ package Models; public class TradingCards { + private String game; + private int rarity; + boolean isFromStartedDeck; + private int price; } From 4e159ab89ef2b4537a0cfc678f21a2328386b243 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Thu, 13 Feb 2020 17:20:33 -0500 Subject: [PATCH 04/10] tc get set tests --- src/main/java/Models/TradingCards.java | 13 +++++++++++++ src/test/java/Models/TradingCardTest.java | 17 +++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/main/java/Models/TradingCards.java b/src/main/java/Models/TradingCards.java index e73792c..1cc892f 100644 --- a/src/main/java/Models/TradingCards.java +++ b/src/main/java/Models/TradingCards.java @@ -5,4 +5,17 @@ public class TradingCards { private int rarity; boolean isFromStartedDeck; private int price; + + public void setGame(String game) { + this.game = game; + } + public String getGame() { + return game; + } + public void setRarity(int rarity) { + this.rarity = rarity; + } + public int getRarity() { + return rarity; + } } diff --git a/src/test/java/Models/TradingCardTest.java b/src/test/java/Models/TradingCardTest.java index c3e4794..9369710 100644 --- a/src/test/java/Models/TradingCardTest.java +++ b/src/test/java/Models/TradingCardTest.java @@ -1,4 +1,21 @@ package Models; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + public class TradingCardTest { + @Test + public void setGameTest() { + String expected = "pokemon"; + TradingCards testGame = new TradingCards(); + testGame.setGame(expected); + Assertions.assertEquals(expected, testGame.getGame()); + } + @Test + public void setRarityTest() { + int expected = 5; + TradingCards testRarity = new TradingCards(); + testRarity.setRarity(expected); + Assertions.assertEquals(expected, testRarity.getRarity()); + } } From 12a89c224f070fe537709e989e28ad6cc30aa732 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Thu, 13 Feb 2020 17:29:42 -0500 Subject: [PATCH 05/10] dessert get set tests --- src/main/java/Models/Desserts.java | 17 +++++++++++++++++ src/test/java/Models/DessertsTest.java | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/src/main/java/Models/Desserts.java b/src/main/java/Models/Desserts.java index e9dd7af..83c8248 100644 --- a/src/main/java/Models/Desserts.java +++ b/src/main/java/Models/Desserts.java @@ -1,4 +1,21 @@ package Models; public class Desserts { + private String name; + private boolean servedCold; + private double price; + private boolean currentlyOnMenu; + + public void setName(String name) { + this.name = name; + } + public String getName() { + return name; + } + public void setPrice(double price) { + this.price = price; + } + public double getPrice() { + return price; + } } diff --git a/src/test/java/Models/DessertsTest.java b/src/test/java/Models/DessertsTest.java index b41393d..5b05047 100644 --- a/src/test/java/Models/DessertsTest.java +++ b/src/test/java/Models/DessertsTest.java @@ -1,4 +1,21 @@ package Models; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + public class DessertsTest { + @Test + public void setNameTest() { + String expected = "brownie"; + Desserts testDessert = new Desserts(); + testDessert.setName(expected); + Assertions.assertEquals(expected, testDessert.getName()); + } + @Test + public void setPriceTest() { + double expected = 3.00; + Desserts testDessert = new Desserts(); + testDessert.setPrice(expected); + Assertions.assertEquals(expected, testDessert.getPrice()); + } } From 394314f1beaed36ecb5c0b59f4d98b48c9bcae5c Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Thu, 13 Feb 2020 17:53:46 -0500 Subject: [PATCH 06/10] tc const tests --- src/main/java/Models/TradingCards.java | 25 +++++++++++-- src/test/java/Models/TradingCardTest.java | 44 ++++++++++++++++------- 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/src/main/java/Models/TradingCards.java b/src/main/java/Models/TradingCards.java index 1cc892f..601045f 100644 --- a/src/main/java/Models/TradingCards.java +++ b/src/main/java/Models/TradingCards.java @@ -3,8 +3,15 @@ public class TradingCards { private String game; private int rarity; - boolean isFromStartedDeck; - private int price; + private boolean isFromStartedDeck; + private double price; + + public TradingCards(String game, int rarity, boolean isFromStartedDeck, double price){ + this.game = game; + this.rarity = rarity; + this.isFromStartedDeck = isFromStartedDeck; + this.price = price; + } public void setGame(String game) { this.game = game; @@ -18,4 +25,18 @@ public void setRarity(int rarity) { public int getRarity() { return rarity; } + + public void setFromStarterDeck(boolean isFromStartedDeck) { + this.isFromStartedDeck = isFromStartedDeck; + } + public boolean getFromStarterDeck() { + return isFromStartedDeck; + } + + public void setPrice(double price) { + this.price = price; + } + public double getPrice() { + return price; + } } diff --git a/src/test/java/Models/TradingCardTest.java b/src/test/java/Models/TradingCardTest.java index 9369710..248e4d0 100644 --- a/src/test/java/Models/TradingCardTest.java +++ b/src/test/java/Models/TradingCardTest.java @@ -4,18 +4,36 @@ import org.junit.jupiter.api.Test; public class TradingCardTest { - @Test - public void setGameTest() { - String expected = "pokemon"; - TradingCards testGame = new TradingCards(); - testGame.setGame(expected); - Assertions.assertEquals(expected, testGame.getGame()); - } - @Test - public void setRarityTest() { - int expected = 5; - TradingCards testRarity = new TradingCards(); - testRarity.setRarity(expected); - Assertions.assertEquals(expected, testRarity.getRarity()); +// @Test +// public void setGameTest() { +// String expected = "pokemon"; +// TradingCards testGame = new TradingCards(); +// testGame.setGame(expected); +// Assertions.assertEquals(expected, testGame.getGame()); +// } +// @Test +// public void setRarityTest() { +// int expected = 5; +// TradingCards testRarity = new TradingCards(); +// testRarity.setRarity(expected); +// Assertions.assertEquals(expected, testRarity.getRarity()); +// } + @Test // (1) + public void constructorTest(){ + String exgame = "DnD"; + int exrarity = 6; + boolean exisFromStartedDeck = false; + double exprice = 15.00; + + TradingCards testCard = new TradingCards(exgame, exrarity, exisFromStartedDeck, + exprice); + + + Assertions.assertEquals(exgame, testCard.getGame()); + Assertions.assertEquals(exrarity, testCard.getRarity()); + Assertions.assertEquals(exisFromStartedDeck, testCard.getFromStarterDeck()); + Assertions.assertEquals(exprice, testCard.getPrice()); + } } + From c95fb989c9e07d39fcb9fa03ae1c23daa186da53 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Thu, 13 Feb 2020 18:06:25 -0500 Subject: [PATCH 07/10] dessert const tests --- src/main/java/Models/Desserts.java | 24 +++++++++++++- src/test/java/Models/DessertsTest.java | 45 ++++++++++++++++++-------- 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/src/main/java/Models/Desserts.java b/src/main/java/Models/Desserts.java index 83c8248..9312e97 100644 --- a/src/main/java/Models/Desserts.java +++ b/src/main/java/Models/Desserts.java @@ -2,10 +2,18 @@ public class Desserts { private String name; - private boolean servedCold; private double price; + private boolean servedCold; private boolean currentlyOnMenu; + public Desserts(String name, double price, boolean servedCold, boolean currentlyOnMenu){ + this.name = name; + this.price = price; + this.servedCold = servedCold; + this.currentlyOnMenu = currentlyOnMenu; + + } + public void setName(String name) { this.name = name; } @@ -18,4 +26,18 @@ public void setPrice(double price) { public double getPrice() { return price; } + + public void setServedCold(boolean servedCold) { + this.servedCold = servedCold; + } + public boolean getServedCold() { + return servedCold; + } + + public void setcurrentlyOnMenu(boolean currentlyOnMenu) { + this.currentlyOnMenu = currentlyOnMenu; + } + public boolean getcurrentlyOnMenu() { + return currentlyOnMenu; + } } diff --git a/src/test/java/Models/DessertsTest.java b/src/test/java/Models/DessertsTest.java index 5b05047..8192e31 100644 --- a/src/test/java/Models/DessertsTest.java +++ b/src/test/java/Models/DessertsTest.java @@ -4,18 +4,35 @@ import org.junit.jupiter.api.Test; public class DessertsTest { - @Test - public void setNameTest() { - String expected = "brownie"; - Desserts testDessert = new Desserts(); - testDessert.setName(expected); - Assertions.assertEquals(expected, testDessert.getName()); - } - @Test - public void setPriceTest() { - double expected = 3.00; - Desserts testDessert = new Desserts(); - testDessert.setPrice(expected); - Assertions.assertEquals(expected, testDessert.getPrice()); - } +// @Test +// public void setNameTest() { +// String expected = "brownie"; +// Desserts testDessert = new Desserts(); +// testDessert.setName(expected); +// Assertions.assertEquals(expected, testDessert.getName()); +// } +// @Test +// public void setPriceTest() { +// double expected = 3.00; +// Desserts testDessert = new Desserts(); +// testDessert.setPrice(expected); +// Assertions.assertEquals(expected, testDessert.getPrice()); +// } +@Test // (1) +public void constructorTest(){ + String exname = "icecream"; + double exprice = 4.00; + boolean exservedCold = true; + boolean excurrentlyOnMenu = false; + + Desserts testDessert = new Desserts(exname, exprice, exservedCold, + excurrentlyOnMenu); + + + Assertions.assertEquals(exname, testDessert.getName()); + Assertions.assertEquals(exprice, testDessert.getPrice()); + Assertions.assertEquals(exservedCold, testDessert.getServedCold()); + Assertions.assertEquals(excurrentlyOnMenu, testDessert.getcurrentlyOnMenu()); + +} } From db954f986e541f6fd26a6e82c5cea31534f5c938 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Thu, 13 Feb 2020 18:39:07 -0500 Subject: [PATCH 08/10] tc service and tests --- src/main/java/Models/TradingCards.java | 11 +++++- .../java/Services/TradingCardService.java | 34 +++++++++++++++++++ src/test/java/Models/TradingCardTest.java | 5 +-- .../Services/TradingCardsServiceTest.java | 32 +++++++++++++++++ 4 files changed, 79 insertions(+), 3 deletions(-) diff --git a/src/main/java/Models/TradingCards.java b/src/main/java/Models/TradingCards.java index 601045f..f852d56 100644 --- a/src/main/java/Models/TradingCards.java +++ b/src/main/java/Models/TradingCards.java @@ -1,18 +1,27 @@ package Models; public class TradingCards { + private int id; private String game; private int rarity; private boolean isFromStartedDeck; private double price; - public TradingCards(String game, int rarity, boolean isFromStartedDeck, double price){ + public TradingCards(int id, String game, int rarity, boolean isFromStartedDeck, double price){ + this.id = id; this.game = game; this.rarity = rarity; this.isFromStartedDeck = isFromStartedDeck; this.price = price; } + + public void setId(int id) { + this.id = id; + } + public int getId() { + return id; + } public void setGame(String game) { this.game = game; } diff --git a/src/main/java/Services/TradingCardService.java b/src/main/java/Services/TradingCardService.java index 1e389f5..61c1dfd 100644 --- a/src/main/java/Services/TradingCardService.java +++ b/src/main/java/Services/TradingCardService.java @@ -1,4 +1,38 @@ package Services; +import Models.TradingCards; + +import java.util.ArrayList; + public class TradingCardService { + private static int nextId = 1; // (1) + + private arrList inventory = new ArrayList(); // (2) + + public TradingCards create(String game, int rarity, boolean isFromStartedDeck, double price) { + + // (2) + TradingCards createdTradingCard = new TradingCards(nextId++, game, rarity, isFromStartedDeck, price); + + // (3) + inventory.add(createdTradingCard); + + // (4) + return createdTradingCard; + } + //read + public TradingCards findTradingCard(int id) { + // should take an int and return an object with that id, if exists + } + + //read all + public TradingCards[] findAll() { + // should return a basic array copy of the ArrayList + } + + //delete + public boolean delete(int id) { + // should remove the object with this id from the ArrayList if exits and return true. + // Otherwise return false + } } diff --git a/src/test/java/Models/TradingCardTest.java b/src/test/java/Models/TradingCardTest.java index 248e4d0..795fb3d 100644 --- a/src/test/java/Models/TradingCardTest.java +++ b/src/test/java/Models/TradingCardTest.java @@ -20,15 +20,16 @@ public class TradingCardTest { // } @Test // (1) public void constructorTest(){ + int exid = 5; String exgame = "DnD"; int exrarity = 6; boolean exisFromStartedDeck = false; double exprice = 15.00; - TradingCards testCard = new TradingCards(exgame, exrarity, exisFromStartedDeck, + TradingCards testCard = new TradingCards(exid, exgame, exrarity, exisFromStartedDeck, exprice); - + Assertions.assertEquals(exid, testCard.getId()); Assertions.assertEquals(exgame, testCard.getGame()); Assertions.assertEquals(exrarity, testCard.getRarity()); Assertions.assertEquals(exisFromStartedDeck, testCard.getFromStarterDeck()); diff --git a/src/test/java/Services/TradingCardsServiceTest.java b/src/test/java/Services/TradingCardsServiceTest.java index 7f0c0e1..5fe736c 100644 --- a/src/test/java/Services/TradingCardsServiceTest.java +++ b/src/test/java/Services/TradingCardsServiceTest.java @@ -1,4 +1,36 @@ package Services; +import Models.TradingCards; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + public class TradingCardsServiceTest { + @Test // (1) + public void createTest(){ + int exid = 5; + String exgame = "DnD"; + int exrarity = 6; + boolean exisFromStartedDeck = false; + double exprice = 15.00; + + TradingCardService tcService = new TradingCardService(); + TradingCards testCard = TradingCardService.create(exid, exgame, exrarity, exisFromStartedDeck, + exprice); + + int actualId = testCard.getId(); + String actualgame = testCard.getGame(); + int actualrarity = testCard.getRarity(); + boolean actualisFromStartedDeck = testCard.getFromStarterDeck(); + double actualprice = testCard.getPrice(); + + + + + Assertions.assertEquals(Integer.class.getName(), new Integer(actualId).getClass().getName()); + Assertions.assertEquals(exgame, actualgame); + Assertions.assertEquals(exrarity, actualrarity); + Assertions.assertEquals(exisFromStartedDeck, actualisFromStartedDeck); + Assertions.assertEquals(exprice, actualprice); + + } } From a24f83c50a04fae52bc480a022fa62fdd49a91f8 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Thu, 13 Feb 2020 18:52:15 -0500 Subject: [PATCH 09/10] dessert service and tests --- src/main/java/Models/Desserts.java | 11 ++++-- src/main/java/Services/DessertsService.java | 35 +++++++++++++++++++ src/test/java/Models/DessertsTest.java | 5 +-- .../java/Services/DessertsServiceTest.java | 33 +++++++++++++++++ 4 files changed, 80 insertions(+), 4 deletions(-) diff --git a/src/main/java/Models/Desserts.java b/src/main/java/Models/Desserts.java index 9312e97..dccd9ca 100644 --- a/src/main/java/Models/Desserts.java +++ b/src/main/java/Models/Desserts.java @@ -1,19 +1,26 @@ package Models; public class Desserts { + private int id; private String name; private double price; private boolean servedCold; private boolean currentlyOnMenu; - public Desserts(String name, double price, boolean servedCold, boolean currentlyOnMenu){ + public Desserts(int id, String name, double price, boolean servedCold, boolean currentlyOnMenu){ + this.id = id; this.name = name; this.price = price; this.servedCold = servedCold; this.currentlyOnMenu = currentlyOnMenu; } - + public void setId(int id) { + this.id = id; + } + public int getId() { + return id; + } public void setName(String name) { this.name = name; } diff --git a/src/main/java/Services/DessertsService.java b/src/main/java/Services/DessertsService.java index 0c1718f..5569f8f 100644 --- a/src/main/java/Services/DessertsService.java +++ b/src/main/java/Services/DessertsService.java @@ -1,4 +1,39 @@ package Services; +import Models.Desserts; +import Models.TradingCards; + +import java.util.ArrayList; + public class DessertsService { + private static int nextId = 1; // (1) + + private arrList inventory = new ArrayList(); // (2) + + public Desserts create(int id, String name, double price, boolean servedCold, boolean currentlyOnMenu) { + + // (2) + Desserts createdDessert = new Desserts(nextId++, name, price, servedCold, currentlyOnMenu); + + // (3) + inventory.add(createdDessert); + + // (4) + return createdDessert; + } + //read + public Desserts findTradingCard(int id) { + // should take an int and return an object with that id, if exists + } + + //read all + public Desserts[] findAll() { + // should return a basic array copy of the ArrayList + } + + //delete + public boolean delete(int id) { + // should remove the object with this id from the ArrayList if exits and return true. + // Otherwise return false + } } diff --git a/src/test/java/Models/DessertsTest.java b/src/test/java/Models/DessertsTest.java index 8192e31..0b7e714 100644 --- a/src/test/java/Models/DessertsTest.java +++ b/src/test/java/Models/DessertsTest.java @@ -20,15 +20,16 @@ public class DessertsTest { // } @Test // (1) public void constructorTest(){ + int exid = 6; String exname = "icecream"; double exprice = 4.00; boolean exservedCold = true; boolean excurrentlyOnMenu = false; - Desserts testDessert = new Desserts(exname, exprice, exservedCold, + Desserts testDessert = new Desserts(exid, exname, exprice, exservedCold, excurrentlyOnMenu); - + Assertions.assertEquals(exid, testDessert.getId()); Assertions.assertEquals(exname, testDessert.getName()); Assertions.assertEquals(exprice, testDessert.getPrice()); Assertions.assertEquals(exservedCold, testDessert.getServedCold()); diff --git a/src/test/java/Services/DessertsServiceTest.java b/src/test/java/Services/DessertsServiceTest.java index a03adc2..db0a2e4 100644 --- a/src/test/java/Services/DessertsServiceTest.java +++ b/src/test/java/Services/DessertsServiceTest.java @@ -1,4 +1,37 @@ package Services; +import Models.Desserts; +import Models.TradingCards; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + public class DessertsServiceTest { + @Test // (1) + public void createTest(){ + int exid = 6; + String exname = "icecream"; + double exprice = 4.00; + boolean exservedCold = true; + boolean excurrentlyOnMenu = false; + + DessertsService dService = new DessertsService(); + Desserts testDessert = TradingCardService.create(exid, exname, exprice, exservedCold, + excurrentlyOnMenu); + + int actualId = testDessert.getId(); + String actualname = testDessert.getName(); + double actualprice = testDessert.getPrice(); + boolean actualservedCold = testDessert.getServedCold(); + boolean actualcurrentlyOnMenu = testDessert.getcurrentlyOnMenu(); + + + + + Assertions.assertEquals(Integer.class.getName(), new Integer(actualId).getClass().getName()); + Assertions.assertEquals(exname, actualname); + Assertions.assertEquals(exprice, actualprice); + Assertions.assertEquals(exservedCold, actualservedCold); + Assertions.assertEquals(excurrentlyOnMenu, actualcurrentlyOnMenu); + + } } From 2c22b40b920c537cd3c390d39abeea09d74bf6dd Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Fri, 14 Feb 2020 16:16:27 -0500 Subject: [PATCH 10/10] don't understand most of 4 and 5. this will compile --- pom.xml | 11 ++++ src/main/java/App.java | 21 +++++++ src/main/java/Models/Desserts.java | 33 ++++++----- src/main/java/Models/TradingCards.java | 4 ++ src/main/java/Services/DessertsService.java | 30 +++++++--- .../java/Services/TradingCardService.java | 24 +++++++- src/main/java/io/Console.java | 12 ++++ src/test/java/Models/DessertsTest.java | 34 +++++------ src/test/java/Models/TradingCardTest.java | 22 +++---- .../java/Services/DessertsServiceTest.java | 57 +++++++++++++++---- .../Services/TradingCardsServiceTest.java | 39 ++++++++++++- 11 files changed, 219 insertions(+), 68 deletions(-) create mode 100644 src/main/java/App.java create mode 100644 src/main/java/io/Console.java diff --git a/pom.xml b/pom.xml index b36c574..9eddc3b 100644 --- a/pom.xml +++ b/pom.xml @@ -34,5 +34,16 @@ 5.4.2 test + + com.fasterxml.jackson.core + jackson-databind + 2.10.1 + + + junit + junit + 4.12 + test + \ No newline at end of file diff --git a/src/main/java/App.java b/src/main/java/App.java new file mode 100644 index 0000000..6fcb27e --- /dev/null +++ b/src/main/java/App.java @@ -0,0 +1,21 @@ +import Services.TradingCardService; +import io.Console; + +public class App { + private TradingCardService tradingCardService = new TradingCardService(); + public static void main(String[] args) { + +// App application = new App(); // (2) +// application.init(); // (3) +// +// +// public void init () { +// // (4) +// // application logic here +// // call methods to take user input and interface with services +// Console.printWelcome(); +// } + } + } + + diff --git a/src/main/java/Models/Desserts.java b/src/main/java/Models/Desserts.java index dccd9ca..60c75cb 100644 --- a/src/main/java/Models/Desserts.java +++ b/src/main/java/Models/Desserts.java @@ -1,18 +1,25 @@ package Models; public class Desserts { + + + private int id; private String name; private double price; - private boolean servedCold; - private boolean currentlyOnMenu; + private int popularity; + private int numServes; + + public Desserts(){ + + } - public Desserts(int id, String name, double price, boolean servedCold, boolean currentlyOnMenu){ + public Desserts(int id, String name, double price, int popularity, int numServes){ this.id = id; this.name = name; this.price = price; - this.servedCold = servedCold; - this.currentlyOnMenu = currentlyOnMenu; + this.popularity = popularity; + this.numServes = numServes; } public void setId(int id) { @@ -34,17 +41,17 @@ public double getPrice() { return price; } - public void setServedCold(boolean servedCold) { - this.servedCold = servedCold; + public void setpopularity(int popularity) { + this.popularity = popularity; } - public boolean getServedCold() { - return servedCold; + public int getpopularity() { + return popularity; } - public void setcurrentlyOnMenu(boolean currentlyOnMenu) { - this.currentlyOnMenu = currentlyOnMenu; + public void setnumServes(int numServes) { + this.numServes = numServes; } - public boolean getcurrentlyOnMenu() { - return currentlyOnMenu; + public int getnumServes() { + return numServes; } } diff --git a/src/main/java/Models/TradingCards.java b/src/main/java/Models/TradingCards.java index f852d56..ce735ae 100644 --- a/src/main/java/Models/TradingCards.java +++ b/src/main/java/Models/TradingCards.java @@ -7,6 +7,10 @@ public class TradingCards { private boolean isFromStartedDeck; private double price; + public TradingCards(){ + + } + public TradingCards(int id, String game, int rarity, boolean isFromStartedDeck, double price){ this.id = id; this.game = game; diff --git a/src/main/java/Services/DessertsService.java b/src/main/java/Services/DessertsService.java index 5569f8f..83f70a0 100644 --- a/src/main/java/Services/DessertsService.java +++ b/src/main/java/Services/DessertsService.java @@ -1,19 +1,18 @@ package Services; import Models.Desserts; -import Models.TradingCards; import java.util.ArrayList; -public class DessertsService { +public class DessertsService { private static int nextId = 1; // (1) - private arrList inventory = new ArrayList(); // (2) + private static ArrayList inventory = new ArrayList<>(); // (2) - public Desserts create(int id, String name, double price, boolean servedCold, boolean currentlyOnMenu) { + public static Desserts create(String name, double price, int popularity, int numServes) { // (2) - Desserts createdDessert = new Desserts(nextId++, name, price, servedCold, currentlyOnMenu); + Desserts createdDessert = new Desserts(nextId++, name, price, popularity, numServes); // (3) inventory.add(createdDessert); @@ -22,18 +21,35 @@ public Desserts create(int id, String name, double price, boolean servedCold, bo return createdDessert; } //read - public Desserts findTradingCard(int id) { + public Desserts findDessert(int id) { // should take an int and return an object with that id, if exists + for(int i=0; i inventory = new ArrayList(); // (2) - public TradingCards create(String game, int rarity, boolean isFromStartedDeck, double price) { + private static ArrayList inventory = new ArrayList<>(); // (2) + + public static TradingCards create(String game, int rarity, boolean isFromStartedDeck, double price) { // (2) TradingCards createdTradingCard = new TradingCards(nextId++, game, rarity, isFromStartedDeck, price); @@ -23,16 +26,33 @@ public TradingCards create(String game, int rarity, boolean isFromStartedDeck, d //read public TradingCards findTradingCard(int id) { // should take an int and return an object with that id, if exists + for(int i=0; i