Skip to content

Commit f3d7485

Browse files
mariavazquezssmariavazquezss
committed
Tests modifications
1 parent fd7ad04 commit f3d7485

File tree

7 files changed

+87
-77
lines changed

7 files changed

+87
-77
lines changed

‎api/.classpath‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@
3636
</attributes>
3737
</classpathentry>
3838
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
39+
<classpathentry kind="src" path="/terminalcli"/>
3940
<classpathentry kind="output" path="target/classes"/>
4041
</classpath>

‎api/src/test/java/coreapiTest/MenuTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010

1111
import coreapi.Menu;
1212
import coreapi.Product;
13-
import coreapi.ProductCatalog;
14-
13+
import data.ProductData;
14+
import coreapi.ProductImpl;
1515

1616
public class MenuTest
1717
{
1818
private Menu myMenu;
19-
private Product product1 = ProductCatalog.Instance().getProduct(0);
20-
private Product product2 = ProductCatalog.Instance().getProduct(1);
19+
private Product product1 = new ProductImpl(0,new BigDecimal(1),"Botella de agua 1l","Bebidas");
20+
private Product product2 = new ProductImpl(1,new BigDecimal(1.75),"Bocadillo de Tortilla","Bocadillos");
2121

2222
@Before
2323
public void setUp()
2424
{
25-
myMenu = new Menu(1, "Oro");
25+
myMenu = new Menu(1, "Oro", "Menu");
2626
}
2727

2828
@After
@@ -37,7 +37,7 @@ public void addProductToMenuCheck()
3737
myMenu.addProductToMenu(product1, 1);
3838
myMenu.addProductToMenu(product2, 4);
3939
Assert.assertTrue(myMenu.getProductsInMenu().contains(product1));
40-
Assert.assertEquals(4, myMenu.getProductQuantity(product2.getId()));
40+
Assert.assertEquals(4, myMenu.getProductQuantity(product2));
4141
}
4242

4343
@Test

‎api/src/test/java/coreapiTest/OrderFactoryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
public class OrderFactoryTest
1515
{
1616
private Order ord1, ord2;
17-
private Cafeteria cafet = new Cafeteria(0, "Santa Fe");
17+
private Cafeteria cafet = new Cafeteria(0, "Santa Fe", "[email protected]");
1818

1919
@Before
2020
public void setUp()

‎api/src/test/java/coreapiTest/OrderImplTest.java‎

Lines changed: 39 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
public class OrderImplTest {
1919

2020
private OrderImpl myOrder;
21-
private Cafeteria cafet = new Cafeteria(0, "Santa Fe");
22-
private Product product1 = ProductCatalog.Instance().getProduct(0);
23-
private Product product2 = ProductCatalog.Instance().getProduct(1);
21+
private Cafeteria cafet = new Cafeteria(0, "Santa Fe", "[email protected]");
22+
private Product product1 = new ProductImpl(0, new BigDecimal(1.2), "Patatas fritas", "Comida");
23+
private Product product2 = new ProductImpl(1, new BigDecimal(1.7), "Bacon-queso-huevo","Menu");
2424

2525
@Before
2626
public void setUp()
@@ -56,27 +56,27 @@ public void SetStatusCheck()
5656
@Test
5757
public void ContainsProductCheck()
5858
{
59-
Assert.assertFalse(myOrder.containsProduct(product1.getId()));
60-
myOrder.addProduct(product1.getId());
61-
Assert.assertTrue(myOrder.containsProduct(product1.getId()));
59+
Assert.assertFalse(myOrder.containsProduct(product1));
60+
myOrder.addProduct(product1);
61+
Assert.assertTrue(myOrder.containsProduct(product1));
6262
}
6363

6464
@Test
6565
public void ProductQuantityCheck()
6666
{
67-
Assert.assertEquals(0, myOrder.checkProductQuantity(product1.getId()));
68-
myOrder.addProduct(product1.getId());
69-
Assert.assertEquals(1, myOrder.checkProductQuantity(product1.getId()));
67+
Assert.assertEquals(0, myOrder.checkProductQuantity(product1));
68+
myOrder.addProduct(product1);
69+
Assert.assertEquals(1, myOrder.checkProductQuantity(product1));
7070
}
7171

7272
@Test
7373
public void GetProductsCheck()
7474
{
75-
myOrder.addProduct(product1.getId());
76-
myOrder.addProduct(product2.getId());
75+
myOrder.addProduct(product1);
76+
myOrder.addProduct(product2);
7777
List<Product> tempList = myOrder.getProducts();
78-
Assert.assertEquals(product1.getId(), tempList.get(tempList.indexOf(product1)).getId());
79-
Assert.assertEquals(product2.getId(), tempList.get(tempList.indexOf(product2)).getId());
78+
Assert.assertEquals(product1, tempList.get(tempList.indexOf(product1)));
79+
Assert.assertEquals(product2, tempList.get(tempList.indexOf(product2)));
8080
}
8181

8282
@Test
@@ -88,8 +88,8 @@ public void GetEmptyProductsCheck()
8888
@Test
8989
public void GetBasketCheck()
9090
{
91-
myOrder.addProduct(product1.getId(), 2);
92-
myOrder.addProduct(product2.getId(), 4);
91+
myOrder.addProduct(product1, 2);
92+
myOrder.addProduct(product2, 4);
9393
Map<Product, Integer> tempMap = myOrder.getBasket();
9494
Assert.assertEquals(2, tempMap.get(product1).intValue());
9595
Assert.assertEquals(4, tempMap.get(product2).intValue());
@@ -105,57 +105,54 @@ public void GetEmptyBasketCheck()
105105
@Test
106106
public void AddSingleProductCheck()
107107
{
108-
//Assert.assertFalse(myOrder.containsProduct(Product1.getId()));
109-
myOrder.addProduct(product1.getId());
110-
Assert.assertTrue(myOrder.containsProduct(product1.getId()));
108+
myOrder.addProduct(product1);
109+
Assert.assertTrue(myOrder.containsProduct(product1));
111110
}
112111

113112
@Test
114113
public void AddProductQuantityCheck()
115114
{
116-
//Assert.assertEquals(0, myOrder.checkProductQuantity(Product1.getId()));
117-
myOrder.addProduct(product1.getId(), 4);
118-
Assert.assertEquals(4, myOrder.checkProductQuantity(product1.getId()));
115+
myOrder.addProduct(product1, 4);
116+
Assert.assertEquals(4, myOrder.checkProductQuantity(product1));
119117
}
120118

121119
@Test
122120
public void AddNonPositiveProductQuantityCheck()
123121
{
124-
//Assert.assertEquals(0, myOrder.checkProductQuantity(Product1.getId()));
125-
myOrder.addProduct(product1.getId(), -4);
126-
Assert.assertFalse(myOrder.containsProduct(product1.getId()));
127-
myOrder.addProduct(product1.getId(), 0);
128-
Assert.assertFalse(myOrder.containsProduct(product1.getId()));
122+
myOrder.addProduct(product1, -4);
123+
Assert.assertFalse(myOrder.containsProduct(product1));
124+
myOrder.addProduct(product1, 0);
125+
Assert.assertFalse(myOrder.containsProduct(product1));
129126
}
130127

131128
@Test
132129
public void RemoveAllProductCheck()
133130
{
134-
myOrder.addProduct(product1.getId());
135-
myOrder.removeProduct(product1.getId());
136-
Assert.assertFalse(myOrder.containsProduct(product1.getId()));
131+
myOrder.addProduct(product1);
132+
myOrder.removeProduct(product1);
133+
Assert.assertFalse(myOrder.containsProduct(product1));
137134

138-
myOrder.addProduct(product1.getId(), 4);
139-
myOrder.removeProduct(product1.getId(), 5);
140-
Assert.assertFalse(myOrder.containsProduct(product1.getId()));
135+
myOrder.addProduct(product1, 4);
136+
myOrder.removeProduct(product1, 5);
137+
Assert.assertFalse(myOrder.containsProduct(product1));
141138
}
142139

143140
@Test
144141
public void RemoveProductQuantityCheck()
145142
{
146-
myOrder.addProduct(product1.getId(), 4);
147-
myOrder.removeProduct(product1.getId(), 1);
148-
Assert.assertEquals(3, myOrder.checkProductQuantity(product1.getId()));
143+
myOrder.addProduct(product1, 4);
144+
myOrder.removeProduct(product1, 1);
145+
Assert.assertEquals(3, myOrder.checkProductQuantity(product1));
149146
}
150147

151148
@Test
152149
public void RemoveNonPositiveProductQuantityCheck()
153150
{
154-
myOrder.addProduct(product1.getId(), 4);
155-
myOrder.removeProduct(product1.getId(), -4);
156-
Assert.assertEquals(4, myOrder.checkProductQuantity(product1.getId()));
157-
myOrder.removeProduct(product1.getId(), 0);
158-
Assert.assertEquals(4, myOrder.checkProductQuantity(product1.getId()));
151+
myOrder.addProduct(product1, 4);
152+
myOrder.removeProduct(product1, -4);
153+
Assert.assertEquals(4, myOrder.checkProductQuantity(product1));
154+
myOrder.removeProduct(product1, 0);
155+
Assert.assertEquals(4, myOrder.checkProductQuantity(product1));
159156
}
160157

161158
@Test
@@ -167,8 +164,8 @@ public void TotalCostEmptyCheck()
167164
@Test
168165
public void TotalCostCheck()
169166
{
170-
myOrder.addProduct(product1.getId(), 2);
171-
myOrder.addProduct(product2.getId(), 4);
167+
myOrder.addProduct(product1, 2);
168+
myOrder.addProduct(product2, 4);
172169

173170
BigDecimal product1Cost = product1.getPrice();
174171
BigDecimal product2Cost = product2.getPrice();

‎api/src/test/java/coreapiTest/OrderServiceTest.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ public class OrderServiceTest
1818
private OrderImpl myOrder;
1919
private OrderService ordSer;
2020
private LocalDate date;
21-
private Product product1 = ProductCatalog.Instance().getProduct(0);
22-
private Product product2 = ProductCatalog.Instance().getProduct(1);
23-
private Product product3 = ProductCatalog.Instance().getProduct(2);
21+
private Product product0 = new ProductImpl(0, new BigDecimal(1.2), "Patatas fritas", "Comida");
22+
private Product product1 = new ProductImpl(1, new BigDecimal(1.7), "Bacon-queso-huevo","Menu");
23+
private Product product2 = new ProductImpl(2, new BigDecimal(0.9), "Café con leche","Bebida");
2424

2525

2626
@Before
2727
public void setUp()
2828
{
29-
coffe = new Cafeteria(0, "Cafeteria de Santa Fe");
29+
coffe = new Cafeteria(0, "Cafeteria de Santa Fe","[email protected]");
3030
date = LocalDate.now();
31-
myOrder = (OrderImpl) OrderFactory.createOrder(coffe, date);
31+
myOrder = (OrderImpl) OrderFactory.createOrder(coffe);
3232
ordSer = new OrderService();
3333
coffe.registerOrder(myOrder);
3434

3535
// We introduce the products to the cafeteria with a certain stock
36-
coffe.registerProduct(product1, 8);
37-
coffe.registerProduct(product2, 35);
38-
coffe.registerProduct(product3, 30);
36+
coffe.registerProduct(product0, 8);
37+
coffe.registerProduct(product1, 35);
38+
coffe.registerProduct(product2, 30);
3939
}
4040

4141
@After
@@ -58,13 +58,13 @@ public void addProductToOrder_Correctly()
5858
{
5959
try
6060
{
61-
ordSer.addProductToOrder(coffe, myOrder, 1, 30);
61+
ordSer.addProductToOrder(coffe, myOrder, product1, 30);
6262
}
6363
catch(Exception e)
6464
{
6565
System.err.println(e.getMessage());
6666
}
67-
Assert.assertEquals(30, myOrder.checkProductQuantity(1));
67+
Assert.assertEquals(30, myOrder.checkProductQuantity(product1));
6868
}
6969

7070
@Test
@@ -74,9 +74,9 @@ public void addProductToOrder_Correctly()
7474
public void addProductToOrder_NoStock()
7575
{
7676
Assert.assertThrows(InsufficientStockException.class, () -> {
77-
ordSer.addProductToOrder(coffe, myOrder, 0, 10);
77+
ordSer.addProductToOrder(coffe, myOrder, product0, 10);
7878
});
79-
Assert.assertFalse(myOrder.containsProduct(0));
79+
Assert.assertFalse(myOrder.containsProduct(product0));
8080
}
8181

8282

@@ -91,15 +91,15 @@ public void removeProductFromOrder_Correctly()
9191
{
9292
try
9393
{
94-
ordSer.addProductToOrder(coffe, myOrder, 2, 15);
95-
ordSer.removeProductFromOrder(coffe, myOrder, 2, 10);
94+
ordSer.addProductToOrder(coffe, myOrder, product2, 15);
95+
ordSer.removeProductFromOrder(coffe, myOrder, product2, 10);
9696
}
9797
catch(Exception e)
9898
{
9999
System.err.println(e.getMessage());
100100
}
101101
Assert.assertEquals("The incorrect amount of product was removed from the order.", 5,
102-
myOrder.checkProductQuantity(2));
102+
myOrder.checkProductQuantity(product2));
103103
}
104104

105105
@Test
@@ -110,16 +110,16 @@ public void removeProductFromOrder_Correctly()
110110
public void removeProductFromOrder_NotEnoughQuantity()
111111
{
112112
try {
113-
ordSer.addProductToOrder(coffe, myOrder, 2, 1);
113+
ordSer.addProductToOrder(coffe, myOrder, product2, 1);
114114
}
115115
catch(Exception e)
116116
{
117117
System.err.println(e.getMessage());
118118
}
119119
Assert.assertThrows(InsufficientStockException.class, () -> {
120-
ordSer.removeProductFromOrder(coffe, myOrder, 2, 100);
120+
ordSer.removeProductFromOrder(coffe, myOrder, product2, 100);
121121
});
122-
Assert.assertEquals(1, myOrder.checkProductQuantity(2));
122+
Assert.assertEquals(1, myOrder.checkProductQuantity(product2));
123123
}
124124

125125
@Test
@@ -130,7 +130,7 @@ public void removeProductFromOrder_NotEnoughQuantity()
130130
public void removeProductFromOrder_NotInBasket()
131131
{
132132
Assert.assertThrows(ProductNotContainedInOrderException.class, () -> {
133-
ordSer.removeProductFromOrder(coffe, myOrder, 0, 4);
133+
ordSer.removeProductFromOrder(coffe, myOrder, product0, 4);
134134
});
135135

136136
}
@@ -190,23 +190,23 @@ public void checkInvalidSetOrderStatus_Finished()
190190
*/
191191
public void testGetDailyRegister()
192192
{
193-
OrderImpl auxOrder1 = (OrderImpl) OrderFactory.createOrder(coffe, date);
194-
OrderImpl auxOrder2 = (OrderImpl) OrderFactory.createOrder(coffe, date);
193+
OrderImpl auxOrder1 = (OrderImpl) OrderFactory.createOrder(coffe);
194+
OrderImpl auxOrder2 = (OrderImpl) OrderFactory.createOrder(coffe);
195195
coffe.registerOrder(auxOrder1);
196196
coffe.registerOrder(auxOrder2);
197197

198198
try {
199-
ordSer.addProductToOrder(coffe, myOrder, 0, 3);
200-
ordSer.addProductToOrder(coffe, myOrder, 1, 1);
201-
ordSer.addProductToOrder(coffe, auxOrder1, 1, 4);
202-
ordSer.addProductToOrder(coffe, auxOrder2, 2, 8);
199+
ordSer.addProductToOrder(coffe, myOrder, product0, 3);
200+
ordSer.addProductToOrder(coffe, myOrder, product1, 1);
201+
ordSer.addProductToOrder(coffe, auxOrder1, product1, 4);
202+
ordSer.addProductToOrder(coffe, auxOrder2, product2, 8);
203203
}
204204
catch (Exception e) { }
205205

206206
BigDecimal expectedRegister = BigDecimal.ZERO;
207207
expectedRegister = expectedRegister.add(myOrder.totalCost()).add(auxOrder1.totalCost()).add(auxOrder2.totalCost());
208208

209-
Assert.assertEquals(0, expectedRegister.compareTo(ordSer.getDailyRegister(coffe, date)));
209+
Assert.assertEquals(0, expectedRegister.compareTo(ordSer.getTotalDailyRegister(coffe, date)));
210210

211211
}
212212
}

‎api/src/test/java/coreapiTest/ProductImplTest.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
public class ProductImplTest
2020
{
21-
private ProductImpl myProduct = (ProductImpl) ProductCatalog.Instance().getProduct(0);
21+
private ProductImpl myProduct = new ProductImpl(0, new BigDecimal(1.2), "Patatas fritas", "Comida");
2222

2323
@Test
2424
public void IdCheckProductImpl()
@@ -37,4 +37,10 @@ public void NameCheckProductImpl()
3737
{
3838
Assert.assertEquals("DifferentNameAtProductImpl1", "Patatas fritas", myProduct.getName());
3939
}
40+
41+
@Test
42+
public void TypeCheckProductImpl()
43+
{
44+
Assert.assertEquals("DifferentTypeAtProductImpl1", "Comida", myProduct.getType());
45+
}
4046
}

‎api/src/test/java/coreapiTest/ProductTest.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
public class ProductTest
1818
{
19-
private Product myProduct = ProductCatalog.Instance().getProduct(3);
19+
private Product myProduct = new ProductImpl(3, new BigDecimal(0.5), "Doritos","Comida");
2020

2121
@Test
2222
public void IdCheckProduct()
@@ -35,4 +35,10 @@ public void NameCheckProduct()
3535
{
3636
Assert.assertEquals("DifferentNameAtProduct1", "Doritos", myProduct.getName());
3737
}
38+
39+
@Test
40+
public void TypeCheckProduct()
41+
{
42+
Assert.assertEquals("DifferentTypeAtProduct1", "Comida", myProduct.getType());
43+
}
3844
}

0 commit comments

Comments
 (0)