Added CargoTest and fixed failing tests

dddsample/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>se.citerus</groupId>
-    <artifactId>dddsample</artifactId>
-    <packaging>war</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>DDDSample</name>
-    <description>
-        This application shows a few key concepts of
-        Domain Driven Design implemented in Enterprise Java.
-    </description>
-    <url>http://sourceforge.net/projects/dddsample/</url>
-
-    <ciManagement/>
-
-    <scm>
-        <developerConnection>scm:svn:https://dddsample.svn.sourceforge.net/svnroot/dddsample</developerConnection>
-        <url>http://dddsample.svn.sourceforge.net/viewvc/dddsample/</url>
-    </scm>
-
-    <licenses>
-        <license>
-            <name>MIT</name>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <id>peba</id>
-            <name>Peter Backlund</name>
-            <organization>Citerus</organization>
-            <organizationUrl>http://www.citerus.se</organizationUrl>
-            <email>peter.backlund@citerus.se</email>
-            <timezone>CET</timezone>
-        </developer>
-        <developer>
-            <id>patrikfr</id>
-            <name>Patrik Fredriksson</name>
-            <organization>Citerus</organization>
-            <organizationUrl>http://www.citerus.se</organizationUrl>
-            <email>patrikfr@users.sourceforge.net</email>
-            <timezone>CET</timezone>
-        </developer>
-        <developer>
-            <id>jeham</id>
-            <name>Jesper Hammarback</name>
-            <organization>Citerus</organization>
-            <organizationUrl>http://www.citerus.se</organizationUrl>
-            <email>jeham@users.sourceforge.net</email>
-            <timezone>CET</timezone>
-        </developer>
-        <developer>
-            <id>jorgen_falk</id>
-            <name>Jorgen Falk</name>
-            <organization>Citerus</organization>
-            <organizationUrl>http://www.citerus.se</organizationUrl>
-            <email>jorgen.falk@citerus.se</email>
-            <timezone>GMT+1</timezone>
-        </developer>
-    </developers>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.4</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>se.citerus</groupId>
+  <artifactId>dddsample</artifactId>
+  <packaging>war</packaging>
+  <name>DDDSample</name>
+  <version>1.0-SNAPSHOT</version>
+  <description>This application shows a few key concepts of
+        Domain Driven Design implemented in Enterprise Java.</description>
+  <url>http://sourceforge.net/projects/dddsample/</url>
+  <ciManagement />
+  <developers>
+    <developer>
+      <id>peba</id>
+      <name>Peter Backlund</name>
+      <email>peter.backlund@citerus.se</email>
+      <organization>Citerus</organization>
+      <organizationUrl>http://www.citerus.se</organizationUrl>
+      <timezone>CET</timezone>
+    </developer>
+    <developer>
+      <id>patrikfr</id>
+      <name>Patrik Fredriksson</name>
+      <email>patrikfr@users.sourceforge.net</email>
+      <organization>Citerus</organization>
+      <organizationUrl>http://www.citerus.se</organizationUrl>
+      <timezone>CET</timezone>
+    </developer>
+    <developer>
+      <id>jeham</id>
+      <name>Jesper Hammarback</name>
+      <email>jeham@users.sourceforge.net</email>
+      <organization>Citerus</organization>
+      <organizationUrl>http://www.citerus.se</organizationUrl>
+      <timezone>CET</timezone>
+    </developer>
+    <developer>
+      <id>jorgen_falk</id>
+      <name>Jorgen Falk</name>
+      <email>jorgen.falk@citerus.se</email>
+      <organization>Citerus</organization>
+      <organizationUrl>http://www.citerus.se</organizationUrl>
+      <timezone>GMT+1</timezone>
+    </developer>
+  </developers>
+  <licenses>
+    <license>
+      <name>MIT</name>
+    </license>
+  </licenses>
+  <scm>
+    <developerConnection>scm:svn:https://dddsample.svn.sourceforge.net/svnroot/dddsample</developerConnection>
+    <url>http://dddsample.svn.sourceforge.net/viewvc/dddsample/</url>
+  </scm>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring</artifactId>
+      <version>2.0.6</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>20030203.000129</version>
+    </dependency>
+  </dependencies>
+</project>

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

 package se.citerus.dddsample.domain;
 
+
+/**
+ * A Cargo an entity identifed by TrackingId and is capable of getting its DeliveryHistory plus a number
+ * of convenience operation for finding current destination etc.
+ * 
+ * @author jorgenfalk
+ *
+ */
 public class Cargo {
-  private final TrackingId trackingId;
-  private final Location from;
-  private final Location to;
-
-  public Cargo(TrackingId trackingId, Location origin, Location finalDestination) {
-    this.trackingId = trackingId;
-    this.from = origin;
-    this.to = finalDestination;
-  }
-
-  public DeliveryHistory deliveryHistory() {
-    return null;  //To change body of created methods use File | Settings | File Templates.
-  }
-
-  public void handle(HandlingEvent event) {
-    //To change body of created methods use File | Settings | File Templates.
-  }
-
-  public boolean atFinalDestiation() {
-    return false;  //To change body of created methods use File | Settings | File Templates.
-  }
-
-  public Location currentLocation() {
-    return null;  //To change body of created methods use File | Settings | File Templates.
-  }
-
-  public TrackingId trackingId() {
-    return null;  //To change body of created methods use File | Settings | File Templates.
-  }
+	private final TrackingId trackingId;
+	private final Location from;
+	private final Location to;
+	private DeliveryHistory history;
+
+	public Cargo(TrackingId trackingId, Location origin, Location finalDestination) {
+		this.trackingId = trackingId;
+		this.from = origin;
+		this.to = finalDestination;
+		
+		this.history = new DeliveryHistory();
+	}
+
+	public DeliveryHistory deliveryHistory() {
+		return history;
+	}
+
+	public void handle(HandlingEvent event) {
+		history.add(event);
+	}
+
+	public boolean atFinalDestiation() {
+		return currentLocation().equals(to);
+	}
+
+	public Location currentLocation() {
+		HandlingEvent lastEvent = history.last();
+		CarrierMovement cm = lastEvent.getCarrierMovement();
+		
+		return (lastEvent.type()==HandlingEvent.Type.ON) ? cm.from() : cm.to();
+	}
+
+	public TrackingId trackingId() {
+		return trackingId;
+	}
 }

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

 package se.citerus.dddsample.domain;
 
 public class CarrierMovement {
-  public CarrierMovement(Location from, Location to) {
-    //To change body of created methods use File | Settings | File Templates.
-  }
+	private final Location from;
+	private final Location to;
+
+	public CarrierMovement(Location from, Location to) {
+		this.from = from;
+		this.to = to;
+	}
+
+	public Location from() {
+		return from;
+	}
+
+	public Location to() {
+		return to;
+	}
+
+	
 }

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

 package se.citerus.dddsample.domain;
 
 import java.util.SortedSet;
+import java.util.TreeSet;
 
 public class DeliveryHistory {
-  public SortedSet<HandlingEvent> events() {
-    return null;  //To change body of created methods use File | Settings | File Templates.
-  }
+	
+	private TreeSet<HandlingEvent> events;
+	
+	
+	public DeliveryHistory() {
+		this.events = new TreeSet<HandlingEvent>();
+	}
+
+
+	public SortedSet<HandlingEvent> events() {
+		return events; 
+	}
+
+
+	public void add(HandlingEvent event) {
+		events.add(event);
+	}
+
+
+	public HandlingEvent last() {
+		return events.last();
+	}
 }

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

 package se.citerus.dddsample.domain;
 
-public class HandlingEvent {
-  public HandlingEvent(Type type, CarrierMovement carrierMovement) {
-    //To change body of created methods use File | Settings | File Templates.
-  }
-
-  public Type type() {
-    return null;  //To change body of created methods use File | Settings | File Templates.
-  }
-
-  public enum Type {
-    ON, OFF;
-  }
+import java.util.Date;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+/**
+ * HandlingEvent links the type of handling with a CarrierMovement.
+ * 
+ * Since HandlingEvents can be added in any order to a Cargo (or DeliveryHistory), they need to implement Comparable to be able to be sorted in correct order.
+ * 
+ * @author jorgenfalk
+ */
+public class HandlingEvent implements Comparable<HandlingEvent>{
+
+	private final Type type;
+	private final CarrierMovement carrierMovement;
+	private final Date time;
+
+	public enum Type {
+		ON, OFF;
+	}
+	
+	
+	public HandlingEvent(Date time, Type type, CarrierMovement carrierMovement) {
+		this.time = time;
+		this.type = type;
+		this.carrierMovement = carrierMovement;
+	}
+
+	public Type type() {
+		return type;
+	}
+
+	public CarrierMovement getCarrierMovement() {
+		return carrierMovement;
+	}
+
+	public Date time() {
+		return time;
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		return EqualsBuilder.reflectionEquals(this, obj);
+	}
+
+	@Override
+	public int hashCode() {
+		return HashCodeBuilder.reflectionHashCode(this);
+	}
+
+	public int compareTo(HandlingEvent o) {
+		return time.compareTo(o.time());
+	}	
 }

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

 package se.citerus.dddsample.domain;
 
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
 public class Location {
-  private final String unlocode;
+	private final String unlocode;
+
+	public Location(String unlocode) {
+		this.unlocode = unlocode;
+	}
 
-  public Location(String unlocode) {
-    this.unlocode = unlocode;
-  }
+	public String unlocode() {
+		return unlocode;
+	}
 
+	@Override
+	public boolean equals(Object obj) {
+		return EqualsBuilder.reflectionEquals(this, obj);
+	}
 
-  public String unlocode() {
-    return null;
-  }
+	@Override
+	public int hashCode() {
+		return HashCodeBuilder.reflectionHashCode(this);
+	}
+	
+	
 }

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

+package se.citerus.dddsample.domain;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.Date;
+
+import junit.framework.TestCase;
+
+
+public class CargoTest extends TestCase{
+	public void testCurrentLocationUnloaded() throws Exception {
+		Cargo cargo = populateCargoOffHongKong();
+		
+		assertEquals(new Location("CNHGK"), cargo.currentLocation());
+	}
+	
+	public void testCurrentLocationloaded() throws Exception {
+		Cargo cargo = populateCargoOnHamburg();
+		
+		assertEquals(new Location("DEHAM"), cargo.currentLocation());
+	}
+	
+	public void testAtFinalLocation() throws Exception {
+		Cargo cargo = populateCargoOffMelbourne();
+		
+		assertTrue(cargo.atFinalDestiation());
+	}
+	
+	public void testNotAtFinalLocationWhenNotUnloaded() throws Exception {
+		Cargo cargo = populateCargoOnHongKong();
+		
+		assertFalse(cargo.atFinalDestiation());
+	}
+	
+	// TODO: Generate test data some better way
+	private Cargo populateCargoOffHongKong() throws Exception {
+		final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
+
+		final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
+
+	    cargo.handle(new HandlingEvent(getDate("01-Dec-07"), HandlingEvent.Type.ON, stockholmToHamburg));
+	    cargo.handle(new HandlingEvent(getDate("02-Dec-07"), HandlingEvent.Type.OFF, stockholmToHamburg));
+
+	    final CarrierMovement hamburgToHongKong =
+	       new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
+
+	    cargo.handle(new HandlingEvent(getDate("03-Dec-07"), HandlingEvent.Type.ON, hamburgToHongKong));
+	    cargo.handle(new HandlingEvent(getDate("04-Dec-07"), HandlingEvent.Type.OFF, hamburgToHongKong));
+	    
+		return cargo;
+	}
+	
+	private Cargo populateCargoOnHamburg() throws Exception {
+		final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
+
+		final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
+
+	    cargo.handle(new HandlingEvent(getDate("01-Dec-07"), HandlingEvent.Type.ON, stockholmToHamburg));
+	    cargo.handle(new HandlingEvent(getDate("02-Dec-07"), HandlingEvent.Type.OFF, stockholmToHamburg));
+
+	    final CarrierMovement hamburgToHongKong =
+	       new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
+
+	    cargo.handle(new HandlingEvent(getDate("03-Dec-07"), HandlingEvent.Type.ON, hamburgToHongKong));
+
+		return cargo;
+	}
+	private Cargo populateCargoOffMelbourne() throws Exception {
+		final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
+
+		final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
+
+	    cargo.handle(new HandlingEvent(getDate("01-Dec-07"), HandlingEvent.Type.ON, stockholmToHamburg));
+	    cargo.handle(new HandlingEvent(getDate("02-Dec-07"), HandlingEvent.Type.OFF, stockholmToHamburg));
+
+	    final CarrierMovement hamburgToHongKong =
+	       new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
+
+	    cargo.handle(new HandlingEvent(getDate("03-Dec-07"), HandlingEvent.Type.ON, hamburgToHongKong));
+	    cargo.handle(new HandlingEvent(getDate("04-Dec-07"), HandlingEvent.Type.OFF, hamburgToHongKong));
+
+	    final CarrierMovement hongKongToMelbourne =
+		       new CarrierMovement(new Location("CNHGK"), new Location("AUMEL"));
+	    
+	    cargo.handle(new HandlingEvent(getDate("05-Dec-07"), HandlingEvent.Type.ON, hongKongToMelbourne));
+	    cargo.handle(new HandlingEvent(getDate("07-Dec-07"), HandlingEvent.Type.OFF, hongKongToMelbourne));
+	    
+		return cargo;
+	}
+	
+	private Cargo populateCargoOnHongKong() throws Exception {
+		final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
+
+		final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
+
+	    cargo.handle(new HandlingEvent(getDate("01-Dec-07"), HandlingEvent.Type.ON, stockholmToHamburg));
+	    cargo.handle(new HandlingEvent(getDate("02-Dec-07"), HandlingEvent.Type.OFF, stockholmToHamburg));
+
+	    final CarrierMovement hamburgToHongKong =
+	       new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
+
+	    cargo.handle(new HandlingEvent(getDate("03-Dec-07"), HandlingEvent.Type.ON, hamburgToHongKong));
+	    cargo.handle(new HandlingEvent(getDate("04-Dec-07"), HandlingEvent.Type.OFF, hamburgToHongKong));
+
+	    final CarrierMovement hongKongToMelbourne =
+		       new CarrierMovement(new Location("CNHGK"), new Location("AUMEL"));
+	    
+	    cargo.handle(new HandlingEvent(getDate("05-Dec-07"), HandlingEvent.Type.ON, hongKongToMelbourne));
+	    
+		return cargo;
+	}
+	
+	private Date getDate(String date) throws ParseException {
+		return DateFormat.getDateInstance(DateFormat.DEFAULT).parse(date);
+	}
+}

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

 package se.citerus.dddsample.domain;
 
-import junit.framework.TestCase;
-
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.Date;
 import java.util.SortedSet;
 
+import junit.framework.TestCase;
+
 public class TrackingScenarioTest extends TestCase {
 
-  public void testTrackingScenarioStage1() {
+  public void testTrackingScenarioStage1() throws Exception {
 
     Cargo cargo = populateCargo();
 
 
   }
 
-  private Cargo populateCargo() {
+  private Cargo populateCargo() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
 
     final CarrierMovement stockholmToHamburg =
        new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
 
-    cargo.handle(new HandlingEvent(HandlingEvent.Type.ON, stockholmToHamburg));
-    cargo.handle(new HandlingEvent(HandlingEvent.Type.OFF, stockholmToHamburg));
+    
+    cargo.handle(new HandlingEvent(getDate("01-Dec-07"), HandlingEvent.Type.ON, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("02-Dec-07"), HandlingEvent.Type.OFF, stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong =
-       new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
+       new CarrierMovement(new Location("DEHAM"), new Location("CNHKG"));
 
-    cargo.handle(new HandlingEvent(HandlingEvent.Type.ON, hamburgToHongKong));
-    cargo.handle(new HandlingEvent(HandlingEvent.Type.OFF, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("03-Dec-07"), HandlingEvent.Type.ON, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("05-Dec-07"), HandlingEvent.Type.OFF, hamburgToHongKong));
 
     return cargo;
   }
 
+	private Date getDate(String date) throws ParseException {
+		return DateFormat.getDateInstance(DateFormat.DEFAULT).parse(date);
+	}
+
 }