Added unit test for event registration web service.

Allowed null carrier movement id to be passed into HandlingEventService.register().

dddsample/src/main/java/se/citerus/dddsample/service/HandlingEventService.java

@@ -1,8 +1,8 @@
 package se.citerus.dddsample.service;
 
-import se.citerus.dddsample.domain.TrackingId;
 import se.citerus.dddsample.domain.CarrierMovementId;
 import se.citerus.dddsample.domain.HandlingEvent;
+import se.citerus.dddsample.domain.TrackingId;
 
 import java.util.Date;
 
@@ -16,11 +16,11 @@ public interface HandlingEventService {
   /**
    * @param completionTime when the event was completed, for example finished loading
    * @param trackingId tracking id
-   * @param carrierMovementId carrier movement
+   * @param carrierMovementId carrier movement id, if applicable (may be null)
    * @param unlocode United Nations Location Code for the location of the event
    * @param type type of event
    * @throws UnknownCarrierMovementIdException if there's not carrier movement with this id
-   * @throws se.citerus.dddsample.service.UnknownTrackingIdException if there's no cargo with this tracking id
+   * @throws UnknownTrackingIdException if there's no cargo with this tracking id
    */
   void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, String unlocode, HandlingEvent.Type type)
   throws UnknownCarrierMovementIdException, UnknownTrackingIdException;

dddsample/src/main/java/se/citerus/dddsample/service/HandlingEventServiceImpl.java

@@ -40,7 +40,9 @@ public class HandlingEventServiceImpl implements HandlingEventService {
   }
 
   private CarrierMovement findCarrierMovement(CarrierMovementId carrierMovementId) throws UnknownCarrierMovementIdException {
-    Validate.notNull(carrierMovementId, "Carrier ID is required");
+    if (carrierMovementId == null) {
+      return null;
+    }
     CarrierMovement carrierMovement = carrierMovementRepository.find(carrierMovementId);
     if (carrierMovement == null) {
       throw new UnknownCarrierMovementIdException(carrierMovementId);

dddsample/src/main/java/se/citerus/dddsample/ws/HandlingEventServiceEndpoint.java

@@ -9,6 +9,15 @@ import javax.jws.WebService;
 @WebService
 public interface HandlingEventServiceEndpoint {
 
+  /**
+   * Register an cargo handling event.
+   *
+   * @param completionTime time when event occured, for example a the loading of cargo was completed
+   * @param trackingId tracking id of the cargo
+   * @param carrierMovementId carrier movement id, if applicable
+   * @param unlocode United Nations Location Code for the location where the event occured
+   * @param eventType type of event
+   */
   void register(String completionTime, String trackingId, String carrierMovementId, String unlocode, String eventType);
 
 }

dddsample/src/main/java/se/citerus/dddsample/ws/HandlingEventServiceEndpointImpl.java

@@ -6,9 +6,9 @@ import se.citerus.dddsample.domain.CarrierMovementId;
 import se.citerus.dddsample.domain.HandlingEvent;
 import se.citerus.dddsample.domain.TrackingId;
 import se.citerus.dddsample.service.HandlingEventService;
+import se.citerus.dddsample.service.InvalidEventTypeException;
 import se.citerus.dddsample.service.UnknownCarrierMovementIdException;
 import se.citerus.dddsample.service.UnknownTrackingIdException;
-import se.citerus.dddsample.service.InvalidEventTypeException;
 
 import javax.jws.WebService;
 import java.text.ParseException;
@@ -20,20 +20,24 @@ public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEnd
 
   private HandlingEventService handlingEventService;
   private static final Log logger = LogFactory.getLog(HandlingEventServiceEndpointImpl.class);
-  private static final String ISO_8601_FORMAT = "yyyy-mm-dd HH:MM:SS.SSS";
+  protected static final String ISO_8601_FORMAT = "yyyy-mm-dd HH:MM:SS.SSS";
 
   public void register(String completionTime, String trackingId, String carrierMovementId,
                        String unlocode, String eventType) {
     try {
       Date date = parseIso8601Date(completionTime);
       TrackingId tid = new TrackingId(trackingId);
-      CarrierMovementId cid = new CarrierMovementId(carrierMovementId);
+      CarrierMovementId cid;
+      if (carrierMovementId != null) {
+        cid = new CarrierMovementId(carrierMovementId);
+      } else {
+        cid = null;
+      }
       HandlingEvent.Type type = parseEventType(eventType);
 
       handlingEventService.register(date, tid, cid, unlocode, type);
-      
     } catch (ParseException pe) {
-      logger.error("Invalid date format: " + completionTime);
+      logger.error("Invalid date format: " + completionTime + ", must be on ISO 8601 format: " + ISO_8601_FORMAT);
     } catch (UnknownTrackingIdException utid) {
       handleRetry(utid);
     } catch (UnknownCarrierMovementIdException ucmi) {

dddsample/src/test/java/se/citerus/dddsample/service/HandlingEventServiceTest.java

@@ -15,10 +15,10 @@ public class HandlingEventServiceTest extends TestCase {
   private CarrierMovementRepository carrierMovementRepository;
   private HandlingEventRepository handlingEventRepository;
   
-  private final Cargo cargoABC = new Cargo(new TrackingId("ABC"), new Location("ABCFROM"), new Location("ABCTO"));
-  private final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), new Location("XYZFROM"), new Location("XYZTO"));
+  private final Cargo cargoABC = new Cargo(new TrackingId("ABC"), new Location("AFROM"), new Location("ABCTO"));
+  private final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), new Location("XFROM"), new Location("XYZTO"));
   private final CarrierMovement cmAAA_BBB = new CarrierMovement(
-          new CarrierMovementId("CAR_001"), new Location("AAA"), new Location("BBB"));
+          new CarrierMovementId("CAR_001"), new Location("AAAAA"), new Location("BBBBB"));
 
   protected void setUp() throws Exception{
     service = new HandlingEventServiceImpl();
@@ -51,7 +51,21 @@ public class HandlingEventServiceTest extends TestCase {
     
     service.register(date, trackingId, carrierMovementId, "SESTO", HandlingEvent.Type.LOAD);
   }
+
+  public void testRegisterEventWithoutCarrierMovement() throws Exception {
+    final Date date = new Date();
+
+    final TrackingId trackingId = new TrackingId("ABC");
+    expect(cargoRepository.find(trackingId)).andReturn(cargoABC);
+
+    handlingEventRepository.save(isA(HandlingEvent.class));
+
+    replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
+
+    service.register(date, trackingId, null, "SESTO", HandlingEvent.Type.CLAIM);
+  }
   
+
   public void testRegisterEventInvalidCarrier() throws Exception {
     final Date date = new Date();
 
@@ -59,7 +73,7 @@ public class HandlingEventServiceTest extends TestCase {
     expect(carrierMovementRepository.find(carrierMovementId)).andReturn(null);
 
     final TrackingId trackingId = new TrackingId("XYZ");
-    expect(cargoRepository.find(trackingId)).andReturn(new Cargo(trackingId, new Location("FROM"), new Location("TO")));
+    expect(cargoRepository.find(trackingId)).andReturn(new Cargo(trackingId, new Location("FROMX"), new Location("TOYYY")));
 
     replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
     

dddsample/src/test/java/se/citerus/dddsample/ws/HandlinEventServiceEndpointTest.java

@@ -0,0 +1,90 @@
+package se.citerus.dddsample.ws;
+
+import junit.framework.TestCase;
+import static org.easymock.EasyMock.*;
+import se.citerus.dddsample.domain.CarrierMovementId;
+import se.citerus.dddsample.domain.HandlingEvent;
+import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.service.HandlingEventService;
+import se.citerus.dddsample.service.UnknownCarrierMovementIdException;
+import se.citerus.dddsample.service.UnknownTrackingIdException;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class HandlinEventServiceEndpointTest extends TestCase {
+
+  HandlingEventServiceEndpointImpl endpoint;
+  HandlingEventService handlingEventService;
+  SimpleDateFormat sdf;
+
+  protected void setUp() throws Exception {
+    endpoint = new HandlingEventServiceEndpointImpl();
+    handlingEventService = createMock(HandlingEventService.class);
+    endpoint.setHandlingEventService(handlingEventService);
+    sdf = new SimpleDateFormat(HandlingEventServiceEndpointImpl.ISO_8601_FORMAT);
+  }
+
+  public void testRegisterValidEvent() throws Exception {
+    Date date = new Date(100);
+
+    handlingEventService.register(date, new TrackingId("FOO"), new CarrierMovementId("CAR_456"), "CNHKG", HandlingEvent.Type.LOAD);
+    replay(handlingEventService);
+
+    // Tested call
+    endpoint.register(sdf.format(date), "FOO", "CAR_456", "CNHKG", "LOAD");
+  }
+
+
+  public void testRegisterUnknownTrackingId() throws Exception {
+    Date date = new Date(100);
+
+    TrackingId trackingId = new TrackingId("NOTFOUND");
+
+      handlingEventService.register(date, trackingId, null, "SESTO", HandlingEvent.Type.CLAIM);
+    expectLastCall().andThrow(new UnknownTrackingIdException(trackingId));
+    replay(handlingEventService);
+
+    // Tested call
+    endpoint.register(sdf.format(date), "NOTFOUND", null, "SESTO", "CLAIM");
+  }
+
+  public void testRegisterUnknownCarrierMovementId() throws Exception {
+      Date date = new Date(100);
+
+      TrackingId trackingId = new TrackingId("XYZ");
+      CarrierMovementId carrierMovementId = new CarrierMovementId("NOTFOUND");
+
+      handlingEventService.register(date, trackingId, carrierMovementId, "AUMEL", HandlingEvent.Type.UNLOAD);
+      expectLastCall().andThrow(new UnknownCarrierMovementIdException(carrierMovementId));
+      replay(handlingEventService);
+
+      // Tested call
+      endpoint.register(sdf.format(date), "XYZ", "NOTFOUND", "AUMEL", "UNLOAD");
+  }
+
+  public void testRegisterInvalidEventType() throws Exception {
+      Date date = new Date(100);
+      
+      replay(handlingEventService);
+
+      // Tested call
+      // Note: currently, every error is silently swallowed.
+      endpoint.register(sdf.format(date), "XYZ", "CAR_333", "AUMEL", "NO_SUCH_EVENT_TYPE");
+  }
+
+    public void testRegisterInvalidDateFormat() throws Exception {
+        Date date = new Date(100);
+
+        replay(handlingEventService);
+
+        // Tested call
+        // Note: currently, every error is silently swallowed.
+        endpoint.register("1 2 3 4", "XYZ", "CAR_333", "AUMEL", "LOAD");
+    }
+
+
+  protected void tearDown() throws Exception {
+    verify(handlingEventService);
+  }
+}