gaspersic/java-design-patterns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Incorporated review changes - 1) Created sql file for central schema 2)

Browse Source 
Changed getById return type to Optional
This commit is contained in:
Narendra Pathai
2016-03-28 11:55:22 +05:30
parent f32a3892a3
commit ddbc61b140
7 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dao/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.java
View File

@@ -46,8 +46,7 @@ public class DbCustomerDaoTest {
public void createSchema() throws SQLException {
try (Connection connection = DriverManager.getConnection(DB_URL);
Statement statement = connection.createStatement()) {
statement.execute("CREATE TABLE CUSTOMERS (ID NUMBER, FNAME VARCHAR(100),"
+ " LNAME VARCHAR(100))");
statement.execute(CustomerSchemaSql.CREATE_SCHEMA_SQL);
}
}
@@ -85,7 +84,7 @@ public class DbCustomerDaoTest {
assertTrue(result);
assertCustomerCountIs(2);
assertEquals(nonExistingCustomer, dao.getById(nonExistingCustomer.getId()));
assertEquals(nonExistingCustomer, dao.getById(nonExistingCustomer.getId()).get());
}
@Test
@@ -106,12 +105,12 @@ public class DbCustomerDaoTest {
boolean result = dao.update(customer);
assertFalse(result);
assertNull(dao.getById(nonExistingId));
assertFalse(dao.getById(nonExistingId).isPresent());
}
@Test
public void retrieveShouldReturnNull() throws Exception {
assertNull(dao.getById(getNonExistingCustomerId()));
public void retrieveShouldReturnNoCustomer() throws Exception {
assertFalse(dao.getById(getNonExistingCustomerId()).isPresent());
}
}
@@ -130,7 +129,7 @@ public class DbCustomerDaoTest {
assertFalse(result);
assertCustomerCountIs(1);
assertEquals(existingCustomer, dao.getById(existingCustomer.getId()));
assertEquals(existingCustomer, dao.getById(existingCustomer.getId()).get());
}
@Test
@@ -139,7 +138,7 @@ public class DbCustomerDaoTest {
assertTrue(result);
assertCustomerCountIs(0);
assertNull(dao.getById(existingCustomer.getId()));
assertFalse(dao.getById(existingCustomer.getId()).isPresent());
}
@Test
@@ -151,7 +150,7 @@ public class DbCustomerDaoTest {
assertTrue(result);
final Customer cust = dao.getById(existingCustomer.getId());
final Customer cust = dao.getById(existingCustomer.getId()).get();
assertEquals(newFirstname, cust.getFirstName());
assertEquals(newLastname, cust.getLastName());
}
@@ -207,12 +206,12 @@ public class DbCustomerDaoTest {
}
@Test
public void retrievingACustomerByIdReturnsNull() throws Exception {
public void retrievingACustomerByIdFailsWithExceptionAsFeedbackToClient() throws Exception {
dao.getById(existingCustomer.getId());
}
@Test
public void retrievingAllCustomersReturnsAnEmptyStream() throws Exception {
public void retrievingAllCustomersFailsWithExceptionAsFeedbackToClient() throws Exception {
dao.getAll();
}
@@ -226,7 +225,7 @@ public class DbCustomerDaoTest {
public void deleteSchema() throws SQLException {
try (Connection connection = DriverManager.getConnection(DB_URL);
Statement statement = connection.createStatement()) {
statement.execute("DROP TABLE CUSTOMERS");
statement.execute(CustomerSchemaSql.DELETE_SCHEMA_SQL);
}
}

25
dao/src/test/java/com/iluwatar/dao/InMemoryCustomerDaoTest.java
View File

@@ -29,6 +29,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
import java.util.Optional;
import java.util.stream.Stream;
import org.junit.Before;
@@ -49,7 +50,7 @@ public class InMemoryCustomerDaoTest {
@Before
public void setUp() {
dao = new InMemoryCustomerDao();
dao.add(CUSTOMER);
assertTrue(dao.add(CUSTOMER));
}
/**
@@ -69,7 +70,7 @@ public class InMemoryCustomerDaoTest {
assertTrue(result);
assertCustomerCountIs(2);
assertEquals(nonExistingCustomer, dao.getById(nonExistingCustomer.getId()));
assertEquals(nonExistingCustomer, dao.getById(nonExistingCustomer.getId()).get());
}
@Test
@@ -90,12 +91,12 @@ public class InMemoryCustomerDaoTest {
boolean result = dao.update(customer);
assertFalse(result);
assertNull(dao.getById(nonExistingId));
assertFalse(dao.getById(nonExistingId).isPresent());
}
@Test
public void retrieveShouldReturnNull() throws Exception {
assertNull(dao.getById(getNonExistingCustomerId()));
public void retrieveShouldReturnNoCustomer() throws Exception {
assertFalse(dao.getById(getNonExistingCustomerId()).isPresent());
}
}
@@ -111,7 +112,7 @@ public class InMemoryCustomerDaoTest {
assertFalse(result);
assertCustomerCountIs(1);
assertEquals(CUSTOMER, dao.getById(CUSTOMER.getId()));
assertEquals(CUSTOMER, dao.getById(CUSTOMER.getId()).get());
}
@Test
@@ -120,7 +121,7 @@ public class InMemoryCustomerDaoTest {
assertTrue(result);
assertCustomerCountIs(0);
assertNull(dao.getById(CUSTOMER.getId()));
assertFalse(dao.getById(CUSTOMER.getId()).isPresent());
}
@Test
@@ -132,10 +133,18 @@ public class InMemoryCustomerDaoTest {
assertTrue(result);
final Customer cust = dao.getById(CUSTOMER.getId());
final Customer cust = dao.getById(CUSTOMER.getId()).get();
assertEquals(newFirstname, cust.getFirstName());
assertEquals(newLastname, cust.getLastName());
}
@Test
public void retriveShouldReturnTheCustomer() {
Optional<Customer> optionalCustomer = dao.getById(CUSTOMER.getId());
assertTrue(optionalCustomer.isPresent());
assertEquals(CUSTOMER, optionalCustomer.get());
}
}
/**