Introduced a UnLocode class, consistent with CarrierMovementId and TrackingId for CarrierMovement and Cargo, respectively.

Brought Spring version back up to 2.5.1

dddsample/pom.xml

@@ -85,6 +85,9 @@
     <developerConnection>scm:svn:https://dddsample.svn.sourceforge.net/svnroot/dddsample</developerConnection>
     <url>http://ddd.sventon.org</url>
   </scm>
+  <properties>
+    <spring.version>2.5.1</spring.version>
+  </properties>
   <build>
     <plugins>
       <!-- Compiler -->
@@ -101,6 +104,7 @@
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
+        <version>6.1.4</version>
         <configuration>
           <!--scanIntervalSeconds>10</scanIntervalSeconds-->
         </configuration>
@@ -110,6 +114,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jaxws-maven-plugin</artifactId>
+        <version>1.9</version>
         <executions>
           <execution>
             <goals>
@@ -120,13 +125,11 @@
         <configuration>
           <sei>se.citerus.dddsample.ws.HandlingEventServiceEndpointImpl</sei>
           <genWsdl>true</genWsdl>
-          <verbose>true</verbose>
         </configuration>
       </plugin>
-      
+
       <!-- Jar plugin for generation of WS Client classes -->
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
@@ -143,7 +146,7 @@
           </execution>
         </executions>
       </plugin>
-      
+
     </plugins>
   </build>
   <dependencies>
@@ -156,29 +159,27 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>2.0.8</version>
+      <version>${spring.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-hibernate3</artifactId>
-      <!-- -orm in 2.5.x -->
-      <version>2.0.8</version>
+      <artifactId>spring-orm</artifactId>
+      <version>${spring.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>2.0.8</version>
+      <version>${spring.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>2.0.8</version>
+      <version>${spring.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-mock</artifactId>
-      <!-- -test in 2.5.x -->
-      <version>2.0.8</version>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -272,17 +273,14 @@
     <plugins>
       <!-- Javadoc -->
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
       <!-- Source code cross reference -->
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
       </plugin>
       <!-- Test report -->
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
       </plugin>
     </plugins>

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

@@ -2,10 +2,10 @@ package se.citerus.dddsample.domain;
 
 import org.apache.commons.lang.Validate;
 
+import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import java.util.regex.Pattern;
 
 @Entity
 public class Location {
@@ -14,44 +14,50 @@ public class Location {
   @GeneratedValue
   private Long id;
 
-  private String unlocode;
+  @Embedded
+  private UnLocode unLocode;
 
-  /**
-   * Regular expression of a UN Locode (exactly five letters of the english alphabet)
-   */
-  private static final Pattern unlocodePattern = Pattern.compile("[a-zA-Z]{5}");
+  private String name;
 
   /**
    * Special Location object that marks an unknown location.
    */
-  public static final Location UNKNOWN = new Location();
+  public static final Location UNKNOWN = new Location(
+    new UnLocode("XX","XXX"), "Unknown location"
+  );
 
-  // Internal constructor
-  private Location() {
-    this.unlocode = "Unknown";
+  /**
+   * @param unLocode UN Locode
+   * @param name location name
+   * @throws IllegalArgumentException if the UN Locode or name is null
+   */
+  public Location(UnLocode unLocode, String name) {
+    // TODO:
+    // It shouldn't really be possible to create a new location -
+    // it should only be looked up in the location repository.
+    Validate.notNull(unLocode);
+    Validate.notNull(name);
+    this.unLocode = unLocode;
+    this.name = name;
   }
 
   /**
-   * @param unlocode UN locode
-   * @throws IllegalArgumentException if the UN locode is anything other than five letters of the US alphabet
+   * @return UN Locode for this location.
    */
-  public Location(String unlocode) {
-    Validate.notNull(unlocode);
-    Validate.isTrue(unlocodePattern.matcher(unlocode).matches(),
-            "\"" + unlocode + "\" is not a valid UN Locode");
-    this.unlocode = unlocode;
+  public UnLocode unLocode() {
+    return unLocode;
   }
 
   /**
-   * @return United Nations Location Code for this location.
+   * @return Actual name of this location, e.g. "Stockholm".
    */
-  public String unlocode() {
-    return unlocode;
+  public String name() {
+    return name;
   }
 
   /**
    * @param object to compare
-   * @return True if unlocodes are equal.
+   * @return True iff UN locodes are equal.
    */
   @Override
   public boolean equals(Object object) {
@@ -65,20 +71,23 @@ public class Location {
       return false;
     }
     Location other = (Location) object;
-    return this.unlocode.equals(other.unlocode);
+    return this.unLocode.equals(other.unLocode);
   }
 
   /**
-   * @return Hash code of unlocode.
+   * @return Hash code of UN locode.
    */
   @Override
   public int hashCode() {
-    return unlocode.hashCode();
+    return unLocode.hashCode();
   }
 
   @Override
   public String toString() {
-    return unlocode;
+    return unLocode.idString() + " (" + name + ")";
   }
 
+  // Needed by Hibernate
+  Location() {}
+
 }

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

@@ -1,5 +1,6 @@
 package se.citerus.dddsample.domain;
 
+import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
@@ -17,6 +18,7 @@ public class TrackingId {
   private String id;
 
   public TrackingId(String id) {
+    Validate.notNull(id);
     this.id = id;
   }
 

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

@@ -0,0 +1,63 @@
+package se.citerus.dddsample.domain;
+
+import org.apache.commons.lang.Validate;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import javax.persistence.Embeddable;
+import java.util.Arrays;
+import java.util.regex.Pattern;
+
+/**
+ * United nations location code.
+ *
+ * http://www.unece.org/cefact/locode/
+ * http://www.unece.org/cefact/locode/DocColumnDescription.htm#LOCODE
+ */
+@Embeddable
+public class UnLocode {
+
+  private String unlocode;
+
+  // Country code is exactly two letters
+  private static final Pattern countryCodePattern = Pattern.compile("[a-zA-Z]{2}");
+
+  // Location code is usually three letters, but may contain the numbers 2-9 as well
+  private static final Pattern locationCodePattern = Pattern.compile("[a-zA-Z2-9]{3}");
+
+  public UnLocode(String countryCode, String locationCode) {
+    validateArgs(countryCode, locationCode);
+
+    this.unlocode = (countryCode + locationCode).toUpperCase();
+  }
+
+  private void validateArgs(String countryCode, String locationCode) {
+    Validate.noNullElements(Arrays.asList(countryCode, locationCode),
+            "Neither country code nor location code may be null");
+    Validate.isTrue(countryCodePattern.matcher(countryCode).matches(),
+      "\"" + countryCode + "\" is not a valid country code");
+    Validate.isTrue(locationCodePattern.matcher(locationCode).matches(),
+      "\"" + locationCode + "\" is not a valid location code");
+  }
+
+  /**
+   * @return country code and location code concatenated
+   */
+  public String idString() {
+    return unlocode;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return EqualsBuilder.reflectionEquals(this, obj);
+  }
+
+  @Override
+  public int hashCode() {
+    return HashCodeBuilder.reflectionHashCode(this);
+  }
+
+  // Needed by Hibernate
+  UnLocode() {
+  }
+}

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

@@ -2,7 +2,6 @@ package se.citerus.dddsample.repository;
 
 import org.springframework.dao.DataRetrievalFailureException;
 import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.Location;
 import se.citerus.dddsample.domain.TrackingId;
 
 import java.util.HashMap;
@@ -43,6 +42,7 @@ public class CargoRepositoryInMem implements CargoRepository {
    * @throws Exception
    */
   public void init() throws Exception {
+/*
     String trackIdXYZ = "XYZ";
     final Cargo cargoXYZ = new Cargo(new TrackingId(trackIdXYZ), new Location("SESTO"), new Location("AUMEL"));
     cargoDb.put(trackIdXYZ, cargoXYZ);
@@ -58,6 +58,7 @@ public class CargoRepositoryInMem implements CargoRepository {
     String trackIdCBA = "CBA";
     final Cargo cargoCBA = new Cargo(new TrackingId(trackIdCBA), new Location("FIHEL"), new Location("SESTO"));
     cargoDb.put(trackIdCBA, cargoCBA);
+*/
 
     /*
     for (Cargo cargo : cargoDb.values()) {

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

@@ -2,7 +2,6 @@ package se.citerus.dddsample.repository;
 
 import se.citerus.dddsample.domain.CarrierMovement;
 import se.citerus.dddsample.domain.CarrierMovementId;
-import se.citerus.dddsample.domain.Location;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -16,6 +15,7 @@ public class CarrierMovementRepositoryInMem implements CarrierMovementRepository
   }
 
   private void setup() {
+/*
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
             new CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
@@ -32,6 +32,7 @@ public class CarrierMovementRepositoryInMem implements CarrierMovementRepository
     carriers.put(new CarrierMovementId("AUMEL_JPTOK"), melbourneToTokyo);
     carriers.put(new CarrierMovementId("JPTOK_USLA"), tokyoToLosAngeles);
     carriers.put(new CarrierMovementId("SESTO_FIHEL"), stockholmToHelsinki);
+*/
   }
 
   public CarrierMovement find(CarrierMovementId carrierMovementId) {

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

@@ -31,7 +31,8 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository{
    * @throws ParseException
    */
   public void init() throws ParseException {
-    
+/*
+
     // CargoXYZ
     final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
     registerEvent(cargoXYZ, "2007-11-30", HandlingEvent.Type.RECEIVE, null);
@@ -69,6 +70,7 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository{
     //CargoCBA
     final Cargo cargoCBA = new Cargo(new TrackingId("CBA"), new Location("FIHEL"), new Location("SESTO"));
     registerEvent(cargoCBA, "2008-01-10", HandlingEvent.Type.RECEIVE, null);
+*/
   }
 
   

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

@@ -1,9 +1,10 @@
 package se.citerus.dddsample.repository;
 
 import se.citerus.dddsample.domain.Location;
+import se.citerus.dddsample.domain.UnLocode;
 
 public interface LocationRepository {
 
-  Location find(String string);
+  Location find(UnLocode unLocode);
 
 }

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

@@ -1,13 +1,14 @@
 package se.citerus.dddsample.repository;
 
 import se.citerus.dddsample.domain.Location;
+import se.citerus.dddsample.domain.UnLocode;
 
 public class LocationRepositoryHibernate extends HibernateRepository implements LocationRepository {
 
-  public Location find(String unlcode) {
+  public Location find(UnLocode unLocode) {
     return (Location) getSession().
-          createQuery("from Location where unlocode = ?").
-          setParameter(0, unlcode).
+          createQuery("from Location where unLocode = ?").
+          setParameter(0, unLocode).
           uniqueResult();
   }
 }

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

@@ -24,14 +24,14 @@ public class CargoServiceImpl implements CargoService {
     HandlingEvent lastEvent = cargo.deliveryHistory().lastEvent();
     String currentLocation;
     if (lastEvent != null) {
-      currentLocation = lastEvent.location().unlocode();
+      currentLocation = lastEvent.location().toString();
     } else {
       currentLocation = "";
     }
     final CargoWithHistoryDTO dto = new CargoWithHistoryDTO(
             cargo.trackingId().idString(),
-            cargo.origin().unlocode(),
-            cargo.finalDestination().unlocode(),
+            cargo.origin().toString(),
+            cargo.finalDestination().toString(),
             currentLocation
     );
     final List<HandlingEvent> events = cargo.deliveryHistory().eventsOrderedByCompletionTime();
@@ -39,7 +39,7 @@ public class CargoServiceImpl implements CargoService {
       CarrierMovement cm = event.carrierMovement();
       String carrierIdString = (cm == null) ? "" : cm.carrierId().idString();
       dto.addEvent(new HandlingEventDTO(
-              event.location().unlocode(),
+              event.location().toString(),
               event.type().toString(),
               carrierIdString,
               event.completionTime()

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

@@ -3,6 +3,7 @@ package se.citerus.dddsample.service;
 import se.citerus.dddsample.domain.CarrierMovementId;
 import se.citerus.dddsample.domain.HandlingEvent;
 import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.UnLocode;
 
 import java.util.Date;
 
@@ -19,10 +20,12 @@ public interface HandlingEventService {
    * @param carrierMovementId carrier movement id, if applicable (may be null)
    * @param unlocode United Nations Location Code for the location of the event
    * @param type type of event
+   *
    * @throws UnknownCarrierMovementIdException if there's not carrier movement with this id
    * @throws UnknownTrackingIdException if there's no cargo with this tracking id
+   * @throws UnknownLocationException if there's no location with this UN Locode 
    */
-  void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, String unlocode, HandlingEvent.Type type)
+  void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, UnLocode unlocode, HandlingEvent.Type type)
   throws UnknownCarrierMovementIdException, UnknownTrackingIdException, UnknownLocationException;
 
 }

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

@@ -17,7 +17,7 @@ public class HandlingEventServiceImpl implements HandlingEventService {
   private LocationRepository locationRepository;
 
   @Transactional(readOnly = false)
-  public void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, String unlocode, HandlingEvent.Type type) throws UnknownCarrierMovementIdException, UnknownTrackingIdException, UnknownLocationException {
+  public void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, UnLocode unlocode, HandlingEvent.Type type) throws UnknownCarrierMovementIdException, UnknownTrackingIdException, UnknownLocationException {
     Cargo cargo = findCargo(trackingId);
     CarrierMovement carrierMovement = findCarrierMovement(carrierMovementId);
     Location location = findLocation(unlocode);
@@ -53,13 +53,13 @@ public class HandlingEventServiceImpl implements HandlingEventService {
     return carrierMovement;
   }
 
-  private Location findLocation(String unlocode) throws UnknownLocationException {
-    if (unlocode == null){
+  private Location findLocation(UnLocode unlocode) throws UnknownLocationException {
+    if (unlocode == null) {
       return Location.UNKNOWN;
     }
     
     Location location = locationRepository.find(unlocode);
-    if (location == null){
+    if (location == null) {
       throw new UnknownLocationException(unlocode);
     }
     

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

@@ -1,16 +1,17 @@
 package se.citerus.dddsample.service;
 
+import se.citerus.dddsample.domain.UnLocode;
+
 public class UnknownLocationException extends Exception {
 
-  private String unlocode;
+  private UnLocode unlocode;
 
-  public UnknownLocationException(String unlocode) {
+  public UnknownLocationException(UnLocode unlocode) {
     this.unlocode = unlocode;
   }
 
-
   @Override
   public String getMessage() {
-    return "No location with UN location code " + unlocode + " exists in the system";
+    return "No location with UN locode " + unlocode.idString() + " exists in the system";
   }
 }

dddsample/src/main/java/se/citerus/dddsample/util/SampleDataGenerator.java

@@ -87,15 +87,15 @@ public class SampleDataGenerator implements ServletContextListener {
   }
 
   private static void loadLocationData(JdbcTemplate jdbcTemplate) {
-    String locationSql = "insert into Location (id, unlocode) values (?, ?)";
+    String locationSql = "insert into Location (id, unlocode, name) values (?, ?, ?)";
     Object[][] locationArgs = {
-      {1, "SESTO"},
-      {2, "AUMEL"},
-      {3, "CNHKG"},
-      {4, "JPTOK"},
-      {5, "FIHEL"},
-      {6, "DEHAM"},
-      {7, "USCHI"}
+      {1, "SESTO", "Stockholm"},
+      {2, "AUMEL", "Melbourne"},
+      {3, "CNHKG", "Hongkong"},
+      {4, "JPTOK", "Tokyo"},
+      {5, "FIHEL", "Helsinki"},
+      {6, "DEHAM", "Hamburg"},
+      {7, "USCHI", "Chicago"}
     };
     executeUpdate(jdbcTemplate, locationSql, locationArgs);
   }

dddsample/src/main/java/se/citerus/dddsample/ws/HandlingEventServiceEndpointImpl.java

@@ -5,6 +5,7 @@ import org.apache.commons.logging.LogFactory;
 import se.citerus.dddsample.domain.CarrierMovementId;
 import se.citerus.dddsample.domain.HandlingEvent;
 import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.UnLocode;
 import se.citerus.dddsample.service.HandlingEventService;
 import se.citerus.dddsample.service.InvalidEventTypeException;
 import se.citerus.dddsample.service.UnknownCarrierMovementIdException;
@@ -35,7 +36,9 @@ public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEnd
       }
       HandlingEvent.Type type = parseEventType(eventType);
 
-      handlingEventService.register(date, tid, cid, unlocode, type);
+      UnLocode ul = new UnLocode(unlocode.substring(0,2), unlocode.substring(2,5));
+
+      handlingEventService.register(date, tid, cid, ul, type);
     } catch (ParseException pe) {
       logger.error("Invalid date format: " + completionTime + ", must be on ISO 8601 format: " + ISO_8601_FORMAT);
     } catch (UnknownTrackingIdException utid) {

dddsample/src/main/resources/context-persistence.xml

@@ -30,7 +30,6 @@
     <property name="hibernateProperties">
       <props>
         <!-- These are properties that are common for test and production -->
-        <prop key="hibernate.dialect">org.hibernate.dialect.HSQLDialect</prop>
         <prop key="hibernate.cache.provider_class">org.hibernate.cache.EhCacheProvider</prop>
       </props>
     </property>

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

@@ -8,6 +8,10 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 public class CargoTest extends TestCase {
+  private final Location stockholm = new Location(new UnLocode("SE","STO"), "Stockholm");
+  private final Location melbourne = new Location(new UnLocode("AU","MEL"), "Melbourne");
+  private final Location hongkong = new Location(new UnLocode("CN","HKG"), "Hongkong");
+  private final Location hamburg = new Location(new UnLocode("DE","HAM"), "Hamburg");
 
   // TODO:
   // it seems that events are not added to the system by cargo.deliveryHistory().addEvent(),
@@ -15,10 +19,10 @@ public class CargoTest extends TestCase {
   // work against the repositories or the service layer. The delivery history of a cargo should be
   // read-only from the cargo end. // PeBa
 
+
+
   public void testlastKnownLocationUnknownWhenNoEvents() throws Exception {
-    Location destination = new Location("AUMEL");
-    Location origin = new Location("SESTO");
-    Cargo cargo = new Cargo(new TrackingId("XYZ"), origin, destination);
+    Cargo cargo = new Cargo(new TrackingId("XYZ"), stockholm, melbourne);
 
     assertEquals(Location.UNKNOWN, cargo.lastKnownLocation());
   }
@@ -26,25 +30,25 @@ public class CargoTest extends TestCase {
   public void testlastKnownLocationReceived() throws Exception {
     Cargo cargo = populateCargoReceivedStockholm();
 
-    assertEquals(new Location("SESTO"), cargo.lastKnownLocation());
+    assertEquals(stockholm, cargo.lastKnownLocation());
   }
 
   public void testlastKnownLocationClaimed() throws Exception {
     Cargo cargo = populateCargoClaimedMelbourne();
 
-    assertEquals(new Location("AUMEL"), cargo.lastKnownLocation());
+    assertEquals(melbourne, cargo.lastKnownLocation());
   }
   
   public void testlastKnownLocationUnloaded() throws Exception {
     Cargo cargo = populateCargoOffHongKong();
 
-    assertEquals(new Location("CNHGK"), cargo.lastKnownLocation());
+    assertEquals(hongkong, cargo.lastKnownLocation());
   }
 
   public void testlastKnownLocationloaded() throws Exception {
     Cargo cargo = populateCargoOnHamburg();
 
-    assertEquals(new Location("DEHAM"), cargo.lastKnownLocation());
+    assertEquals(hamburg, cargo.lastKnownLocation());
   }
 
   public void testAtFinalLocation() throws Exception {
@@ -60,10 +64,10 @@ public class CargoTest extends TestCase {
   }
   
   public void testEquality() throws Exception {
-    Cargo c1 = new Cargo(new TrackingId("ABC"), new Location("AAAAA"), new Location("CCCCC"));
-    Cargo c2 = new Cargo(new TrackingId("CBA"), new Location("AAAAA"), new Location("CCCCC"));
-    Cargo c3 = new Cargo(new TrackingId("ABC"), new Location("AAAAA"), new Location("XXXXX"));
-    Cargo c4 = new Cargo(new TrackingId("ABC"), new Location("AAAAA"), new Location("CCCCC"));
+    Cargo c1 = new Cargo(new TrackingId("ABC"), stockholm, hongkong);
+    Cargo c2 = new Cargo(new TrackingId("CBA"), stockholm, hongkong);
+    Cargo c3 = new Cargo(new TrackingId("ABC"), stockholm, melbourne);
+    Cargo c4 = new Cargo(new TrackingId("ABC"), stockholm, hongkong);
 
     assertTrue("Cargos should be equal when TrackingIDs are equal", c1.equals(c4));
     assertTrue("Cargos should be equal when TrackingIDs are equal", c1.equals(c3));
@@ -73,9 +77,10 @@ public class CargoTest extends TestCase {
 
   // TODO: Generate test data some better way
   private Cargo populateCargoReceivedStockholm() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), stockholm, melbourne);
 
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.RECEIVE, new Location("SESTO")));
+    HandlingEvent he = new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.RECEIVE, stockholm);
+    cargo.deliveryHistory().addEvent(he);
 
     return cargo;
   }
@@ -83,89 +88,89 @@ public class CargoTest extends TestCase {
   private Cargo populateCargoClaimedMelbourne() throws Exception {
     final Cargo cargo = populateCargoOffMelbourne();
 
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-09"), new Date(), HandlingEvent.Type.CLAIM, new Location("AUMEL")));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-09"), new Date(), HandlingEvent.Type.CLAIM, melbourne));
     
     return cargo;
   }
   
   private Cargo populateCargoOffHongKong() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), stockholm, melbourne);
 
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
+            new CarrierMovementId("CAR_001"), stockholm, hamburg);
 
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, new Location("SESTO"), stockholmToHamburg));
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, new Location("DEHAM"), stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholm, stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, hamburg, stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
+            new CarrierMovementId("CAR_001"), hamburg, hongkong);
 
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, new Location("DEHAM"), hamburgToHongKong));
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, new Location("CNHGK"), hamburgToHongKong));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburg, hamburgToHongKong));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hongkong, hamburgToHongKong));
 
     return cargo;
   }
 
   private Cargo populateCargoOnHamburg() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), stockholm, melbourne);
 
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
+            new CarrierMovementId("CAR_001"), stockholm, hamburg);
 
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, new Location("SESTO"), stockholmToHamburg));
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, new Location("DEHAM"), stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholm, stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, hamburg, stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
+            new CarrierMovementId("CAR_001"), hamburg, hongkong);
 
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, new Location("DEHAM"), hamburgToHongKong));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburg, hamburgToHongKong));
 
     return cargo;
   }
 
   private Cargo populateCargoOffMelbourne() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), stockholm, melbourne);
 
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
+            new CarrierMovementId("CAR_001"), stockholm, hamburg);
 
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, new Location("SESTO"), stockholmToHamburg));
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, new Location("DEHAM"), stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholm, stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, hamburg, stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
+            new CarrierMovementId("CAR_001"), hamburg, hongkong);
 
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, new Location("DEHAM"), hamburgToHongKong));
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, new Location("CNHGK"), hamburgToHongKong));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburg, hamburgToHongKong));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hongkong, hamburgToHongKong));
 
     final CarrierMovement hongKongToMelbourne = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), new Location("CNHGK"), new Location("AUMEL"));
+            new CarrierMovementId("CAR_001"), hongkong, melbourne);
 
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, new Location("CNHGK"), hongKongToMelbourne));
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-07"), new Date(), HandlingEvent.Type.UNLOAD, new Location("AUMEL"), hongKongToMelbourne));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, hongkong, hongKongToMelbourne));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-07"), new Date(), HandlingEvent.Type.UNLOAD, melbourne, hongKongToMelbourne));
 
     return cargo;
   }
 
   private Cargo populateCargoOnHongKong() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), stockholm, melbourne);
 
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
+            new CarrierMovementId("CAR_001"), stockholm, hamburg);
 
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, new Location("SESTO"), stockholmToHamburg));
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, new Location("DEHAM"), stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholm, stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, hamburg, stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
+            new CarrierMovementId("CAR_001"), hamburg, hongkong);
 
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, new Location("DEHAM"), hamburgToHongKong));
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, new Location("CNHGK"), hamburgToHongKong));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburg, hamburgToHongKong));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hongkong, hamburgToHongKong));
 
     final CarrierMovement hongKongToMelbourne = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), new Location("CNHGK"), new Location("AUMEL"));
+            new CarrierMovementId("CAR_001"), hongkong, melbourne);
 
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, new Location("CNHGK"), hongKongToMelbourne));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, hongkong, hongKongToMelbourne));
 
     return cargo;
   }

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

@@ -15,11 +15,13 @@ public class DeliveryHistoryTest extends TestCase {
     assertTrue(dh.eventsOrderedByCompletionTime().isEmpty());
 
     DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("CAR_001"), new Location("FROMX"), new Location("TOXXX"));
-    HandlingEvent he1 = new HandlingEvent(null, df.parse("2010-01-03"), new Date(), HandlingEvent.Type.RECEIVE, new Location("TOXXX"));
-    HandlingEvent he2 = new HandlingEvent(null, df.parse("2010-01-01"), new Date(), HandlingEvent.Type.LOAD, new Location("TOXXX"), carrierMovement);
-    HandlingEvent he3 = new HandlingEvent(null, df.parse("2010-01-04"), new Date(), HandlingEvent.Type.CLAIM, new Location("FROMX"));
-    HandlingEvent he4 = new HandlingEvent(null, df.parse("2010-01-02"), new Date(), HandlingEvent.Type.UNLOAD, new Location("FROMX"), carrierMovement);
+    final Location from = new Location(new UnLocode("FR","OMX"), "From");
+    final Location to = new Location(new UnLocode("TO","XXX"), "To");
+    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("CAR_001"), from, to);
+    HandlingEvent he1 = new HandlingEvent(null, df.parse("2010-01-03"), new Date(), HandlingEvent.Type.RECEIVE, to);
+    HandlingEvent he2 = new HandlingEvent(null, df.parse("2010-01-01"), new Date(), HandlingEvent.Type.LOAD, to, carrierMovement);
+    HandlingEvent he3 = new HandlingEvent(null, df.parse("2010-01-04"), new Date(), HandlingEvent.Type.CLAIM, from);
+    HandlingEvent he4 = new HandlingEvent(null, df.parse("2010-01-02"), new Date(), HandlingEvent.Type.UNLOAD, from, carrierMovement);
     dh.addAllEvents(Arrays.asList(he1, he2, he3, he4));
 
     List<HandlingEvent> orderEvents = dh.eventsOrderedByCompletionTime();

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

@@ -8,10 +8,12 @@ import static java.util.Arrays.asList;
 import java.util.Date;
 
 public class HandlingEventTest extends TestCase {
+  private final Location origin = new Location(new UnLocode("FR","OMX"), "From");
+  private final Location finalDestination = new Location(new UnLocode("TO","YYY"), "To");
+  private final Location a5 = new Location(new UnLocode("AA","AAA"), "AAAAA");
+  private final Location b5 = new Location(new UnLocode("BB","BBB"), "BBBBB");
 
   public void testNewWithCarrierMovement() throws Exception {
-    Location origin = new Location("FROMX");
-    Location finalDestination = new Location("TOYYY");
     Cargo cargo = new Cargo(new TrackingId("XYZ"), origin, finalDestination);
     CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("C01"), origin, finalDestination);
 
@@ -39,46 +41,42 @@ public class HandlingEventTest extends TestCase {
   }
 
   public void testNewWithLocation() throws Exception {
-    Location origin = new Location("FROMX");
-    Location finalDestination = new Location("TOYYY");
+    Location origin = this.origin;
+    Location finalDestination = this.finalDestination;
     Cargo cargo = new Cargo(new TrackingId("XYZ"), origin, finalDestination);
 
-    Location location = new Location("FOOOO");
+    Location location = new Location(new UnLocode("FO","OOO"), "Foo");
     HandlingEvent e1 = new HandlingEvent(cargo, new Date(), new Date(), Type.CLAIM, location);
     assertEquals(location, e1.location());
   }
 
   public void testCurrentLocationLoadEvent() throws Exception {
-    Location locationAAA = new Location("AAAAA");
-    Location locationBBB = new Location("BBBBB");
     CarrierMovementId carrierMovementId = new CarrierMovementId("CAR_001");
-    CarrierMovement cm = new CarrierMovement(carrierMovementId, locationAAA, locationBBB);
+    CarrierMovement cm = new CarrierMovement(carrierMovementId, a5, b5);
     
-    HandlingEvent ev = new HandlingEvent(null, new Date(), new Date(), LOAD, locationAAA, cm);
+    HandlingEvent ev = new HandlingEvent(null, new Date(), new Date(), LOAD, a5, cm);
     
-    assertEquals(locationAAA, ev.location());
+    assertEquals(a5, ev.location());
   }
   
   public void testCurrentLocationUnloadEvent() throws Exception {
-    Location locationAAA = new Location("AAAAA");
-    Location locationBBB = new Location("BBBBB");
     CarrierMovementId carrierMovementId = new CarrierMovementId("CAR_001");
-    CarrierMovement cm = new CarrierMovement(carrierMovementId, locationAAA, locationBBB);
+    CarrierMovement cm = new CarrierMovement(carrierMovementId, a5, b5);
     
-    HandlingEvent ev = new HandlingEvent(null, new Date(), new Date(), UNLOAD, locationBBB, cm);
+    HandlingEvent ev = new HandlingEvent(null, new Date(), new Date(), UNLOAD, b5, cm);
     
-    assertEquals(locationBBB, ev.location());
+    assertEquals(b5, ev.location());
   }
   
   public void testCurrentLocationReceivedEvent() throws Exception {
-    HandlingEvent ev = new HandlingEvent(null, new Date(), new Date(), RECEIVE, new Location("ATEST"));
+    HandlingEvent ev = new HandlingEvent(null, new Date(), new Date(), RECEIVE, a5);
 
-    assertEquals(new Location("ATEST"), ev.location());
+    assertEquals(a5, ev.location());
   }
   public void testCurrentLocationClaimedEvent() throws Exception {
-    HandlingEvent ev = new HandlingEvent(null, new Date(), new Date(), CLAIM, new Location("ATEST"));
+    HandlingEvent ev = new HandlingEvent(null, new Date(), new Date(), CLAIM, a5);
 
-    assertEquals(new Location("ATEST"), ev.location());
+    assertEquals(a5, ev.location());
   }
   
   public void testParseType() throws Exception {
@@ -100,13 +98,11 @@ public class HandlingEventTest extends TestCase {
   public void testEqualsAndSameAs() throws Exception {
     Date timeOccured = new Date();
     Date timeRegistered = new Date();
-    Location locationAAA = new Location("AAAAA");
-    Location locationBBB = new Location("BBBBB");
     CarrierMovementId carrierMovementId = new CarrierMovementId("CAR_001");
-    CarrierMovement cm = new CarrierMovement(carrierMovementId, locationAAA, locationBBB);
+    CarrierMovement cm = new CarrierMovement(carrierMovementId, a5, b5);
 
-    HandlingEvent ev1 = new HandlingEvent(null, timeOccured, timeRegistered, LOAD, locationAAA, cm);
-    HandlingEvent ev2 = new HandlingEvent(null, timeOccured, timeRegistered, LOAD, locationAAA, cm);
+    HandlingEvent ev1 = new HandlingEvent(null, timeOccured, timeRegistered, LOAD, a5, cm);
+    HandlingEvent ev2 = new HandlingEvent(null, timeOccured, timeRegistered, LOAD, a5, cm);
 
     // Two handling events are not equal() even if all non-uuid fields are identical
     assertTrue(ev1.equals(ev2));

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

@@ -2,39 +2,31 @@ package se.citerus.dddsample.domain;
 
 import junit.framework.TestCase;
 
-import java.util.Arrays;
-import java.util.List;
-
 public class LocationTest extends TestCase {
 
   public void testEquals() {
-    // Same location string - equal
-    assertTrue(new Location("ATEST").equals(new Location("ATEST")));
+    // Same UN locode - equal
+    assertTrue(new Location(new UnLocode("AT","EST"),"test-name").
+        equals(new Location(new UnLocode("AT","EST"),"test-name")));
 
-    // Different location strings - not equal
-    assertFalse(new Location("ATEST").equals(new Location("TESTB")));
+    // Different UN locodes - not equal
+    assertFalse(new Location(new UnLocode("AT","EST"),"test-name").
+         equals(new Location(new UnLocode("TE","STB"), "test-name")));
 
     // Always equal to itself
-    Location location = new Location("ATEST");
+    Location location = new Location(new UnLocode("AT","EST"),"test-name");
     assertTrue(location.equals(location));
 
     // Never equal to null
     assertFalse(location.equals(null));
 
-    // Special NULL location is equal to itself
+    // Special UNKNOWN location is equal to itself
     assertTrue(Location.UNKNOWN.equals(Location.UNKNOWN));
 
-    // These are all invalid UN locodes
-    List<String> invalidUnlocodes = Arrays.asList(null, "", "   ", "SHRT", "LOOONG", "WhAt evR 1 12 !!#6/");
-    for (String invalid : invalidUnlocodes) {
-      failInvalidUnlocode(invalid);
-    }
-  }
-
-  private void failInvalidUnlocode(String invalid) {
     try {
-      new Location(invalid);
-      fail(invalid + " should not be allowed as UN locode constructor argument");
+      new Location(null, null);
+      fail("Should not allow any null constructor arguments");
     } catch (IllegalArgumentException expected) {}
   }
+
 }

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

@@ -10,6 +10,10 @@ import java.util.Date;
 import java.util.List;
 
 public class TrackingScenarioTest extends TestCase {
+  private final Location stockholm = new Location(new UnLocode("SE","STO"), "Stockholm");
+  private final Location hamburg = new Location(new UnLocode("DE","HAM"), "Hamburg");
+  private final Location melbourne = new Location(new UnLocode("AU","MEL"), "Melbourne");
+  private final Location hongkong = new Location(new UnLocode("CN","HKG"), "Hongkong");
 
   public void testTrackingScenarioStage1() throws Exception {
 
@@ -30,22 +34,22 @@ public class TrackingScenarioTest extends TestCase {
 
   private DeliveryHistory populateDeliveryHistory(Cargo cargo) throws Exception {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
+            new CarrierMovementId("CAR_001"), stockholm, hamburg);
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
-            new CarrierMovementId("CAR_002"), new Location("DEHAM"), new Location("CNHKG"));
+            new CarrierMovementId("CAR_002"), hamburg, hongkong);
     DeliveryHistory dh = new DeliveryHistory();
     dh.addAllEvents(Arrays.asList(
-            new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, new Location("SESTO"), stockholmToHamburg),
-            new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, new Location("DEHAM"), stockholmToHamburg),
-            new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, new Location("DEHAM"), hamburgToHongKong),
-            new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.UNLOAD, new Location("CNHKG"), hamburgToHongKong)
+            new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholm, stockholmToHamburg),
+            new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, hamburg, stockholmToHamburg),
+            new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburg, hamburgToHongKong),
+            new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.UNLOAD, hongkong, hamburgToHongKong)
     ));
     return dh;
   }
 
   private Cargo populateCargo() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), stockholm, melbourne);
 
     return cargo;
   }

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

@@ -0,0 +1,57 @@
+package se.citerus.dddsample.domain;
+
+import junit.framework.TestCase;
+
+public class UnLocodeTest extends TestCase {
+
+  public void testNew() throws Exception {
+    assertValid("AA", "234");
+    assertValid("AA", "A9B");
+    assertValid("AA", "AAA");
+    
+    assertInvalid("A", "AAA");
+    assertInvalid("AAA", "AAA");
+    assertInvalid("AA", "AA");
+    assertInvalid("AA", "AAAA");
+    assertInvalid("22", "AAA");
+    assertInvalid("AA", "111");
+    assertInvalid(null, "AAA");
+    assertInvalid("AA", null);
+    assertInvalid(null, null);
+  }
+
+  public void testIdString() throws Exception {
+    assertEquals("ABCDE", new UnLocode("Ab", "cDe").idString());
+  }
+
+  public void testEquals() throws Exception {
+    UnLocode allCaps = new UnLocode("AB", "CDE");
+    UnLocode mixedCase = new UnLocode("aB", "cDe");
+
+    assertTrue(allCaps.equals(mixedCase));
+    assertTrue(mixedCase.equals(allCaps));
+    assertTrue(allCaps.equals(allCaps));
+
+    assertFalse(allCaps.equals(null));
+    assertFalse(allCaps.equals(new UnLocode("FG","HIJ")));
+  }
+
+  public void testHashCode() throws Exception {
+    UnLocode allCaps = new UnLocode("AB", "CDE");
+    UnLocode mixedCase = new UnLocode("aB", "cDe");
+
+    assertEquals(allCaps.hashCode(), mixedCase.hashCode());  
+  }
+  
+  private void assertValid(String countryCode, String locationCode) {
+    new UnLocode(countryCode, locationCode);
+  }
+
+  private void assertInvalid(String countryCode, String locationCode) {
+    try {
+      new UnLocode(countryCode, locationCode);
+      fail("The combination [" + countryCode + "," + locationCode + "] is not a valid UnLocode");
+    } catch (IllegalArgumentException expected) {}
+  }
+
+}

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

@@ -22,6 +22,10 @@ public abstract class AbstractRepositoryTest extends AbstractTransactionalDataSo
     transactionManager = new HibernateTransactionManager(sessionFactory);
   }
 
+  public SessionFactory getSessionFactory() {
+    return sessionFactory;
+  }
+
   protected void flush() {
     sessionFactory.getCurrentSession().flush();
   }

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

@@ -3,12 +3,15 @@ package se.citerus.dddsample.repository;
 import se.citerus.dddsample.domain.Cargo;
 import se.citerus.dddsample.domain.Location;
 import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.UnLocode;
 
 import java.util.Map;
 
 public class CargoRepositoryTest extends AbstractRepositoryTest {
 
   CargoRepository cargoRepository;
+  private final Location stockholm = new Location(new UnLocode("SE","STO"), "Stockholm");
+  private final Location melbourne = new Location(new UnLocode("AU","MEL"), "Melbourne");
 
   public void setCargoRepository(CargoRepository cargoRepository) {
     this.cargoRepository = cargoRepository;
@@ -16,26 +19,21 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
 
   public void testFindByCargoId() {
     final TrackingId trackingId = new TrackingId("XYZ");
-    final Location origin = new Location("SESTO");
-    final Location finalDestination = new Location("AUMEL");
 
     Cargo cargo = cargoRepository.find(trackingId);
 
     assertEquals(trackingId, cargo.trackingId());
-    assertEquals(origin, cargo.origin());
-    assertEquals(finalDestination, cargo.finalDestination());
+    assertEquals(stockholm, cargo.origin());
+    assertEquals(melbourne, cargo.finalDestination());
     // TODO: verify delivery history
   }
 
   public void testSave() {
-    // TODO: introduce Location repository
-    Location finalDestination = new Location("TOZZZ");
-    Location origin = new Location("FROMZ");
-    sessionFactory.getCurrentSession().saveOrUpdate(origin);
-    sessionFactory.getCurrentSession().saveOrUpdate(finalDestination);
+    sessionFactory.getCurrentSession().saveOrUpdate(stockholm);
+    sessionFactory.getCurrentSession().saveOrUpdate(melbourne);
 
 
-    Cargo cargo = new Cargo(new TrackingId("AAA"), origin, finalDestination);
+    Cargo cargo = new Cargo(new TrackingId("AAA"), stockholm, melbourne);
     cargoRepository.save(cargo);
 
     flush();

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

@@ -1,19 +1,15 @@
 package se.citerus.dddsample.repository;
 
-import se.citerus.dddsample.domain.CarrierMovementId;
 import se.citerus.dddsample.domain.CarrierMovement;
+import se.citerus.dddsample.domain.CarrierMovementId;
 import se.citerus.dddsample.domain.Location;
+import se.citerus.dddsample.domain.UnLocode;
 
-/**
- * Created by IntelliJ IDEA.
- * User: Peter Backlund
- * Date: 2008-jan-19
- * Time: 18:41:50
- * To change this template use File | Settings | File Templates.
- */
 public class CarrierMovementRepositoryTest extends AbstractRepositoryTest {
 
   CarrierMovementRepository carrierMovementRepository;
+  private final Location stockholm = new Location(new UnLocode("SE","STO"), "Stockholm");
+  private final Location helsinki = new Location(new UnLocode("FI","HEL"), "Helsinki");
 
   public void setCarrierMovementRepository(CarrierMovementRepository carrierMovementRepository) {
     this.carrierMovementRepository = carrierMovementRepository;
@@ -23,8 +19,8 @@ public class CarrierMovementRepositoryTest extends AbstractRepositoryTest {
     CarrierMovement carrierMovement = carrierMovementRepository.find(new CarrierMovementId("CAR_001"));
     assertNotNull(carrierMovement);
     assertEquals("CAR_001", carrierMovement.carrierId().idString());
-    assertEquals(new Location("SESTO"), carrierMovement.from());
-    assertEquals(new Location("FIHEL"), carrierMovement.to());
+    assertEquals(stockholm, carrierMovement.from());
+    assertEquals(helsinki, carrierMovement.to());
   }
 
 }

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

@@ -1,9 +1,6 @@
 package se.citerus.dddsample.repository;
 
-import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.HandlingEvent;
-import se.citerus.dddsample.domain.Location;
-import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -12,6 +9,7 @@ public class HandlingEventRepositoryTest extends AbstractRepositoryTest {
 
   HandlingEventRepository handlingEventRepository;
   CargoRepository cargoRepository;
+  LocationRepository locationRepository;
 
   public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
     this.handlingEventRepository = handlingEventRepository;
@@ -21,10 +19,12 @@ public class HandlingEventRepositoryTest extends AbstractRepositoryTest {
     this.cargoRepository = cargoRepository;
   }
 
+  public void setLocationRepository(LocationRepository locationRepository) {
+    this.locationRepository = locationRepository;
+  }
+
   public void testSave() {
-    // TODO: introduce Location repository
-    Location location = new Location("ABCDE");
-    sessionFactory.getCurrentSession().saveOrUpdate(location);
+    Location location = locationRepository.find(new UnLocode("SE","STO"));
 
     Cargo cargo = cargoRepository.find(new TrackingId("XYZ"));
     Date completionTime = new Date(10);

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

@@ -1,14 +1,16 @@
 package se.citerus.dddsample.repository;
 
 import se.citerus.dddsample.domain.Location;
+import se.citerus.dddsample.domain.UnLocode;
 
 public class LocationRepositoryTest extends AbstractRepositoryTest {
   private LocationRepository locationRepository;
   
   public void testFind() throws Exception {
-    Location location = locationRepository.find("AUMEL");
+    final UnLocode melbourne = new UnLocode("AU", "MEL");
+    Location location = locationRepository.find(melbourne);
     assertNotNull(location);
-    assertEquals("AUMEL", location.unlocode());
+    assertEquals(melbourne, location.unLocode());
   }
 
   public void setLocationRepository(LocationRepository locationRepository) {

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

@@ -76,11 +76,15 @@ public class CargoServiceTest extends AbstractDependencyInjectionSpringContextTe
    * Cargo returned.
    */
   public void testCargoServiceFindByTrackingIdScenario() {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("ORIGI"), new Location("DESTI"));
-    HandlingEvent claimed = new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.CLAIM, new Location("SESTO"));
-    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("MUGER"));
-    HandlingEvent loaded = new HandlingEvent(cargo, new Date(12), new Date(25), HandlingEvent.Type.LOAD, new Location("SESTO"), carrierMovement);
-    HandlingEvent unloaded = new HandlingEvent(cargo, new Date(100), new Date(110), HandlingEvent.Type.UNLOAD, new Location("MUGER"), carrierMovement);
+    Location origin = new Location(new UnLocode("OR","IGI"), "Origin");
+    Location finalDestination = new Location(new UnLocode("DE","STI"), "Destination");
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), origin, finalDestination);
+    Location sesto = new Location(new UnLocode("SE","STO"), "Stockholm");
+    HandlingEvent claimed = new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.CLAIM, sesto);
+    Location to = new Location(new UnLocode("MU","GER"), "München");
+    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("CAR_001"), sesto, to);
+    HandlingEvent loaded = new HandlingEvent(cargo, new Date(12), new Date(25), HandlingEvent.Type.LOAD, sesto, carrierMovement);
+    HandlingEvent unloaded = new HandlingEvent(cargo, new Date(100), new Date(110), HandlingEvent.Type.UNLOAD, to, carrierMovement);
     // Add out of order to verify ordering in DTO
     cargo.deliveryHistory().addAllEvents(Arrays.asList(loaded, unloaded, claimed));
 
@@ -99,30 +103,30 @@ public class CargoServiceTest extends AbstractDependencyInjectionSpringContextTe
 
 
     assertEquals("XYZ", cargoDTO.getTrackingId());
-    assertEquals("ORIGI", cargoDTO.getOrigin());
-    assertEquals("DESTI", cargoDTO.getFinalDestination());
-    assertEquals("MUGER", cargoDTO.getCurrentLocation());
+    assertEquals("ORIGI (Origin)", cargoDTO.getOrigin());
+    assertEquals("DESTI (Destination)", cargoDTO.getFinalDestination());
+    assertEquals("MUGER (München)", cargoDTO.getCurrentLocation());
 
     List<HandlingEventDTO> events = cargoDTO.getEvents();
     assertEquals(3, events.size());
 
     // Claim happened first
     HandlingEventDTO eventDTO = events.get(0);
-    assertEquals("SESTO", eventDTO.getLocation());
+    assertEquals("SESTO (Stockholm)", eventDTO.getLocation());
     assertEquals("CLAIM", eventDTO.getType());
     assertEquals("", eventDTO.getCarrier());
     assertEquals(new Date(10), eventDTO.getTime());
 
     // Then load
     eventDTO = events.get(1);
-    assertEquals("SESTO", eventDTO.getLocation());
+    assertEquals("SESTO (Stockholm)", eventDTO.getLocation());
     assertEquals("LOAD", eventDTO.getType());
     assertEquals("CAR_001", eventDTO.getCarrier());
     assertEquals(new Date(12), eventDTO.getTime());
 
     // Finally unload
     eventDTO = events.get(2);
-    assertEquals("MUGER", eventDTO.getLocation());
+    assertEquals("MUGER (München)", eventDTO.getLocation());
     assertEquals("UNLOAD", eventDTO.getType());
     assertEquals("CAR_001", eventDTO.getCarrier());
     assertEquals(new Date(100), eventDTO.getTime());

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

@@ -16,15 +16,23 @@ public class HandlingEventServiceTest extends TestCase {
   private CarrierMovementRepository carrierMovementRepository;
   private HandlingEventRepository handlingEventRepository;
   private LocationRepository locationRepository;
-  
-  private final Cargo cargoABC = new Cargo(new TrackingId("ABC"), new Location("AFROM"), new Location("ABCTO"));
-  private final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), new Location("XFROM"), new Location("XYZTO"));
+
+  private Location origin = new Location(new UnLocode("AF","ROM"), "AFROM");
+  private Location finalDestination = new Location(new UnLocode("AB","CTO"), "ABCTO");
+  private final Cargo cargoABC = new Cargo(new TrackingId("ABC"), origin, finalDestination);
+
+  private Location xfrom = new Location(new UnLocode("XF","ROM"), "XFROM");
+  private Location xyzto = new Location(new UnLocode("XY","ZTO"), "XYZTO");
+  private final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), xfrom, xyzto);
+
+  private Location a5 = new Location(new UnLocode("AA","AAA"), "AAAAA");
+  private Location b5 = new Location(new UnLocode("BB","BBB"), "BBBBB");
   private final CarrierMovement cmAAA_BBB = new CarrierMovement(
-          new CarrierMovementId("CAR_001"), new Location("AAAAA"), new Location("BBBBB"));
+          new CarrierMovementId("CAR_001"), a5, b5);
   
-  private final Location locationSESTO = new Location("SESTO");
-  private final Location locationAUMEL = new Location("AUMEL");
-  private final Location locationCNHKG = new Location("CNHKG");
+  private final Location stockholm = new Location(new UnLocode("SE","STO"), "Stockholm");
+  private final Location melbourne = new Location(new UnLocode("AU","MEL"), "Melbourne");
+  private final Location hongkong = new Location(new UnLocode("CN","HKG"), "Hongkong");
 
   protected void setUp() throws Exception{
     service = new HandlingEventServiceImpl();
@@ -51,15 +59,16 @@ public class HandlingEventServiceTest extends TestCase {
 
     final CarrierMovementId carrierMovementId = new CarrierMovementId("AAA_BBB");
     expect(carrierMovementRepository.find(carrierMovementId)).andReturn(cmAAA_BBB);
-    
-    expect(locationRepository.find("SESTO")).andReturn(locationSESTO);
+
+    final UnLocode unLocode = new UnLocode("SE", "STO");
+    expect(locationRepository.find(unLocode)).andReturn(stockholm);
 
     // TODO: does not inspect the handling event instance in a sufficient way
     handlingEventRepository.save(isA(HandlingEvent.class));
 
     replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository);
     
-    service.register(date, trackingId, carrierMovementId, "SESTO", HandlingEvent.Type.LOAD);
+    service.register(date, trackingId, carrierMovementId, unLocode, HandlingEvent.Type.LOAD);
   }
 
   public void testRegisterEventWithoutCarrierMovement() throws Exception {
@@ -70,11 +79,11 @@ public class HandlingEventServiceTest extends TestCase {
 
     handlingEventRepository.save(isA(HandlingEvent.class));
     
-    expect(locationRepository.find("SESTO")).andReturn(locationSESTO);
+    expect(locationRepository.find(stockholm.unLocode())).andReturn(stockholm);
 
     replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository);
 
-    service.register(date, trackingId, null, "SESTO", HandlingEvent.Type.CLAIM);
+    service.register(date, trackingId, null, stockholm.unLocode(), HandlingEvent.Type.CLAIM);
   }
   
 
@@ -85,14 +94,14 @@ public class HandlingEventServiceTest extends TestCase {
     expect(carrierMovementRepository.find(carrierMovementId)).andReturn(null);
 
     final TrackingId trackingId = new TrackingId("XYZ");
-    expect(cargoRepository.find(trackingId)).andReturn(new Cargo(trackingId, new Location("FROMX"), new Location("TOYYY")));
+    expect(cargoRepository.find(trackingId)).andReturn(new Cargo(trackingId, a5, b5));
 
-    expect(locationRepository.find("AUMEL")).andReturn(locationAUMEL);
+    expect(locationRepository.find(melbourne.unLocode())).andReturn(melbourne);
     
     replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository);
     
     try {
-      service.register(date, trackingId, carrierMovementId, "AUMEL", HandlingEvent.Type.UNLOAD);
+      service.register(date, trackingId, carrierMovementId, melbourne.unLocode(), HandlingEvent.Type.UNLOAD);
       fail("Should not be able to register an event with non-existing carrier movement");
     } catch (UnknownCarrierMovementIdException expected) {}
   }
@@ -103,12 +112,12 @@ public class HandlingEventServiceTest extends TestCase {
     final TrackingId trackingId = new TrackingId("XYZ");
     expect(cargoRepository.find(trackingId)).andReturn(null);
 
-    expect(locationRepository.find("CNHKG")).andReturn(locationCNHKG);
+    expect(locationRepository.find(hongkong.unLocode())).andReturn(hongkong);
     
     replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository);
     
     try {
-      service.register(date, trackingId, null, "CNHKG", HandlingEvent.Type.CLAIM);
+      service.register(date, trackingId, null, hongkong.unLocode(), HandlingEvent.Type.CLAIM);
       fail("Should not be able to register an event with non-existing cargo");
     } catch (UnknownTrackingIdException expected) {}
   }
@@ -118,12 +127,13 @@ public class HandlingEventServiceTest extends TestCase {
 
     final TrackingId trackingId = new TrackingId("XYZ");
     expect(cargoRepository.find(trackingId)).andReturn(cargoXYZ);
-    expect(locationRepository.find("WAY_OFF")).andReturn(null);
+    UnLocode wayOff = new UnLocode("XX", "YYY");
+    expect(locationRepository.find(wayOff)).andReturn(null);
     
     replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository);
     
     try {
-      service.register(date, trackingId, null, "WAY_OFF", HandlingEvent.Type.CLAIM);
+      service.register(date, trackingId, null, wayOff, HandlingEvent.Type.CLAIM);
       fail("Should not be able to register an event with non-existing Location");
     } catch (UnknownLocationException expected) {}
   }

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

@@ -9,10 +9,7 @@ import org.springframework.validation.BindingResult;
 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.HandlingEvent;
-import se.citerus.dddsample.domain.Location;
-import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.*;
 import se.citerus.dddsample.service.CargoService;
 import se.citerus.dddsample.service.dto.CargoWithHistoryDTO;
 import se.citerus.dddsample.service.dto.HandlingEventDTO;
@@ -43,19 +40,21 @@ public class CargoTrackingControllerTest extends TestCase {
   private CargoService getCargoServiceMock() {
     return new CargoService() {
       public CargoWithHistoryDTO find(String trackingId) {
-        Cargo cargo = new Cargo(new TrackingId(trackingId), new Location("AAAAA"), new Location("BBBBB"));
-        HandlingEvent event = new HandlingEvent(cargo, new Date(10L), new Date(20L), HandlingEvent.Type.RECEIVE, new Location("BBBBB"));
+        final Location a5 = new Location(new UnLocode("AA","AAA"), "AAAAA");
+        final Location b5 = new Location(new UnLocode("BB","BBB"), "BBBBB");
+        Cargo cargo = new Cargo(new TrackingId(trackingId), a5, b5);
+        HandlingEvent event = new HandlingEvent(cargo, new Date(10L), new Date(20L), HandlingEvent.Type.RECEIVE, b5);
 //        cargo.handle(event);
 
         // TODO: use DTO assemblers
         CargoWithHistoryDTO cargoDTO = new CargoWithHistoryDTO(
                 cargo.trackingId().idString(),
-                cargo.origin().unlocode(),
-                cargo.finalDestination().unlocode(),
+                cargo.origin().unLocode().idString(),
+                cargo.finalDestination().unLocode().idString(),
                 "AAAAA"
         );
         cargoDTO.addEvent(new HandlingEventDTO(
-          event.location().unlocode(),
+          event.location().unLocode().idString(),
           event.type().toString(),
           null, // TODO: event hierarchy will remove this kind of code
           event.completionTime()));
@@ -85,6 +84,7 @@ public class CargoTrackingControllerTest extends TestCase {
 
   public void testHandlePost() throws Exception {
     controller.setCargoService(getCargoServiceMock());
+    request.addParameter("trackingId","JKL456");
     request.setMethod("POST");
 
     ModelAndView mav = controller.handleRequest(request, response);

dddsample/src/test/java/se/citerus/dddsample/ws/HandlinEventServiceEndpointTest.java

@@ -5,6 +5,7 @@ import static org.easymock.EasyMock.*;
 import se.citerus.dddsample.domain.CarrierMovementId;
 import se.citerus.dddsample.domain.HandlingEvent;
 import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.UnLocode;
 import se.citerus.dddsample.service.HandlingEventService;
 import se.citerus.dddsample.service.UnknownCarrierMovementIdException;
 import se.citerus.dddsample.service.UnknownTrackingIdException;
@@ -28,7 +29,7 @@ public class HandlinEventServiceEndpointTest extends TestCase {
   public void testRegisterValidEvent() throws Exception {
     Date date = new Date(100);
 
-    handlingEventService.register(date, new TrackingId("FOO"), new CarrierMovementId("CAR_456"), "CNHKG", HandlingEvent.Type.LOAD);
+    handlingEventService.register(date, new TrackingId("FOO"), new CarrierMovementId("CAR_456"), new UnLocode("CN","HKG"), HandlingEvent.Type.LOAD);
     replay(handlingEventService);
 
     // Tested call
@@ -40,8 +41,9 @@ public class HandlinEventServiceEndpointTest extends TestCase {
     Date date = new Date(100);
 
     TrackingId trackingId = new TrackingId("NOTFOUND");
+    UnLocode unlocode = new UnLocode("SE","STO");
 
-      handlingEventService.register(date, trackingId, null, "SESTO", HandlingEvent.Type.CLAIM);
+    handlingEventService.register(date, trackingId, null, unlocode, HandlingEvent.Type.CLAIM);
     expectLastCall().andThrow(new UnknownTrackingIdException(trackingId));
     replay(handlingEventService);
 
@@ -55,7 +57,7 @@ public class HandlinEventServiceEndpointTest extends TestCase {
       TrackingId trackingId = new TrackingId("XYZ");
       CarrierMovementId carrierMovementId = new CarrierMovementId("NOTFOUND");
 
-      handlingEventService.register(date, trackingId, carrierMovementId, "AUMEL", HandlingEvent.Type.UNLOAD);
+      handlingEventService.register(date, trackingId, carrierMovementId, new UnLocode("AU","MEL"), HandlingEvent.Type.UNLOAD);
       expectLastCall().andThrow(new UnknownCarrierMovementIdException(carrierMovementId));
       replay(handlingEventService);