Minor scenario test improvments

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/voyage/SampleVoyages.java

@@ -1,14 +1,14 @@
 package se.citerus.dddsample.tracking.core.domain.model.voyage;
 
-import static se.citerus.dddsample.tracking.core.application.util.DateTestUtil.toDate;
-import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
-
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static se.citerus.dddsample.tracking.core.application.util.DateTestUtil.toDate;
+import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
+
 /**
  * Sample carrier movements, for test purposes.
  */
@@ -42,11 +42,11 @@ public class SampleVoyages {
 
   public final static Voyage continental3 = new Voyage.Builder(new VoyageNumber("CNT3"), SEATTLE).
     addMovement(CHICAGO, toDate("2009-03-06"), toDate("2009-03-08")).
-    addMovement(NEWYORK, toDate("2009-03-10"), toDate("2009-03-14")).
+    addMovement(NEWYORK, toDate("2009-03-10"), toDate("2009-03-13")).
     build();
 
   public final static Voyage atlantic1 = new Voyage.Builder(new VoyageNumber("ATC1"), NEWYORK).
-      addMovement(ROTTERDAM, toDate("2009-03-15"), toDate("2009-03-18")).
+      addMovement(ROTTERDAM, toDate("2009-03-13"), toDate("2009-03-18")).
       addMovement(HAMBURG, toDate("2009-03-19"), toDate("2009-03-20")).
       addMovement(HELSINKI, toDate("2009-03-21"), toDate("2009-03-22")).
       addMovement(NEWYORK, toDate("2009-03-24"), toDate("2009-03-30")).

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/domain/scenario/CargoLifecycle.java

@@ -25,6 +25,9 @@ public class CargoLifecycle {
   public void cargoIsProperlyDelivered() throws Exception {
     Cargo cargo = setupCargoFromHongkongToStockholm();
 
+    // Hamcrest matchers:
+    // assertEquals(1 + 1, 2) <=> assertThat(1 + 1, is(2)) <=> assertThat(1 + 1, equalTo(2))
+
     // Initial state, before routing
     assertThat(cargo.transportStatus(), is(NOT_RECEIVED));
     assertThat(cargo.routingStatus(), is(NOT_ROUTED));
@@ -43,7 +46,11 @@ public class CargoLifecycle {
     // Routed
     assertThat(cargo.transportStatus(), is(NOT_RECEIVED));
     assertThat(cargo.routingStatus(), is(ROUTED));
+
+    // Static factory + builder:
+    // [HandlingActivity.]receiveIn(HONGKONG) <=> new HandlingActivity(RECEIVE, HONGKONG)
     assertThat(cargo.nextExpectedActivity(), is(receiveIn(HONGKONG)));
+
     assertNotNull(cargo.estimatedTimeOfArrival());
     assertThat(cargo.customsClearancePoint(), is(STOCKHOLM));
 
@@ -110,14 +117,13 @@ public class CargoLifecycle {
     assertThat(cargo.nextExpectedActivity(), is(claimIn(STOCKHOLM)));
 
     cargo.handled(claimIn(STOCKHOLM));
-    
+
+    assertThat(cargo.transportStatus(), is(CLAIMED));
     assertNull(cargo.nextExpectedActivity());
   }
 
-  // TODO misdirected cargo, loaded onto wrong voyage
-                                                      
   @Test
-  public void cargoIsMisdirectedAndRerouted() throws Exception {
+  public void cargoIsUnloadedInWrongLocation() throws Exception {
 
     Cargo cargo = setupCargoFromHongkongToStockholm();
 
@@ -269,7 +275,6 @@ public class CargoLifecycle {
     // Etc
   }
 
-
   @Test
   public void customerRequestsChangeOfDestination() throws Exception {
     Cargo cargo = setupCargoFromHongkongToStockholm();
@@ -320,9 +325,7 @@ public class CargoLifecycle {
     assertThat(cargo.nextExpectedActivity(), is(loadOnto(continental1).in(LONGBEACH)));
 
     // Customer wants cargo to go to Rotterdam instead of Stockholm
-    RouteSpecification toRotterdam = cargo.routeSpecification().
-      withDestination(ROTTERDAM);
-
+    RouteSpecification toRotterdam = cargo.routeSpecification().withDestination(ROTTERDAM);
     cargo.specifyNewRoute(toRotterdam);
 
     // Misrouted
@@ -359,6 +362,8 @@ public class CargoLifecycle {
     assertThat(cargo.nextExpectedActivity(), is(claimIn(ROTTERDAM)));
   }
 
+  // --- Support ---
+
   private Cargo setupCargoFromHongkongToStockholm() {
     TrackingId trackingId = trackingIdFactory.nextTrackingId();
     Date arrivalDeadline = toDate("2009-04-10");
@@ -367,7 +372,6 @@ public class CargoLifecycle {
     return new Cargo(trackingId, routeSpecification);
   }
 
-  // Stubbed out customer selection process
   private Itinerary selectAppropriateRoute(List<Itinerary> itineraries) {
     return itineraries.get(0);
   }

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/domain/scenario/VoyageRescheduledScenarioTest.java

@@ -1,21 +1,22 @@
 package se.citerus.dddsample.tracking.core.domain.scenario;
 
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 import org.junit.Before;
 import org.junit.Test;
-import static se.citerus.dddsample.tracking.core.application.util.DateTestUtil.toDate;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.*;
-import static se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatus.MISROUTED;
-import static se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatus.ROUTED;
-import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
-import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.*;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.TrackingIdFactoryInMem;
 
 import java.util.Date;
 
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static se.citerus.dddsample.tracking.core.application.util.DateTestUtil.toDate;
+import static se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatus.MISROUTED;
+import static se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatus.ROUTED;
+import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
+import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.*;
+
 public class VoyageRescheduledScenarioTest {
 
   Cargo cargo;
@@ -81,8 +82,6 @@ public class VoyageRescheduledScenarioTest {
     // keep the latter part of the old itinerary, and the new itinerary
     // is therefore truncated after unload in NYC.
 
-    // TODO delay the arrival instead of advancing the departure
-
     Date newDepartureTime = toDate("2008-10-23", "18:30");
     voyage2.departureRescheduled(NEWYORK, newDepartureTime);