Brought tests up to speed with code changes.

dddsample/pom.xml

@@ -128,7 +128,7 @@
           </execution>
         </executions>
         <configuration>
-          <sei>se.citerus.dddsample.interfaces.handling.HandlingEventServiceEndpointImpl</sei>
+          <sei>se.citerus.dddsample.interfaces.handling.ws.HandlingReportServiceImpl</sei>
           <genWsdl>true</genWsdl>
         </configuration>
       </plugin>

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

@@ -5,6 +5,7 @@ import static org.easymock.EasyMock.*;
 import se.citerus.dddsample.application.impl.HandlingEventServiceImpl;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
+import se.citerus.dddsample.domain.model.cargo.RouteSpecification;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.carrier.SampleVoyages;
 import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
@@ -28,9 +29,9 @@ public class HandlingEventServiceTest extends TestCase {
   private LocationRepository locationRepository;
   private HandlingEventFactory handlingEventFactory;
 
-  private final Cargo cargoABC = new Cargo(new TrackingId("ABC"), HAMBURG, TOKYO);
+  private final Cargo cargoABC = new Cargo(new TrackingId("ABC"), new RouteSpecification(HAMBURG, TOKYO, new Date()));
 
-  private final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), HONGKONG, HELSINKI);
+  private final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), new RouteSpecification(HONGKONG, HELSINKI, new Date()));
 
   protected void setUp() throws Exception{
     cargoRepository = createMock(CargoRepository.class);

dddsample/src/test/java/se/citerus/dddsample/application/RoutingServiceTest.java

@@ -46,8 +46,8 @@ public class RoutingServiceTest extends TestCase {
 
   public void testCalculatePossibleRoutes() {
     TrackingId trackingId = new TrackingId("ABC");
-    Cargo cargo = new Cargo(trackingId, HONGKONG, HELSINKI);
-    RouteSpecification routeSpecification = new RouteSpecification(cargo.origin(), cargo.destination(), new Date());
+    RouteSpecification routeSpecification = new RouteSpecification(HONGKONG, HELSINKI, new Date());
+    Cargo cargo = new Cargo(trackingId, routeSpecification);
 
     expect(voyageRepository.find(isA(VoyageNumber.class))).andStubReturn(SampleVoyages.CM002);
     

dddsample/src/test/java/se/citerus/dddsample/domain/model/cargo/CargoTest.java

@@ -2,8 +2,6 @@ package se.citerus.dddsample.domain.model.cargo;
 
 import junit.framework.TestCase;
 import static se.citerus.dddsample.domain.model.cargo.RoutingStatus.*;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.carrier.Schedule;
 import se.citerus.dddsample.domain.model.carrier.Voyage;
 import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
@@ -23,11 +21,11 @@ public class CargoTest extends TestCase {
   protected void setUp() throws Exception {
     events = new HashSet<HandlingEvent>();
 
-    voyage = new Voyage(new VoyageNumber("0123"), new Schedule(Arrays.asList(
-      new CarrierMovement(STOCKHOLM, HAMBURG, new Date(), new Date()),
-      new CarrierMovement(HAMBURG, HONGKONG, new Date(), new Date()),
-      new CarrierMovement(HONGKONG, MELBOURNE, new Date(), new Date())
-    )));
+    voyage = new Voyage.Builder(new VoyageNumber("0123"), STOCKHOLM).
+      addMovement(HAMBURG, new Date(), new Date()).
+      addMovement(HONGKONG, new Date(), new Date()).
+      addMovement(MELBOURNE, new Date(), new Date()).
+      build();
   }
 
   public void testRoutingStatus() throws Exception {
@@ -118,8 +116,9 @@ public class CargoTest extends TestCase {
     cargo.setDeliveryHistory(new Delivery(events));
     assertFalse(cargo.isUnloadedAtDestination());
 
-    CarrierMovement cm1 = new CarrierMovement(HANGZOU, NEWYORK, new Date(), new Date());
-    Voyage voyage = new Voyage(new VoyageNumber("0123"), new Schedule(Arrays.asList(cm1)));
+    Voyage voyage = new Voyage.Builder(new VoyageNumber("0123"), HANGZOU).
+      addMovement(NEWYORK, new Date(), new Date()).
+      build();
 
     // Adding an unload event, but not at the final destination
     events.add(

dddsample/src/test/java/se/citerus/dddsample/domain/model/cargo/ItineraryTest.java

@@ -2,7 +2,6 @@ package se.citerus.dddsample.domain.model.cargo;
 
 import junit.framework.TestCase;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.carrier.Schedule;
 import se.citerus.dddsample.domain.model.carrier.Voyage;
 import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
@@ -22,18 +21,22 @@ public class ItineraryTest extends TestCase {
   Voyage voyage, wrongVoyage;
 
   protected void setUp() throws Exception {
-    voyage = new Voyage(new VoyageNumber("0123"), new Schedule(Arrays.asList(
-      abc, def, ghi, jkl
-    )));
-    wrongVoyage = new Voyage(new VoyageNumber("666"), new Schedule(Arrays.asList(
-      new CarrierMovement(NEWYORK, STOCKHOLM, new Date(), new Date()),
-      new CarrierMovement(STOCKHOLM, HELSINKI, new Date(), new Date())
-    )));
+    voyage = new Voyage.Builder(new VoyageNumber("0123"), SHANGHAI).
+      addMovement(ROTTERDAM, new Date(), new Date()).
+      addMovement(GOTHENBURG, new Date(), new Date()).
+      build();
+
+    wrongVoyage = new Voyage.Builder(new VoyageNumber("666"), NEWYORK).
+      addMovement(STOCKHOLM, new Date(), new Date()).
+      addMovement(HELSINKI, new Date(), new Date()).
+      build();
   }
 
   public void testCargoOnTrack() throws Exception {
 
-    Cargo cargo = new Cargo(new TrackingId("CARGO1"), SHANGHAI, GOTHENBURG);
+    TrackingId trackingId = new TrackingId("CARGO1");
+    RouteSpecification routeSpecification = new RouteSpecification(SHANGHAI, GOTHENBURG, new Date());
+    Cargo cargo = new Cargo(trackingId, routeSpecification);
 
     Itinerary itinerary = new Itinerary(
       Arrays.asList(

dddsample/src/test/java/se/citerus/dddsample/domain/model/cargo/RouteSpecificationTest.java

@@ -8,16 +8,10 @@ import java.util.Date;
 
 public class RouteSpecificationTest extends TestCase {
 
-  private Cargo cargo;
-
-  public void setUp() {
-    cargo = new Cargo(new TrackingId("AAA"), HONGKONG, CHICAGO);
-  }
-
   public void testIsSatisfiedBySuccess() {
-    RouteSpecification spec = new RouteSpecification(cargo.origin(), cargo.destination(), new Date());
+    RouteSpecification routeSpecification = new RouteSpecification(HONGKONG, CHICAGO, new Date());
     Itinerary itinerary = new Itinerary();
-    assertTrue(spec.isSatisfiedBy(itinerary));
+    assertTrue(routeSpecification.isSatisfiedBy(itinerary));
   }
 
   public void testIsSatisfiedByInvalidDate() {

dddsample/src/test/java/se/citerus/dddsample/domain/model/handling/HandlingEventFactoryTest.java

@@ -4,6 +4,7 @@ import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
+import se.citerus.dddsample.domain.model.cargo.RouteSpecification;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM001;
 import se.citerus.dddsample.domain.model.carrier.Voyage;
@@ -37,7 +38,8 @@ public class HandlingEventFactoryTest extends TestCase {
 
 
     trackingId = new TrackingId("ABC");
-    cargo = new Cargo(trackingId, TOKYO, HELSINKI);
+    RouteSpecification routeSpecification = new RouteSpecification(TOKYO, HELSINKI, new Date());
+    cargo = new Cargo(trackingId, routeSpecification);
   }
 
   public void testCreateHandlingEventWithCarrierMovement() throws Exception {

dddsample/src/test/java/se/citerus/dddsample/domain/model/handling/HandlingEventTest.java

@@ -2,6 +2,7 @@ package se.citerus.dddsample.domain.model.handling;
 
 import junit.framework.TestCase;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
+import se.citerus.dddsample.domain.model.cargo.RouteSpecification;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.carrier.SampleVoyages;
 import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM003;
@@ -13,7 +14,13 @@ import static java.util.Arrays.asList;
 import java.util.Date;
 
 public class HandlingEventTest extends TestCase {
-  private final Cargo cargo = new Cargo(new TrackingId("XYZ"), HONGKONG, NEWYORK);
+  private Cargo cargo;
+
+  protected void setUp() throws Exception {
+    TrackingId trackingId = new TrackingId("XYZ");
+    RouteSpecification routeSpecification = new RouteSpecification(HONGKONG, NEWYORK, new Date());
+    cargo = new Cargo(trackingId, routeSpecification);
+  }
 
   public void testNewWithCarrierMovement() throws Exception {
 

dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CargoRepositoryTest.java

@@ -2,7 +2,11 @@ package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
 import se.citerus.dddsample.application.util.SampleDataGenerator;
 import se.citerus.dddsample.domain.model.cargo.*;
-import se.citerus.dddsample.domain.model.carrier.*;
+import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM004;
+import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.HELSINKI_TO_HONGKONG;
+import se.citerus.dddsample.domain.model.carrier.Voyage;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
+import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.LOAD;
 import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.RECEIVE;
@@ -11,7 +15,10 @@ import se.citerus.dddsample.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 import se.citerus.dddsample.domain.model.location.UnLocode;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 public class CargoRepositoryTest extends AbstractRepositoryTest {
 
@@ -46,9 +53,7 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
 
     HandlingEvent secondEvent = events.get(1);
 
-    Voyage voyage = new Voyage(new VoyageNumber("0303"), new Schedule(new ArrayList<CarrierMovement>()));
-
-    assertHandlingEvent(cargo,  secondEvent, LOAD, HONGKONG, 150, 110, voyage);
+    assertHandlingEvent(cargo, secondEvent, LOAD, HONGKONG, 150, 110, HELSINKI_TO_HONGKONG);
 
     List<Leg> legs = cargo.itinerary().legs();
     assertEquals(3, legs.size());
@@ -116,7 +121,7 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
 
     Location legFrom = locationRepository.find(new UnLocode("FIHEL"));
     Location legTo = locationRepository.find(new UnLocode("DEHAM"));
-    Itinerary newItinerary = new Itinerary(Arrays.asList(new Leg(SampleVoyages.CM004, legFrom, legTo, new Date(), new Date())));
+    Itinerary newItinerary = new Itinerary(Arrays.asList(new Leg(CM004, legFrom, legTo, new Date(), new Date())));
 
     cargo.assignToRoute(newItinerary);
 

dddsample/src/test/java/se/citerus/dddsample/infrastructure/routing/ExternalRoutingServiceTest.java

@@ -45,8 +45,8 @@ public class ExternalRoutingServiceTest extends TestCase {
 
   public void testCalculatePossibleRoutes() {
     TrackingId trackingId = new TrackingId("ABC");
-    Cargo cargo = new Cargo(trackingId, HONGKONG, HELSINKI);
-    RouteSpecification routeSpecification = new RouteSpecification(cargo.origin(), cargo.destination(), new Date());
+    RouteSpecification routeSpecification = new RouteSpecification(HONGKONG, HELSINKI, new Date());
+    Cargo cargo = new Cargo(trackingId, routeSpecification);
 
     expect(voyageRepository.find(isA(VoyageNumber.class))).andStubReturn(SampleVoyages.CM002);
     

dddsample/src/test/java/se/citerus/dddsample/interfaces/handling/HandlinEventServiceEndpointTest.java

@@ -1,48 +0,0 @@
-package se.citerus.dddsample.interfaces.handling;
-
-import junit.framework.TestCase;
-import static org.easymock.EasyMock.*;
-import se.citerus.dddsample.application.HandlingEventRegistrationAttempt;
-import se.citerus.dddsample.application.SystemEvents;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class HandlinEventServiceEndpointTest extends TestCase {
-
-  private HandlingEventServiceEndpointImpl endpoint;
-  private SimpleDateFormat sdf = new SimpleDateFormat(HandlingEventServiceEndpointImpl.ISO_8601_FORMAT);
-  private Date date = new Date(100);
-  private SystemEvents systemEvents;
-
-  protected void setUp() throws Exception {
-    endpoint = new HandlingEventServiceEndpointImpl();
-
-    systemEvents = createMock(SystemEvents.class);
-    endpoint.setSystemEvents(systemEvents);
-  }
-
-  public void testRegisterValidEvent() throws Exception {
-    systemEvents.receivedHandlingEventRegistrationAttempt(isA(HandlingEventRegistrationAttempt.class));
-    replay(systemEvents);
-
-    // Tested call
-    endpoint.register(sdf.format(date), "FOO", "CAR_456", "CNHKG", "LOAD");
-  }
-
-  public void testRegisterInalidEvent() throws Exception {
-    replay(systemEvents);
-
-    // Tested call
-    try {
-      endpoint.register("NOT_A_DATE", "", "", "NOT_A_UN_LOCODE", "NOT_A_TYPE");
-      fail("Should not accept invalid ");
-    } catch (Exception expected) {
-      System.err.println(expected);
-    }
-  }
-
-  protected void tearDown() throws Exception {
-    verify(systemEvents);
-  }
-}

dddsample/src/test/java/se/citerus/dddsample/scenario/CargoHandlingScenarioTest.java

@@ -49,15 +49,17 @@ public class CargoHandlingScenarioTest extends TestCase {
 
     // Cargo from Hongkong to Stockholm (skipping the booking procedure here)
     TrackingId trackingId = generateTrackingId();
+
     Location origin = HONGKONG;
     Location destination = STOCKHOLM;
-    cargo = new Cargo(trackingId, origin, destination);
+    Date arrivalDeadline = inTwoWeeks();
+    RouteSpecification routeSpecification = new RouteSpecification(origin, destination, arrivalDeadline);
 
+    cargo = new Cargo(trackingId, routeSpecification);
 
     assertEquals(RoutingStatus.NOT_ROUTED, cargo.routingStatus());
 
     // Route cargo
-    RouteSpecification routeSpecification = new RouteSpecification(cargo.origin(), cargo.destination(), inTwoWeeks());
     List<Itinerary> itineraries = routingService.fetchRoutesForSpecification(routeSpecification);
     Itinerary itinerary = selectPreferedItinerary(itineraries);
     cargo.assignToRoute(itinerary);

dddsample/src/test/java/se/citerus/dddsample/scenario/TrackingScenarioTest.java

@@ -1,10 +1,7 @@
 package se.citerus.dddsample.scenario;
 
 import junit.framework.TestCase;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;
-import se.citerus.dddsample.domain.model.cargo.Delivery;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
+import se.citerus.dddsample.domain.model.cargo.*;
 import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM001;
 import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM002;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
@@ -40,7 +37,9 @@ public class TrackingScenarioTest extends TestCase {
   }
 
   private Cargo populateCargo() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, MELBOURNE);
+    final TrackingId trackingId = new TrackingId("XYZ");
+    final RouteSpecification routeSpecification = new RouteSpecification(STOCKHOLM, MELBOURNE, new Date());
+    final Cargo cargo = new Cargo(trackingId, routeSpecification);
 
     final List<HandlingEvent> handlingEventList = Arrays.asList(
       new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), LOAD, STOCKHOLM, CM001),

dddsample/src/test/resources/handling_events.csv

@@ -0,0 +1,3 @@
+2008-10-29 12:30:00.000	ZYX	V100	SESTO	LOAD
+2008-10-31 04:00:00.000	ZYX	V100	HELSINKI	UNLOAD
+2008-10-31 08:12:00.000	ZYX	HELSINKI	UNLOAD