Improved testing of reports.

dddsample/external/reporting/src/main/java/com.reporting/ReportingService.java

@@ -4,6 +4,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowCallbackHandler;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.dao.DataAccessException;
 
 import javax.sql.DataSource;
 import javax.ws.rs.GET;
@@ -83,7 +84,11 @@ public class ReportingService {
   private VoyageReport loadVoyageReport(String voyageNumber) {
     String[] args = {voyageNumber};
     String sql = "select * from voyage where voyage_number = ?";
-    return (VoyageReport) jdbc.queryForObject(sql, args, rowMapper);
+    try {
+      return (VoyageReport) jdbc.queryForObject(sql, args, rowMapper);
+    } catch (EmptyResultDataAccessException e) {
+      return null;
+    }
   }
 
   ReportingService() {

dddsample/external/reporting/src/main/java/com.reporting/VoyageReport.java

@@ -6,20 +6,12 @@ import java.util.Date;
 @XmlRootElement(name = "voyage")
 public class VoyageReport {
 
-  private Date lastUpdatedOn;
   private String voyageNumber;
   private String nextStop;
-  private Date etaNextStop;
+  private String etaNextStop;
   private String currentStatus;
   private int delayedByMinutes;
-
-  public Date getLastUpdatedOn() {
-    return lastUpdatedOn;
-  }
-
-  public void setLastUpdatedOn(Date lastUpdatedOn) {
-    this.lastUpdatedOn = lastUpdatedOn;
-  }
+  private String lastUpdatedOn;
 
   public String getVoyageNumber() {
     return voyageNumber;
@@ -37,11 +29,11 @@ public class VoyageReport {
     this.nextStop = nextStop;
   }
 
-  public Date getEtaNextStop() {
+  public String getEtaNextStop() {
     return etaNextStop;
   }
 
-  public void setEtaNextStop(Date etaNextStop) {
+  public void setEtaNextStop(String etaNextStop) {
     this.etaNextStop = etaNextStop;
   }
 
@@ -60,4 +52,13 @@ public class VoyageReport {
   public void setDelayedByMinutes(int delayedByMinutes) {
     this.delayedByMinutes = delayedByMinutes;
   }
+
+  public String getLastUpdatedOn() {
+    return lastUpdatedOn;
+  }
+
+  public void setLastUpdatedOn(String lastUpdatedOn) {
+    this.lastUpdatedOn = lastUpdatedOn;
+  }
+
 }

dddsample/external/reporting/src/main/java/com.reporting/VoyageReportRowMapper.java

@@ -5,6 +5,8 @@ import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import static com.reporting.Constants.*;
+
 class VoyageReportRowMapper implements ParameterizedRowMapper<VoyageReport> {
   @Override
   public VoyageReport mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -12,8 +14,8 @@ class VoyageReportRowMapper implements ParameterizedRowMapper<VoyageReport> {
     voyageReport.setVoyageNumber(rs.getString("voyage_number"));
     voyageReport.setCurrentStatus(rs.getString("current_status"));
     voyageReport.setDelayedByMinutes(rs.getInt("delayed_by_min"));
-    voyageReport.setEtaNextStop(rs.getDate("eta_next_stop"));
-    voyageReport.setLastUpdatedOn(rs.getDate("last_updated_on"));
+    voyageReport.setEtaNextStop(US_DATETIME.format(rs.getTimestamp("eta_next_stop")));
+    voyageReport.setLastUpdatedOn(US_DATETIME.format(rs.getTimestamp("last_updated_on")));
     voyageReport.setNextStop(rs.getString("next_stop"));
     return voyageReport;
   }

dddsample/external/reporting/src/test/java/com/reporting/ReportServiceTest.java

@@ -21,7 +21,7 @@ import java.io.IOException;
 public class ReportServiceTest {
 
   @Test
-  public void deliveryReport() throws Exception {
+  public void cargoReport() throws Exception {
     JSONObject json = readJSON("/report/cargo/ABC");
     JSONObject cargo = json.getJSONObject("cargo");
     
@@ -44,6 +44,29 @@ public class ReportServiceTest {
     verifyHandling(handlings.getJSONObject(3), "Load", "Long Beach", "V0200");
   }
 
+  @Test
+  public void cargoNotFound() throws Exception {
+    assertEquals("", readString("/report/cargo/NOSUCH"));
+  }
+
+  @Test
+  public void voyageReport() throws Exception {
+    JSONObject json = readJSON("/report/voyage/V0200");
+    JSONObject voyage = json.getJSONObject("voyage");
+
+    assertEquals("V0200", voyage.get("voyageNumber"));
+    assertEquals("Seattle", voyage.get("nextStop"));
+    assertEquals("6/7/09 12:45 PM", voyage.get("etaNextStop"));
+    assertEquals("In transit", voyage.get("currentStatus"));
+    assertEquals(0, voyage.get("delayedByMinutes"));
+    assertEquals("6/6/09 2:01 PM", voyage.get("lastUpdatedOn"));
+  }
+
+  @Test
+  public void voyageNotFound() throws Exception {
+    assertEquals("", readString("/report/voyage/NOSUCH"));
+  }
+
   private void verifyHandling(JSONObject handling, String type, String location, String voyage) throws JSONException {
     assertEquals(type, handling.get("type"));
     assertEquals(location, handling.get("location"));
@@ -54,18 +77,14 @@ public class ReportServiceTest {
     }
   }
 
-  @Test
-  public void voyageReport() throws Exception {
-    JSONObject json = readJSON("/report/voyage/V0200");
-    JSONObject voyage = json.getJSONObject("voyage");
-
-    assertEquals("V0200", voyage.get("voyageNumber"));
+  private JSONObject readJSON(String path) throws IOException, JSONException {
+    String jsonString = readString(path);
+    return new JSONObject(jsonString);
   }
 
-  private JSONObject readJSON(String path) throws IOException, JSONException {
+  private String readString(String path) throws IOException {
     URLConnection urlConnection = new URL("http://localhost:14000" + path).openConnection();
-    String jsonString = IOUtils.toString(urlConnection.getInputStream());
-    return new JSONObject(jsonString);
+    return IOUtils.toString(urlConnection.getInputStream());
   }
 
 }

dddsample/external/reporting/src/test/resources/testdata.sql

@@ -39,14 +39,13 @@ insert into voyage (
   current_status,
   delayed_by_min,
   last_updated_on
-)
-values (
+) values (
   'V0100',
   'Honolulu',
-  '',
+  '2009-06-10 04:25:00.000',
   'In port',
-  '300',
-  ''
+  '1400',
+  '2009-06-06 14:01:22.331'
 );
 
 insert into voyage (
@@ -56,12 +55,11 @@ insert into voyage (
   current_status,
   delayed_by_min,
   last_updated_on
-)
-values (
+) values (
   'V0200',
   'Seattle',
-  '',
+  '2009-06-07 12:45:00.000',
   'In transit',
   '0',
-  ''
+  '2009-06-06 14:01:19.901'
 );