Added unit test for ItineraryCandidateDTOAssembler.

Changed the addEvent mentod of CargoTrackingDTO to take strings instead of a DTO.

Optimized imports.

dddsample/src/main/java/se/citerus/dddsample/service/dto/CargoTrackingDTO.java

@@ -5,6 +5,7 @@ import se.citerus.dddsample.domain.StatusCode;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -46,8 +47,9 @@ public final class CargoTrackingDTO implements Serializable {
     this.events = new ArrayList<HandlingEventDTO>();
   }
 
-  public void addEvent(final HandlingEventDTO handlingEvent) {
-    events.add(handlingEvent);
+  public void addEvent(final String location, final String type, final String carrier, final Date time,
+                       final boolean expected) {
+    events.add(new HandlingEventDTO(location, type, carrier, time, expected));
   }
 
   /**

dddsample/src/main/java/se/citerus/dddsample/service/dto/assembler/CargoTrackingDTOAssembler.java

@@ -2,7 +2,6 @@ package se.citerus.dddsample.service.dto.assembler;
 
 import se.citerus.dddsample.domain.*;
 import se.citerus.dddsample.service.dto.CargoTrackingDTO;
-import se.citerus.dddsample.service.dto.HandlingEventDTO;
 
 import java.util.List;
 
@@ -29,18 +28,13 @@ public class CargoTrackingDTOAssembler {
     for (HandlingEvent event : events) {
       final CarrierMovement cm = event.carrierMovement();
       final String carrierIdString = (cm == null) ? "" : cm.carrierMovementId().idString();
-      dto.addEvent(toHandlingEventDTO(cargo, event, carrierIdString));
+      dto.addEvent(event.location().toString(),
+        event.type().toString(),
+        carrierIdString,
+        event.completionTime(),
+        cargo.itinerary().isExpected(event));
     }
     return dto;
   }
 
-  protected HandlingEventDTO toHandlingEventDTO(final Cargo cargo, HandlingEvent event, String carrierIdString) {
-    return new HandlingEventDTO(
-      event.location().toString(),
-      event.type().toString(),
-      carrierIdString,
-      event.completionTime(),
-      cargo.itinerary().isExpected(event)
-    );
-  }
 }

dddsample/src/main/java/se/citerus/dddsample/service/dto/assembler/ItineraryCandidateDTOAssembler.java

@@ -24,10 +24,10 @@ public class ItineraryCandidateDTOAssembler {
   }
 
   protected LegDTO toLegDTO(final Leg leg) {
-    final CarrierMovementId id = leg.carrierMovement().carrierMovementId();
+    final CarrierMovementId carrierMovementId = leg.carrierMovement().carrierMovementId();
     final UnLocode from = leg.from().unLocode();
     final UnLocode to = leg.to().unLocode();
-    return new LegDTO(id.idString(), from.idString(), to.idString());
+    return new LegDTO(carrierMovementId.idString(), from.idString(), to.idString());
   }
 
 }

dddsample/src/test/java/se/citerus/dddsample/service/dto/assembler/CargoRoutingDTOAssemblerTest.java

@@ -5,7 +5,6 @@ import se.citerus.dddsample.domain.*;
 import static se.citerus.dddsample.domain.SampleLocations.*;
 import se.citerus.dddsample.service.dto.CargoRoutingDTO;
 import se.citerus.dddsample.service.dto.LegDTO;
-import se.citerus.dddsample.service.dto.assembler.CargoRoutingDTOAssembler;
 
 public class CargoRoutingDTOAssemblerTest extends TestCase {
 

dddsample/src/test/java/se/citerus/dddsample/service/dto/assembler/ItineraryCandidateDTOAssemblerTest.java

@@ -0,0 +1,38 @@
+package se.citerus.dddsample.service.dto.assembler;
+
+import junit.framework.TestCase;
+import se.citerus.dddsample.domain.*;
+import static se.citerus.dddsample.domain.SampleLocations.*;
+import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.service.dto.LegDTO;
+
+public class ItineraryCandidateDTOAssemblerTest extends TestCase {
+
+  public void testToDTO() throws Exception {
+    final ItineraryCandidateDTOAssembler assembler = new ItineraryCandidateDTOAssembler();
+
+    final Location origin = STOCKHOLM;
+    final Location destination = MELBOURNE;
+
+    final CarrierMovement cm = new CarrierMovement(
+      new CarrierMovementId("ABC"), origin, destination);
+
+    final Itinerary itinerary = new Itinerary(
+      new Leg(cm, origin, SHANGHAI),
+      new Leg(cm, ROTTERDAM, destination)
+    );
+
+    final ItineraryCandidateDTO dto = assembler.toDTO(itinerary);
+
+    assertEquals(2, dto.getLegs().size());
+    LegDTO legDTO = dto.getLegs().get(0);
+    assertEquals("ABC", legDTO.getCarrierMovementId());
+    assertEquals("SESTO", legDTO.getFrom());
+    assertEquals("CNSHA", legDTO.getTo());
+
+    legDTO = dto.getLegs().get(1);
+    assertEquals("ABC", legDTO.getCarrierMovementId());
+    assertEquals("NLRTM", legDTO.getFrom());
+    assertEquals("AUMEL", legDTO.getTo());
+  }
+}

dddsample/src/test/java/se/citerus/dddsample/web/CargoTrackingControllerTest.java

@@ -15,7 +15,6 @@ import static se.citerus.dddsample.domain.SampleLocations.TOKYO;
 import se.citerus.dddsample.service.CargoService;
 import se.citerus.dddsample.service.dto.CargoRoutingDTO;
 import se.citerus.dddsample.service.dto.CargoTrackingDTO;
-import se.citerus.dddsample.service.dto.HandlingEventDTO;
 import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.web.command.TrackCommand;
 
@@ -57,12 +56,11 @@ public class CargoTrackingControllerTest extends TestCase {
           "AAAAA",
           "BALO",
           false);
-        cargoDTO.addEvent(new HandlingEventDTO(
-          event.location().unLocode().idString(),
+        cargoDTO.addEvent(event.location().unLocode().idString(),
           event.type().toString(),
           null,
           event.completionTime(),
-          true));
+          true);
         return cargoDTO;
       }
     };