Skip to content

Commit

Permalink
Created order status tests.
Browse files Browse the repository at this point in the history 
removed unnecessary tearDown method from OrderDaoTest
Changed data sets to match the updated DB schema
changed table name to "DESCRIPTIONS" in product.java (model)
  • Loading branch information
@alextsil
alextsil committed Jan 5, 2014
1 parent 9762204 commit 549ad74
Show file tree
Hide file tree
Showing 7 changed files with 100 additions and 58 deletions.
4 changes: 2 additions & 2 deletions QorderWS/src/main/java/com/qorder/qorderws/model/product/Product.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class Product {
private BigDecimal price = new BigDecimal(0);

@ElementCollection(fetch = FetchType.EAGER)
@CollectionTable(name = "DESCRIPTION", joinColumns = @JoinColumn(name = "PRODUCT_ID"))
@CollectionTable(name = "DESCRIPTIONS", joinColumns = @JoinColumn(name = "PRODUCT_ID"))
@Column(name = "DESCRIPTION")
private List<String> descriptions = new ArrayList<String>();

Expand Down Expand Up @@ -116,4 +116,4 @@ public boolean equals(Object obj) {
return false;
return true;
}
}
}
42 changes: 31 additions & 11 deletions QorderWS/src/test/java/com/qorder/qorderws/dao/OrderDaoTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import com.qorder.qorderws.exception.BusinessDoesNotExistException;
import com.qorder.qorderws.exception.OrderDoesNotExistException;
import com.qorder.qorderws.model.order.EOrderStatus;
import com.qorder.qorderws.model.order.Order;

@RunWith(SpringJUnit4ClassRunner.class)
Expand Down Expand Up @@ -58,36 +59,55 @@ public void setUp() throws Exception {
this.order = new Order();
}

@After
public void tearDown() throws Exception {
IDatabaseConnection connection = new DatabaseDataSourceConnection(testDataSource);
DatabaseOperation.DELETE.execute(connection, getDataSet());
}

@Test
public void testFetchOrderForBusiness() throws BusinessDoesNotExistException{
List<Order> orderList= new ArrayList<Order>();
orderList = this.testOrderDAO.fetchOrderForBusiness(1);
assertEquals("25", orderList.get(0).getTableNumber());
assertEquals(2, orderList.size());

}

@Test
public void testSave() throws BusinessDoesNotExistException, OrderDoesNotExistException {
this.order.setTableNumber("50");
this.testOrderDAO.save(this.order);
assertEquals("50", this.testOrderDAO.findById(3).getTableNumber());
}
this.order.setTableNumber("50");
this.testOrderDAO.save(this.order);
//Warning : change the ID each time you add an order in the DbunitOrders.xml file.
assertEquals("50", this.testOrderDAO.findById(6).getTableNumber());
}

@Test
public void testFindById() throws OrderDoesNotExistException {
assertEquals("25",this.testOrderDAO.findById(1).getTableNumber());
}

@Test(expected=OrderDoesNotExistException.class)
public void testFindByIdDoesntExist() throws OrderDoesNotExistException {
public void testFindByIdDoesntExist() throws OrderDoesNotExistException {
this.testOrderDAO.findById(3000);
}

@Test
public void testFetchPendingOrdersForBusiness() throws BusinessDoesNotExistException {
List<Order> orderList= new ArrayList<Order>();
orderList = this.testOrderDAO.fetchOrdersByStatus(2, EOrderStatus.PENDING);
assertEquals(2, orderList.size());
assertEquals("15", orderList.get(0).getTableNumber());
}

@Test
public void testFetchAcceptedOrdersForBusiness() throws BusinessDoesNotExistException {
List<Order> orderList= new ArrayList<Order>();
orderList = this.testOrderDAO.fetchOrdersByStatus(1, EOrderStatus.ACCEPTED);
assertEquals(2, orderList.size());
assertEquals("25", orderList.get(0).getTableNumber());
}

@Test
public void testFetchServicedOrdersForBusiness() throws BusinessDoesNotExistException {
List<Order> orderList= new ArrayList<Order>();
orderList = this.testOrderDAO.fetchOrdersByStatus(2, EOrderStatus.SERVICED);
assertEquals(1, orderList.size());
assertEquals("17", orderList.get(0).getTableNumber());
}

}
2 changes: 1 addition & 1 deletion QorderWS/src/test/java/com/qorder/qorderws/dao/RunAllTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

@RunWith(Suite.class)
@SuiteClasses({ BusinessDaoTest.class, CategoryDaoTest.class,
ProductDaoTest.class })
ProductDaoTest.class, OrderDaoTest.class })
public class RunAllTests {

}
16 changes: 8 additions & 8 deletions QorderWS/src/test/resources/Dbunit/DbunitBusinesses.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<dataset>
<BUSINESS BUSINESS_ID="1" NAME="Jumbo1" />
<BUSINESS BUSINESS_ID="2" NAME="Jumbo2" />
<BUSINESS BUSINESS_ID="3" NAME="Jumbo3" />
<BUSINESS BUSINESS_ID="4" NAME="Jumbo4" />
<BUSINESS BUSINESS_ID="5" NAME="Jumbo5" />
<BUSINESS BUSINESS_ID="6" NAME="Jumbo6" />
<BUSINESS BUSINESS_ID="7" NAME="Jumbo7" />
<BUSINESS BUSINESS_ID="8" NAME="Jumbo8" />
<BUSINESSES BUSINESS_ID="1" NAME="Jumbo1" />
<BUSINESSES BUSINESS_ID="2" NAME="Jumbo2" />
<BUSINESSES BUSINESS_ID="3" NAME="Jumbo3" />
<BUSINESSES BUSINESS_ID="4" NAME="Jumbo4" />
<BUSINESSES BUSINESS_ID="5" NAME="Jumbo5" />
<BUSINESSES BUSINESS_ID="6" NAME="Jumbo6" />
<BUSINESSES BUSINESS_ID="7" NAME="Jumbo7" />
<BUSINESSES BUSINESS_ID="8" NAME="Jumbo8" />


</dataset>
31 changes: 15 additions & 16 deletions QorderWS/src/test/resources/Dbunit/DbunitCategories.xml
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<dataset>
<BUSINESS BUSINESS_ID="1" NAME="Jumbo1" />
<BUSINESS BUSINESS_ID="2" NAME="Jumbo2" />
<BUSINESS BUSINESS_ID="3" NAME="Jumbo3" />
<BUSINESS BUSINESS_ID="4" NAME="Jumbo4" />
<BUSINESSES BUSINESS_ID="1" NAME="Jumbo1" />
<BUSINESSES BUSINESS_ID="2" NAME="Jumbo2" />
<BUSINESSES BUSINESS_ID="3" NAME="Jumbo3" />
<BUSINESSES BUSINESS_ID="4" NAME="Jumbo4" />


<PRODUCT_CATEGORY PRODUCT_CATEGORY_ID="1" NAME="Jumbo1mpyres" BUSINESS_ID="1" />
<PRODUCT_CATEGORY PRODUCT_CATEGORY_ID="2" NAME="Jumbo1Kafes2" BUSINESS_ID="1" />
<PRODUCT_CATEGORY PRODUCT_CATEGORY_ID="3" NAME="Jumbo1Kafes3" BUSINESS_ID="1" />
<PRODUCT_CATEGORY PRODUCT_CATEGORY_ID="4" NAME="Jumbo1Kafes4" BUSINESS_ID="1" />
<PRODUCT_CATEGORY PRODUCT_CATEGORY_ID="5" NAME="Jumbo1Kafes5" BUSINESS_ID="1" />
<PRODUCT_CATEGORY PRODUCT_CATEGORY_ID="6" NAME="Jumbo1Kafes6" BUSINESS_ID="1" />
<PRODUCT_CATEGORY PRODUCT_CATEGORY_ID="7" NAME="Jumbo1Kafes4" BUSINESS_ID="2" />
<PRODUCT_CATEGORY PRODUCT_CATEGORY_ID="8" NAME="Jumbo1Kafes4" BUSINESS_ID="3" />
<PRODUCT_CATEGORY PRODUCT_CATEGORY_ID="9" NAME="Jumbo1Kafes5" BUSINESS_ID="4" />
<PRODUCT_CATEGORY PRODUCT_CATEGORY_ID="10" NAME="Jumbo1Kafes6" BUSINESS_ID="4" />


<PRODUCT_CATEGORIES PRODUCT_CATEGORY_ID="1" NAME="Jumbo1mpyres" BUSINESS_ID="1" />
<PRODUCT_CATEGORIES PRODUCT_CATEGORY_ID="2" NAME="Jumbo1Kafes2" BUSINESS_ID="1" />
<PRODUCT_CATEGORIES PRODUCT_CATEGORY_ID="3" NAME="Jumbo1Kafes3" BUSINESS_ID="1" />
<PRODUCT_CATEGORIES PRODUCT_CATEGORY_ID="4" NAME="Jumbo1Kafes4" BUSINESS_ID="1" />
<PRODUCT_CATEGORIES PRODUCT_CATEGORY_ID="5" NAME="Jumbo1Kafes5" BUSINESS_ID="1" />
<PRODUCT_CATEGORIES PRODUCT_CATEGORY_ID="6" NAME="Jumbo1Kafes6" BUSINESS_ID="1" />
<PRODUCT_CATEGORIES PRODUCT_CATEGORY_ID="7" NAME="Jumbo1Kafes4" BUSINESS_ID="2" />
<PRODUCT_CATEGORIES PRODUCT_CATEGORY_ID="8" NAME="Jumbo1Kafes4" BUSINESS_ID="3" />
<PRODUCT_CATEGORIES PRODUCT_CATEGORY_ID="9" NAME="Jumbo1Kafes5" BUSINESS_ID="4" />
<PRODUCT_CATEGORIES PRODUCT_CATEGORY_ID="10" NAME="Jumbo1Kafes6" BUSINESS_ID="4" />


</dataset>
41 changes: 32 additions & 9 deletions QorderWS/src/test/resources/Dbunit/DbunitOrders.xml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<dataset>
<BUSINESS BUSINESS_ID="1" NAME="Jumbo1" />

<BUSINESSES BUSINESS_ID="1" NAME="Jumbo1" />

<BUSINESSES BUSINESS_ID="2" NAME="Jumbo2" />

<PRODUCT_CATEGORIES PRODUCT_CATEGORY_ID="1" NAME="Jumbo1mpyres" BUSINESS_ID="1" />
<PRODUCT_CATEGORIES PRODUCT_CATEGORY_ID="2" NAME="Jumbo2mpyres" BUSINESS_ID="2" />

<PRODUCT_CATEGORY PRODUCT_CATEGORY_ID="1" NAME="Jumbo1mpyres" BUSINESS_ID="1" />
<PRODUCTS PRODUCT_ID="1" NAME="MPYRA1" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCTS PRODUCT_ID="2" NAME="MPYRA2" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />

<PRODUCT PRODUCT_ID="1" NAME="MPYRA1" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCT PRODUCT_ID="2" NAME="MPYRA2" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCTS PRODUCT_ID="3" NAME="MPYRA3" PRICE="2.5" PRODUCT_CATEGORY_ID="2" />
<PRODUCTS PRODUCT_ID="4" NAME="MPYRA4" PRICE="2.5" PRODUCT_CATEGORY_ID="2" />

<DESCRIPTIONS PRODUCT_ID="1" DESCRIPTION="MIKRH1" />
<DESCRIPTIONS PRODUCT_ID="1" DESCRIPTION="MEGALH1" />
<DESCRIPTIONS PRODUCT_ID="2" DESCRIPTION="MIKRH2" />
<DESCRIPTIONS PRODUCT_ID="2" DESCRIPTION="MEGALH2" />

<DESCRIPTIONS PRODUCT_ID="3" DESCRIPTION="MIKRH3" />
<DESCRIPTIONS PRODUCT_ID="3" DESCRIPTION="MEGALH3" />
<DESCRIPTIONS PRODUCT_ID="4" DESCRIPTION="MIKRH4" />
<DESCRIPTIONS PRODUCT_ID="4" DESCRIPTION="MEGALH4" />

<ORDERS ORDER_ID="1" DATE_TIME="9999-12-31 23:59:59" ORDER_STATUS="1" TABLE_NUMBER="25" TOTAL_PRICE="1" BUSINESS_ID="1" />
<ORDERS ORDER_ID="2" DATE_TIME="9999-12-31 23:59:59" ORDER_STATUS="1" TABLE_NUMBER="30" TOTAL_PRICE="1" BUSINESS_ID="1" />

<PRODUCT_HOLDER PRODUCT_HOLDER_ID="1" COMMENTS="comment1" PRODUCT_QUANTITY="1" SELECTED_ATTRIBUTES="" PRODUCT_ID="1" ORDER_ID="1" />
<PRODUCT_HOLDER PRODUCT_HOLDER_ID="2" COMMENTS="comment2" PRODUCT_QUANTITY="1" SELECTED_ATTRIBUTES="" PRODUCT_ID="2" ORDER_ID="1" />
<ORDERS ORDER_ID="3" DATE_TIME="9999-12-31 23:59:59" ORDER_STATUS="0" TABLE_NUMBER="15" TOTAL_PRICE="1" BUSINESS_ID="2" />
<ORDERS ORDER_ID="4" DATE_TIME="9999-12-31 23:59:59" ORDER_STATUS="0" TABLE_NUMBER="16" TOTAL_PRICE="1" BUSINESS_ID="2" />
<ORDERS ORDER_ID="5" DATE_TIME="9999-12-31 23:59:59" ORDER_STATUS="2" TABLE_NUMBER="17" TOTAL_PRICE="1" BUSINESS_ID="2" />

<PRODUCT_HOLDER PRODUCT_HOLDER_ID="3" COMMENTS="comment3" PRODUCT_QUANTITY="1" SELECTED_ATTRIBUTES="" PRODUCT_ID="1" ORDER_ID="2" />
<PRODUCT_HOLDER PRODUCT_HOLDER_ID="4" COMMENTS="comment4" PRODUCT_QUANTITY="1" SELECTED_ATTRIBUTES="" PRODUCT_ID="2" ORDER_ID="2" />
<PRODUCT_HOLDERS PRODUCT_HOLDER_ID="1" COMMENTS="comment1" PRODUCT_QUANTITY="1" SELECTED_ATTRIBUTES="" PRODUCT_ID="1" ORDER_ID="1" />
<PRODUCT_HOLDERS PRODUCT_HOLDER_ID="2" COMMENTS="comment2" PRODUCT_QUANTITY="1" SELECTED_ATTRIBUTES="" PRODUCT_ID="2" ORDER_ID="1" />
<PRODUCT_HOLDERS PRODUCT_HOLDER_ID="3" COMMENTS="comment3" PRODUCT_QUANTITY="1" SELECTED_ATTRIBUTES="" PRODUCT_ID="1" ORDER_ID="2" />
<PRODUCT_HOLDERS PRODUCT_HOLDER_ID="4" COMMENTS="comment4" PRODUCT_QUANTITY="1" SELECTED_ATTRIBUTES="" PRODUCT_ID="2" ORDER_ID="2" />


<PRODUCT_HOLDERS PRODUCT_HOLDER_ID="5" COMMENTS="comment5" PRODUCT_QUANTITY="1" SELECTED_ATTRIBUTES="" PRODUCT_ID="3" ORDER_ID="3" />
<PRODUCT_HOLDERS PRODUCT_HOLDER_ID="6" COMMENTS="comment6" PRODUCT_QUANTITY="1" SELECTED_ATTRIBUTES="" PRODUCT_ID="4" ORDER_ID="4" />
<PRODUCT_HOLDERS PRODUCT_HOLDER_ID="7" COMMENTS="comment7" PRODUCT_QUANTITY="1" SELECTED_ATTRIBUTES="" PRODUCT_ID="4" ORDER_ID="5" />

</dataset>
22 changes: 11 additions & 11 deletions QorderWS/src/test/resources/Dbunit/DbunitProducts.xml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<dataset>
<BUSINESS BUSINESS_ID="1" NAME="Jumbo1" />
<BUSINESSES BUSINESS_ID="1" NAME="Jumbo1" />

<PRODUCT_CATEGORY PRODUCT_CATEGORY_ID="1" NAME="Jumbo1mpyres" BUSINESS_ID="1" />
<PRODUCT_CATEGORIES PRODUCT_CATEGORY_ID="1" NAME="Jumbo1mpyres" BUSINESS_ID="1" />


<PRODUCT PRODUCT_ID="1" NAME="MPYRA1" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCT PRODUCT_ID="2" NAME="MPYRA2" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCT PRODUCT_ID="3" NAME="MPYRA3" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCT PRODUCT_ID="4" NAME="MPYRA4" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCT PRODUCT_ID="5" NAME="MPYRA4" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCT PRODUCT_ID="6" NAME="MPYRA4" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCT PRODUCT_ID="7" NAME="MPYRA4" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCTS PRODUCT_ID="1" NAME="MPYRA1" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCTS PRODUCT_ID="2" NAME="MPYRA2" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCTS PRODUCT_ID="3" NAME="MPYRA3" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCTS PRODUCT_ID="4" NAME="MPYRA4" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCTS PRODUCT_ID="5" NAME="MPYRA4" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCTS PRODUCT_ID="6" NAME="MPYRA4" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />
<PRODUCTS PRODUCT_ID="7" NAME="MPYRA4" PRICE="3.5" PRODUCT_CATEGORY_ID="1" />

<DESCRIPTION PRODUCT_ID="1" DESCRIPTION="MIKRH" />
<DESCRIPTION PRODUCT_ID="1" DESCRIPTION="MEGALI" />
<DESCRIPTIONS PRODUCT_ID="1" DESCRIPTION="MIKRH" />
<DESCRIPTIONS PRODUCT_ID="1" DESCRIPTION="MEGALI" />

</dataset>

0 comments on commit 549ad74

Please sign in to comment.