Introduced UUID, timeRegistered property and sameAs/equals for HandlingEvent.

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

@@ -87,12 +87,9 @@ public class Cargo {
 
   @Override
   public boolean equals(Object obj) {
-    if (obj instanceof Cargo == false) {
+    if (!(obj instanceof Cargo)) {
       return false;
     }
-    if (this == obj) {
-      return true;
-    }
     Cargo rhs = (Cargo) obj;
     return new EqualsBuilder()
       .append(trackingId, rhs.trackingId)

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

@@ -54,7 +54,7 @@ public class DeliveryHistory {
 
   private static class HandlingEventByTimeComparator implements Comparator<HandlingEvent> {
     public int compare(HandlingEvent o1, HandlingEvent o2) {
-      return o1.getTime().compareTo(o2.getTime());
+      return o1.getTimeOccurred().compareTo(o2.getTimeOccurred());
     }
   }
 }

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

@@ -1,12 +1,12 @@
 package se.citerus.dddsample.domain;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 
 import javax.persistence.*;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.UUID;
 
 /**
  * HandlingEvent links the type of handling with a CarrierMovement.
@@ -15,14 +15,13 @@ import java.util.Set;
  * DeliveryHistory), they need to implement Comparable to be able to be sorted
  * in correct order.
  *
- * TODO: build hierarchy
- * TODO: sameAs and UUID-based equals()
+ * TODO: build hierarchy of event types
  */
 @Entity
 public class HandlingEvent {
 
   @Id
-  private Long id;
+  private UUID id;
 
   @Enumerated
   private Type type;
@@ -30,29 +29,47 @@ public class HandlingEvent {
   @ManyToOne
   private CarrierMovement carrierMovement;
   
-  private Date time;
+  private Date timeOccurred;
 
-  @Transient /*TODO: Change to many-to-many if we decide on that approach*/
+  private Date timeRegistered;
+
+  @Transient // TODO: cargo-event relation should not be bidirectional
   private Set<Cargo> cargos;
   
   public enum Type {
     LOAD, UNLOAD, RECEIVE, CLAIM
   }
 
-  // Exclude the id field from equals() and hashcode()
-  private static final String[] excludedFields = {"id"};
-
-  public HandlingEvent(Date time, Type type) {
-    this(time, type, null);
+  public HandlingEvent(Date timeOccurred, Date timeRegistered, Type type) {
+    this(timeOccurred, timeRegistered, type, null);
   }
 
-  public HandlingEvent(Date time, Type type, CarrierMovement carrierMovement) {
-    this.time = time;
+  public HandlingEvent(Date timeOccurred, Date timeRegistered, Type type, CarrierMovement carrierMovement) {
+    this.id = UUID.randomUUID();
+    this.timeRegistered = timeRegistered;
+    this.timeOccurred = timeOccurred;
     this.type = type;
     this.carrierMovement = carrierMovement;
     this.cargos = new HashSet<Cargo>();
   }
 
+  /**
+   * This determines if two events recieved by the system in fact represent
+   * the same real-world event, which may have been reported more than once due to
+   * human error, for example.
+   *
+   * @param other handling event to compare with
+   * @return True if these handling events represent the same real-world event.
+   */
+  public boolean sameAs(HandlingEvent other) {
+    return new EqualsBuilder().
+            append(this.getTimeOccurred(), other.getTimeOccurred()).
+            append(this.getLocation(), other.getLocation()).
+            append(this.getType(), other.getType()).
+            append(this.getCarrierMovement(), other.getCarrierMovement())
+            .isEquals();
+  }
+
   public Type getType() {
     return type;
   }
@@ -61,10 +78,14 @@ public class HandlingEvent {
     return carrierMovement;
   }
 
-  public Date getTime() {
-    return time;
+  public Date getTimeOccurred() {
+    return timeOccurred;
   }
-  
+
+  public Date getTimeRegistered() {
+    return timeRegistered;
+  }
+
   /**
    * Returns the Location of the Cargo. The location is calculated based on the following rules:
    * <br>For
@@ -114,12 +135,16 @@ public class HandlingEvent {
 
   @Override
   public boolean equals(Object obj) {
-    return EqualsBuilder.reflectionEquals(this, obj, excludedFields);
+    if (!(obj instanceof HandlingEvent)) {
+      return false;
+    }
+    HandlingEvent other = (HandlingEvent) obj;
+    return new EqualsBuilder().append(this.id, other.id).isEquals();
   }
 
   @Override
   public int hashCode() {
-    return HashCodeBuilder.reflectionHashCode(this, excludedFields);
+    return id.hashCode();
   }
 
   public static Type parseType(String type) {

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

@@ -73,7 +73,7 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository{
 
   
   private void registerEvent(Cargo cargo, String date, Type type, CarrierMovement carrierMovement) throws ParseException{
-    HandlingEvent ev= new HandlingEvent(getDate(date), type, carrierMovement);
+    HandlingEvent ev= new HandlingEvent(getDate(date), new Date(), type, carrierMovement);
     ev.register(toSet(cargo));
     String id = cargo.trackingId() + "_" + type + "_" + date;
     

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

@@ -33,7 +33,7 @@ public class CargoServiceImpl implements CargoService {
               event.getLocation().unlocode(),
               event.getType().toString(),
               carrierIdString,
-              event.getTime()
+              event.getTimeOccurred()
       ));
     }
     return dto;

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

@@ -20,7 +20,7 @@ public class HandlingEventServiceImpl implements HandlingEventService {
   @Transactional(readOnly = false)
   public void register(Date date, String type, String carrierId, String[] trackingIds) {
     CarrierMovement cm = findCarrier(new CarrierId(carrierId));
-    HandlingEvent event = new HandlingEvent(date, HandlingEvent.parseType(type), cm);
+    HandlingEvent event = new HandlingEvent(date, new Date(), HandlingEvent.parseType(type), cm);
     Set<Cargo> cargos = findCargos(trackingIds);
     event.register(cargos);
     

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

@@ -68,7 +68,7 @@ public class CargoTest extends TestCase {
   private Cargo populateCargoReceivedStockholm() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.RECEIVE, null));
+    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.RECEIVE, null));
 
     return cargo;
   }
@@ -76,7 +76,7 @@ public class CargoTest extends TestCase {
   private Cargo populateCargoClaimedMelbourne() throws Exception {
     final Cargo cargo = populateCargoOffMelbourne();
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-09"), HandlingEvent.Type.CLAIM, null));
+    cargo.handle(new HandlingEvent(getDate("2007-12-09"), new Date(), HandlingEvent.Type.CLAIM, null));
     
     return cargo;
   }
@@ -88,14 +88,14 @@ public class CargoTest extends TestCase {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.LOAD, stockholmToHamburg));
-    cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.LOAD, hamburgToHongKong));
-    cargo.handle(new HandlingEvent(getDate("2007-12-04"), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
 
     return cargo;
   }
@@ -106,13 +106,13 @@ public class CargoTest extends TestCase {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.LOAD, stockholmToHamburg));
-    cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.LOAD, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
 
     return cargo;
   }
@@ -123,20 +123,20 @@ public class CargoTest extends TestCase {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.LOAD, stockholmToHamburg));
-    cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.LOAD, hamburgToHongKong));
-    cargo.handle(new HandlingEvent(getDate("2007-12-04"), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
 
     final CarrierMovement hongKongToMelbourne = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("CNHGK"), new Location("AUMEL"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-05"), HandlingEvent.Type.LOAD, hongKongToMelbourne));
-    cargo.handle(new HandlingEvent(getDate("2007-12-07"), HandlingEvent.Type.UNLOAD, hongKongToMelbourne));
+    cargo.handle(new HandlingEvent(getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, hongKongToMelbourne));
+    cargo.handle(new HandlingEvent(getDate("2007-12-07"), new Date(), HandlingEvent.Type.UNLOAD, hongKongToMelbourne));
 
     return cargo;
   }
@@ -147,19 +147,19 @@ public class CargoTest extends TestCase {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.LOAD, stockholmToHamburg));
-    cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.LOAD, hamburgToHongKong));
-    cargo.handle(new HandlingEvent(getDate("2007-12-04"), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
 
     final CarrierMovement hongKongToMelbourne = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("CNHGK"), new Location("AUMEL"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-05"), HandlingEvent.Type.LOAD, hongKongToMelbourne));
+    cargo.handle(new HandlingEvent(getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, hongKongToMelbourne));
 
     return cargo;
   }

dddsample/src/test/java/se/citerus/dddsample/domain/DeliveryHistoryTest.java

@@ -4,19 +4,20 @@ import junit.framework.TestCase;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 public class DeliveryHistoryTest extends TestCase {
 
-  public void testEvensOrderedByTime() throws Exception {
+  public void testEvensOrderedByTimeOccured() throws Exception {
     DeliveryHistory dh = new DeliveryHistory();
     assertTrue(dh.eventsOrderedByTime().isEmpty());
 
     DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-    HandlingEvent he1 = new HandlingEvent(df.parse("2010-01-03"), HandlingEvent.Type.RECEIVE);
-    HandlingEvent he2 = new HandlingEvent(df.parse("2010-01-01"), HandlingEvent.Type.LOAD);
-    HandlingEvent he3 = new HandlingEvent(df.parse("2010-01-04"), HandlingEvent.Type.CLAIM);
-    HandlingEvent he4 = new HandlingEvent(df.parse("2010-01-02"), HandlingEvent.Type.UNLOAD);
+    HandlingEvent he1 = new HandlingEvent(df.parse("2010-01-03"), new Date(), HandlingEvent.Type.RECEIVE);
+    HandlingEvent he2 = new HandlingEvent(df.parse("2010-01-01"), new Date(), HandlingEvent.Type.LOAD);
+    HandlingEvent he3 = new HandlingEvent(df.parse("2010-01-04"), new Date(), HandlingEvent.Type.CLAIM);
+    HandlingEvent he4 = new HandlingEvent(df.parse("2010-01-02"), new Date(), HandlingEvent.Type.UNLOAD);
     dh.addEvent(he1, he2, he3, he4);
 
     List<HandlingEvent> orderEvents = dh.eventsOrderedByTime();

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

@@ -3,10 +3,7 @@ package se.citerus.dddsample.domain;
 import junit.framework.TestCase;
 import se.citerus.dddsample.domain.HandlingEvent.Type;
 
-import java.util.Calendar;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
 
 public class HandlingEventTest extends TestCase {
   public void testCurrentLocationLoadEvent() throws Exception {
@@ -15,7 +12,7 @@ public class HandlingEventTest extends TestCase {
     CarrierId carrierId = new CarrierId("CAR_001");
     CarrierMovement cm = new CarrierMovement(carrierId, locationAAA, locationBBB);
     
-    HandlingEvent ev = new HandlingEvent(null, HandlingEvent.Type.LOAD, cm);
+    HandlingEvent ev = new HandlingEvent(new Date(), new Date(), HandlingEvent.Type.LOAD, cm);
     
     assertEquals(locationAAA, ev.getLocation());
   }
@@ -26,18 +23,18 @@ public class HandlingEventTest extends TestCase {
     CarrierId carrierId = new CarrierId("CAR_001");
     CarrierMovement cm = new CarrierMovement(carrierId, locationAAA, locationBBB);
     
-    HandlingEvent ev = new HandlingEvent(null, HandlingEvent.Type.UNLOAD, cm);
+    HandlingEvent ev = new HandlingEvent(new Date(), new Date(), HandlingEvent.Type.UNLOAD, cm);
     
     assertEquals(locationBBB, ev.getLocation());
   }
   
   public void testCurrentLocationReceivedEvent() throws Exception {
-    HandlingEvent ev = new HandlingEvent(null, HandlingEvent.Type.RECEIVE, null);
+    HandlingEvent ev = new HandlingEvent(new Date(), new Date(), HandlingEvent.Type.RECEIVE, null);
 
     assertEquals(Location.UNKNOWN, ev.getLocation());
   }
   public void testCurrentLocationClaimedEvent() throws Exception {
-    HandlingEvent ev = new HandlingEvent(null, HandlingEvent.Type.CLAIM, null);
+    HandlingEvent ev = new HandlingEvent(new Date(), new Date(), HandlingEvent.Type.CLAIM, null);
 
     assertEquals(Location.UNKNOWN, ev.getLocation());
   }
@@ -58,39 +55,24 @@ public class HandlingEventTest extends TestCase {
     }
   }
   
-  public void testEquality() throws Exception {
-    Date date = Calendar.getInstance().getTime();
+  public void testEqualsAndSameAs() throws Exception {
+    Date timeOccured = new Date();
+    Date timeRegistered = new Date();
     Location locationAAA = new Location("AAA");
     Location locationBBB = new Location("BBB");
     CarrierId carrierId = new CarrierId("CAR_001");
     CarrierMovement cm = new CarrierMovement(carrierId, locationAAA, locationBBB);
-    
-    Cargo cargo1 = new Cargo(new TrackingId("ABC"), new Location("A"), new Location("C"));
-    Cargo cargo2 = new Cargo(new TrackingId("CBA"), new Location("C"), new Location("A"));
-    Cargo cargo3 = new Cargo(new TrackingId("CBA"), new Location("C"), new Location("A")); //Identical to cargo2
-    
-    Set<Cargo> cargos1 = new HashSet<Cargo>();
-    cargos1.add(cargo1);
-    
-    Set<Cargo> cargos2 = new HashSet<Cargo>();
-    cargos2.add(cargo1);
-    cargos2.add(cargo2);
-    
-    Set<Cargo> cargos3 = new HashSet<Cargo>();
-    cargos3.add(cargo1);
-    cargos3.add(cargo3);
-    
-    
-    HandlingEvent ev1 = new HandlingEvent(date, HandlingEvent.Type.LOAD, cm);
-    ev1.register(cargos1);
-    
-    HandlingEvent ev2 = new HandlingEvent(date, HandlingEvent.Type.LOAD, cm);
-    ev2.register(cargos2);
-    
-    HandlingEvent ev3 = new HandlingEvent(date, HandlingEvent.Type.LOAD, cm);
-    ev3.register(cargos2);  
-    
-    assertFalse("HandlingEvents should not be considered equal if the Set of Cargo is not equal", ev1.equals(ev2));
-    assertTrue("HandlingEvents should be considered equal if the Set of Cargo is equal", ev2.equals(ev3));
+
+    HandlingEvent ev1 = new HandlingEvent(timeOccured, timeRegistered, HandlingEvent.Type.LOAD, cm);
+    HandlingEvent ev2 = new HandlingEvent(timeOccured, timeRegistered, HandlingEvent.Type.LOAD, cm);
+
+    // They are the same real-world event
+    assertTrue(ev1.sameAs(ev2));
+    assertTrue(ev2.sameAs(ev1));
+
+    // Two handling events are not equal() even if all non-uuid fields are identical
+    assertFalse(ev1.equals(ev2));
+    assertFalse(ev2.equals(ev1));
   }
+
 }

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

@@ -33,14 +33,14 @@ public class TrackingScenarioTest extends TestCase {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.LOAD, stockholmToHamburg));
-    cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
             new CarrierId("CAR_002"), new Location("DEHAM"), new Location("CNHKG"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.LOAD, hamburgToHongKong));
-    cargo.handle(new HandlingEvent(getDate("2007-12-05"), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-05"), new Date(), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
 
     return cargo;
   }

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

@@ -37,7 +37,7 @@ public class CargoServiceTest extends AbstractDependencyInjectionSpringContextTe
     this.sessionFactory = sessionFactory;
   }
 
-  protected void onSetUp() throws Exception {
+  protected void onSetUp() {
     Session session = createMock(Session.class);
     Connection connection = createMock(Connection.class);
     Transaction transaction = createMock(Transaction.class);
@@ -69,7 +69,7 @@ public class CargoServiceTest extends AbstractDependencyInjectionSpringContextTe
         Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("ORIG"), new Location("DEST"));
         CarrierMovement cm = new CarrierMovement(new CarrierId("CAR_001"), new Location("FROM"), new Location("TO"));
         cargo.getDeliveryHistory().addEvent(
-                new HandlingEvent(new Date(10), HandlingEvent.Type.CLAIM, cm)
+                new HandlingEvent(new Date(10L), new Date(20L), HandlingEvent.Type.CLAIM, cm)
         );
         return cargo;
       }
@@ -109,6 +109,7 @@ public class CargoServiceTest extends AbstractDependencyInjectionSpringContextTe
 
   protected void onTearDown() throws Exception {
     verify(cargoRepository, sessionFactory);
+    reset(cargoRepository, sessionFactory);
   }
 
   /**

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

@@ -9,8 +9,6 @@ import se.citerus.dddsample.repository.HandlingEventRepository;
 
 import java.util.Calendar;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
 
 public class HandlingEventServiceTest extends TestCase {
   private HandlingEventServiceImpl service;
@@ -43,14 +41,9 @@ public class HandlingEventServiceTest extends TestCase {
     expect(cargoRepository.find(new TrackingId("ABC"))).andReturn(cargoABC);
     expect(cargoRepository.find(new TrackingId("XYZ"))).andReturn(cargoXYZ);
     expect(carrierMovementRepository.find(new CarrierId("AAA_BBB"))).andReturn(cmAAA_BBB);
-    
-    HandlingEvent event = new HandlingEvent(date, HandlingEvent.parseType(type), cmAAA_BBB);
-    Set<Cargo> cargos = new HashSet<Cargo>();
-    cargos.add(cargoABC);
-    cargos.add(cargoXYZ);
-    event.register(cargos);
-    
-    handlingEventRepository.save(event);
+
+    // TODO: does not inspect the handling event instance in a sufficient way
+    handlingEventRepository.save(isA(HandlingEvent.class));
     
     replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
     

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

@@ -44,7 +44,7 @@ public class CargoTrackingControllerTest extends TestCase {
     return new CargoService() {
       public CargoWithHistoryDTO find(String trackingId) {
         Cargo cargo = new Cargo(new TrackingId(trackingId), new Location("AAA"), new Location("BBB"));
-        HandlingEvent event = new HandlingEvent(new Date(10), HandlingEvent.Type.RECEIVE);
+        HandlingEvent event = new HandlingEvent(new Date(10L), new Date(20L), HandlingEvent.Type.RECEIVE);
         cargo.getDeliveryHistory().addEvent(event);
 
         // TODO: use DTO assemblers
@@ -58,7 +58,7 @@ public class CargoTrackingControllerTest extends TestCase {
           event.getLocation().unlocode(),
           event.getType().toString(),
           null, // TODO: event hierarchy will remove this kind of code
-          event.getTime()));
+          event.getTimeOccurred()));
         return cargoDTO;
       }
     };