Introduced CargoTestHelper for creating test cargo instances while preserving package level visibility where desired.

dddsample/src/main/java/se/citerus/dddsample/domain/CargoTestHelper.java

@@ -0,0 +1,25 @@
+package se.citerus.dddsample.domain;
+
+import java.util.Collection;
+
+/**
+ * For easy testdata creation.
+ * 
+ */
+public class CargoTestHelper {
+
+  public static Cargo createCargoWithDeliveryHistory(
+    TrackingId trackingId, Location origin, Location destination,
+    Collection<HandlingEvent> events) {
+
+    final Cargo cargo = new Cargo(trackingId, origin, destination);
+    setDeliveryHistory(cargo, events);
+
+    return cargo;
+  }
+
+  public static void setDeliveryHistory(Cargo cargo, Collection<HandlingEvent> events) {
+    cargo.setDeliveryHistory(new DeliveryHistory(events));
+  }
+  
+}

dddsample/src/main/java/se/citerus/dddsample/repository/CargoRepositoryInMem.java

@@ -2,8 +2,7 @@ package se.citerus.dddsample.repository;
 
 import org.springframework.dao.DataRetrievalFailureException;
 import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.DeliveryHistory;
-import se.citerus.dddsample.domain.Itinerary;
+import se.citerus.dddsample.domain.CargoTestHelper;
 import static se.citerus.dddsample.domain.SampleLocations.*;
 import se.citerus.dddsample.domain.TrackingId;
 
@@ -49,34 +48,30 @@ public class CargoRepositoryInMem implements CargoRepository {
     );
   }
 
-  public void deleteItinerary(Itinerary itinerary) {
-  }
-
   public List<Cargo> findAll() {
     return new ArrayList(cargoDb.values());
   }
 
   public void init() throws Exception {
-    String trackIdXYZ = "XYZ";
-    final Cargo cargoXYZ = new Cargo(new TrackingId(trackIdXYZ), STOCKHOLM, MELBOURNE);
-    cargoDb.put(trackIdXYZ, cargoXYZ);
-    
-    String trackIdZYX = "ZYX";
-    final Cargo cargoZYX = new Cargo(new TrackingId(trackIdZYX), MELBOURNE, STOCKHOLM);
-    cargoDb.put(trackIdZYX, cargoZYX);
-    
-    String trackIdABC = "ABC";
-    final Cargo cargoABC = new Cargo(new TrackingId(trackIdABC), STOCKHOLM, HELSINKI);
-    cargoDb.put(trackIdABC, cargoABC);
-    
-    String trackIdCBA = "CBA";
-    final Cargo cargoCBA = new Cargo(new TrackingId(trackIdCBA), HELSINKI, STOCKHOLM);
-    cargoDb.put(trackIdCBA, cargoCBA);
+    final TrackingId xyz = new TrackingId("XYZ");
+    final Cargo cargoXYZ = CargoTestHelper.createCargoWithDeliveryHistory(
+      xyz, STOCKHOLM, MELBOURNE, handlingEventRepository.findEventsForCargo(xyz));
+    cargoDb.put(xyz.idString(), cargoXYZ);
 
-    for (Cargo cargo : cargoDb.values()) {
-      DeliveryHistory dh = new DeliveryHistory(handlingEventRepository.findEventsForCargo(cargo.trackingId()));
-      cargo.setDeliveryHistory(dh);
-    }
+    final TrackingId zyx = new TrackingId("ZYX");
+    final Cargo cargoZYX = CargoTestHelper.createCargoWithDeliveryHistory(
+      zyx, MELBOURNE, STOCKHOLM, handlingEventRepository.findEventsForCargo(zyx));
+    cargoDb.put(zyx.idString(), cargoZYX);
+
+    final TrackingId abc = new TrackingId("ABC");
+    final Cargo cargoABC = CargoTestHelper.createCargoWithDeliveryHistory(
+      abc, STOCKHOLM, HELSINKI, handlingEventRepository.findEventsForCargo(abc));
+    cargoDb.put(abc.idString(), cargoABC);
+
+    final TrackingId cba = new TrackingId("CBA");
+    final Cargo cargoCBA = CargoTestHelper.createCargoWithDeliveryHistory(
+      cba, HELSINKI, STOCKHOLM, handlingEventRepository.findEventsForCargo(cba));
+    cargoDb.put(cba.idString(), cargoCBA);
   }
 
   public void setHandlingEventRepository(final HandlingEventRepository handlingEventRepository) {

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

@@ -25,6 +25,6 @@ public interface HandlingEventService {
    * @throws UnknownLocationException   if there's no location with this UN Locode
    */
   void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, UnLocode unlocode, HandlingEvent.Type type)
-    throws UnknownCarrierMovementIdException, UnknownTrackingIdException, UnknownLocationException;
+  throws UnknownCarrierMovementIdException, UnknownTrackingIdException, UnknownLocationException;
 
 }

dddsample/src/test/java/se/citerus/dddsample/repository/CargoRepositoryTest.java

@@ -155,7 +155,7 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
     HandlingEvent event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, origin, null);
     assertFalse(cargo.deliveryHistory().eventsOrderedByCompletionTime().contains(event));
 
-    cargo.setDeliveryHistory(new DeliveryHistory(Arrays.asList(event)));
+    CargoTestHelper.setDeliveryHistory(cargo, Arrays.asList(event));
     assertTrue(cargo.deliveryHistory().eventsOrderedByCompletionTime().contains(event));
 
     // Save cargo, evict from session and then re-load it - should not pick up the added event,

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

@@ -33,7 +33,8 @@ public class TrackingServiceTest extends TestCase {
     HandlingEvent unloaded = new HandlingEvent(cargo, new Date(100), new Date(110), HandlingEvent.Type.UNLOAD, CHICAGO, carrierMovement);
     // Add out of order to verify ordering in DTO
     List<HandlingEvent> eventList = Arrays.asList(loaded, unloaded, claimed);
-    cargo.setDeliveryHistory(new DeliveryHistory(eventList));
+
+    CargoTestHelper.setDeliveryHistory(cargo, eventList);
 
     expect(cargoRepository.find(new TrackingId("XYZ"))).andReturn(cargo);
 

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

@@ -10,7 +10,7 @@ import org.springframework.validation.Errors;
 import org.springframework.validation.FieldError;
 import org.springframework.web.servlet.ModelAndView;
 import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.DeliveryHistory;
+import se.citerus.dddsample.domain.CargoTestHelper;
 import se.citerus.dddsample.domain.HandlingEvent;
 import static se.citerus.dddsample.domain.SampleLocations.HONGKONG;
 import static se.citerus.dddsample.domain.SampleLocations.TOKYO;
@@ -48,7 +48,7 @@ public class CargoTrackingControllerTest extends TestCase {
       public Cargo track(TrackingId trackingId) {
         final Cargo cargo = new Cargo(trackingId, HONGKONG, TOKYO);
         final HandlingEvent event = new HandlingEvent(cargo, new Date(10L), new Date(20L), HandlingEvent.Type.RECEIVE, HONGKONG, null);
-        cargo.setDeliveryHistory(new DeliveryHistory(Arrays.asList(event)));
+        CargoTestHelper.setDeliveryHistory(cargo, Arrays.asList(event));
         
         return cargo;
       }