Tests adapted to changes in HandlingEvent and CarrierMovement

dddsample/src/test/java/se/citerus/dddsample/application/persistence/CargoRepositoryTest.java

@@ -51,7 +51,7 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
     assertHandlingEvent(cargo, firstEvent, RECEIVE, HONGKONG, 100, 160, null);
 
     HandlingEvent secondEvent = events.get(1);
-    CarrierMovement expectedCm = new CarrierMovement(new CarrierMovementId("CAR_010"), HONGKONG, MELBOURNE);
+    CarrierMovement expectedCm = new CarrierMovement(new CarrierMovementId("CAR_010"), HONGKONG, MELBOURNE, new Date(), new Date());
     assertHandlingEvent(cargo,  secondEvent, LOAD, HONGKONG, 150, 110, expectedCm);
 
     List<Leg> legs = cargo.itinerary().legs();
@@ -163,7 +163,7 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
 
     Location origin = locationRepository.find(STOCKHOLM.unLocode());
 
-    HandlingEvent event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, origin, null);
+    HandlingEvent event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, origin);
     assertFalse(cargo.deliveryHistory().eventsOrderedByCompletionTime().contains(event));
 
     CargoTestHelper.setDeliveryHistory(cargo, Arrays.asList(event));

dddsample/src/test/java/se/citerus/dddsample/application/persistence/CarrierMovementRepositoryInMem.java

@@ -3,40 +3,12 @@ package se.citerus.dddsample.application.persistence;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
-
-import java.util.HashMap;
-import java.util.Map;
+import se.citerus.dddsample.domain.model.carrier.SampleCarrierMovements;
 
 public final class CarrierMovementRepositoryInMem implements CarrierMovementRepository {
 
-  private Map<CarrierMovementId, CarrierMovement> carriers;
-
-  public CarrierMovementRepositoryInMem() {
-    carriers = new HashMap<CarrierMovementId, CarrierMovement>();
-  }
-
-  private void setup() {
-    final CarrierMovement stockholmToHamburg = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), STOCKHOLM, HAMBURG);
-    final CarrierMovement hamburgToHongKong = new CarrierMovement(
-            new CarrierMovementId("CAR_002"), HAMBURG, HONGKONG);
-    final CarrierMovement melbourneToTokyo = new CarrierMovement(
-            new CarrierMovementId("CAR_003"), MELBOURNE, TOKYO);
-    final CarrierMovement tokyoToChicago = new CarrierMovement(
-            new CarrierMovementId("CAR_004"), TOKYO, CHICAGO);
-    final CarrierMovement stockholmToHelsinki = new CarrierMovement(
-            new CarrierMovementId("CAR_005"), STOCKHOLM, HELSINKI);
-    
-    carriers.put(new CarrierMovementId("SESTO_DEHAM"), stockholmToHamburg);
-    carriers.put(new CarrierMovementId("DEHAM_CNHKG"), hamburgToHongKong);
-    carriers.put(new CarrierMovementId("AUMEL_JPTOK"), melbourneToTokyo);
-    carriers.put(new CarrierMovementId("JPTOK_USCHI"), tokyoToChicago);
-    carriers.put(new CarrierMovementId("SESTO_FIHEL"), stockholmToHelsinki);
-  }
-
   public CarrierMovement find(final CarrierMovementId carrierMovementId) {
-    return carriers.get(carrierMovementId);
+    return SampleCarrierMovements.lookup(carrierMovementId);
   }
 
 }

dddsample/src/test/java/se/citerus/dddsample/application/persistence/HandlingEventRepositoryInMem.java

@@ -8,7 +8,6 @@ import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent.Type;
 import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 
@@ -61,7 +60,7 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository {
     registerEvent(cargoABC, "2008-01-01", HandlingEvent.Type.RECEIVE, null);
     
     final CarrierMovement stockholmToHelsinki = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), STOCKHOLM, HELSINKI);
+            new CarrierMovementId("CAR_001"), STOCKHOLM, HELSINKI, new Date(), new Date());
 
     registerEvent(cargoABC, "2008-01-02", HandlingEvent.Type.LOAD, stockholmToHelsinki);
     registerEvent(cargoABC, "2008-01-03", HandlingEvent.Type.UNLOAD, stockholmToHelsinki);
@@ -72,7 +71,7 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository {
     registerEvent(cargoCBA, "2008-01-10", HandlingEvent.Type.RECEIVE, null);
   }
 
-  private void registerEvent(Cargo cargo, String date, Type type, CarrierMovement carrierMovement) throws ParseException {
+  private void registerEvent(Cargo cargo, String date, HandlingEvent.Type type, CarrierMovement carrierMovement) throws ParseException {
     HandlingEvent event = new HandlingEvent(cargo, getDate(date), new Date(), type, null, carrierMovement);
     String id = cargo.trackingId() + "_" + type + "_" + date;
 

dddsample/src/test/java/se/citerus/dddsample/application/persistence/HandlingEventRepositoryTest.java

@@ -37,7 +37,7 @@ public class HandlingEventRepositoryTest extends AbstractRepositoryTest {
     Cargo cargo = cargoRepository.find(new TrackingId("XYZ"));
     Date completionTime = new Date(10);
     Date registrationTime = new Date(20);
-    HandlingEvent event = new HandlingEvent(cargo, completionTime, registrationTime, HandlingEvent.Type.CLAIM, location, null);
+    HandlingEvent event = new HandlingEvent(cargo, completionTime, registrationTime, HandlingEvent.Type.CLAIM, location);
 
     handlingEventRepository.save(event);