Eric - Fixed bug in CargoTrackingViewAdapterTest.java, which worked only for Central Europe Time.

Changed TrackingViewAdapter to show time in the time zone of the location of the event.
To do this, we added a TimeZone to the Location, which is passed into the constructor.

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

@@ -1,5 +1,7 @@
 package se.citerus.dddsample.domain.model.location;
 
+import java.util.TimeZone;
+
 import org.apache.commons.lang.Validate;
 import se.citerus.dddsample.domain.shared.Entity;
 
@@ -14,27 +16,31 @@ public final class Location implements Entity<Location> {
 
   private UnLocode unLocode;
   private String name;
+  private TimeZone timeZone;
 
   /**
    * Special Location object that marks an unknown location.
    */
   public static final Location UNKNOWN = new Location(
-    new UnLocode("XXXXX"), "Unknown location"
+    new UnLocode("XXXXX"), "Unknown location", TimeZone.getTimeZone("Zulu")
   );
 
   /**
    * Package-level constructor, visible for test only.
    *
    * @param unLocode UN Locode
-   * @param name     location name
+ * @param name     location name
+ * @param timeZone TODO
    * @throws IllegalArgumentException if the UN Locode or name is null
    */
-  Location(final UnLocode unLocode, final String name) {
-    Validate.notNull(unLocode);
+  Location(final UnLocode unLocode, final String name, TimeZone timeZone) {
+	Validate.notNull(unLocode);
     Validate.notNull(name);
+    Validate.notNull(timeZone);
     
     this.unLocode = unLocode;
     this.name = name;
+    this.timeZone = timeZone;
   }
 
   /**
@@ -94,4 +100,8 @@ public final class Location implements Entity<Location> {
 
   private Long id;
 
+public TimeZone timeZone() {
+	return timeZone;
+}
+
 }

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/SampleLocations.java

@@ -5,26 +5,34 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 
 /**
  * Sample locations, for test purposes.
  * 
  */
 public class SampleLocations {
-
-  public static final Location HONGKONG = new Location(new UnLocode("CNHKG"), "Hongkong");
-  public static final Location MELBOURNE = new Location(new UnLocode("AUMEL"), "Melbourne");
-  public static final Location STOCKHOLM = new Location(new UnLocode("SESTO"), "Stockholm");
-  public static final Location HELSINKI = new Location(new UnLocode("FIHEL"), "Helsinki");
-  public static final Location CHICAGO = new Location(new UnLocode("USCHI"), "Chicago");
-  public static final Location TOKYO = new Location(new UnLocode("JNTKO"), "Tokyo");
-  public static final Location HAMBURG = new Location(new UnLocode("DEHAM"), "Hamburg");
-  public static final Location SHANGHAI = new Location(new UnLocode("CNSHA"), "Shanghai");
-  public static final Location ROTTERDAM = new Location(new UnLocode("NLRTM"), "Rotterdam");
-  public static final Location GOTHENBURG = new Location(new UnLocode("SEGOT"), "Göteborg");
-  public static final Location HANGZOU = new Location(new UnLocode("CNHGH"), "Hangzhou");
-  public static final Location NEWYORK = new Location(new UnLocode("USNYC"), "New York");
-  public static final Location DALLAS = new Location(new UnLocode("USDAL"), "Dallas");
+  private static final TimeZone CHINA =  TimeZone.getTimeZone("Asia/Shanghai");
+  private static final TimeZone CENTRAL_EUROPE =  TimeZone.getTimeZone("Europe/Stockholm");
+  private static final TimeZone JAPAN =  TimeZone.getTimeZone("Asia/Tokyo");
+  private static final TimeZone EASTERN =  TimeZone.getTimeZone("America/New_York");
+  private static final TimeZone CENTRAL =  TimeZone.getTimeZone("America/Chicago");
+  private static final TimeZone EASTERN_AUSTRALIA =  TimeZone.getTimeZone("Australia/Melbourne");
+  
+
+  public static final Location HONGKONG = new Location(new UnLocode("CNHKG"), "Hongkong",  CHINA);
+  public static final Location MELBOURNE = new Location(new UnLocode("AUMEL"), "Melbourne", EASTERN_AUSTRALIA);
+  public static final Location STOCKHOLM = new Location(new UnLocode("SESTO"), "Stockholm",  CENTRAL_EUROPE);
+  public static final Location HELSINKI = new Location(new UnLocode("FIHEL"), "Helsinki",  CENTRAL_EUROPE);
+  public static final Location CHICAGO = new Location(new UnLocode("USCHI"), "Chicago", CENTRAL);
+  public static final Location TOKYO = new Location(new UnLocode("JNTKO"), "Tokyo", JAPAN);
+  public static final Location HAMBURG = new Location(new UnLocode("DEHAM"), "Hamburg", CENTRAL_EUROPE);
+  public static final Location SHANGHAI = new Location(new UnLocode("CNSHA"), "Shanghai", CHINA);
+  public static final Location ROTTERDAM = new Location(new UnLocode("NLRTM"), "Rotterdam", CENTRAL_EUROPE);
+  public static final Location GOTHENBURG = new Location(new UnLocode("SEGOT"), "Göteborg", CENTRAL_EUROPE);
+  public static final Location HANGZOU = new Location(new UnLocode("CNHGH"), "Hangzhou", CHINA);
+  public static final Location NEWYORK = new Location(new UnLocode("USNYC"), "New York", EASTERN);
+  public static final Location DALLAS = new Location(new UnLocode("USDAL"), "Dallas", CENTRAL);
 
   public static final Map<UnLocode, Location> ALL = new HashMap<UnLocode, Location>();
 

dddsample/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java

@@ -20,7 +20,7 @@ public final class CargoTrackingViewAdapter {
   private final MessageSource messageSource;
   private final Locale locale;
   private final List<HandlingEventViewAdapter> events;
-  private final String FORMAT = "yyyy-MM-dd hh:mm";
+  private final String FORMAT = "yyyy-MM-dd hh:mm z";
 
   /**
    * Constructor.
@@ -107,7 +107,12 @@ public final class CargoTrackingViewAdapter {
     Date eta = cargo.delivery().estimatedTimeOfArrival();
 
     if (eta == null) return "?";
-    else return new SimpleDateFormat(FORMAT).format(eta);
+	else {
+		Location destination = cargo.routeSpecification().destination();
+		SimpleDateFormat dateFormat = new SimpleDateFormat(FORMAT);
+		dateFormat.setTimeZone(destination.timeZone());
+		return dateFormat.format(eta);
+	}
   }
 
   public String getNextExpectedActivity() {
@@ -165,7 +170,10 @@ public final class CargoTrackingViewAdapter {
      * @return Time when the event was completed.
      */
     public String getTime() {
-      return new SimpleDateFormat(FORMAT).format(handlingEvent.completionTime());
+		SimpleDateFormat dateFormat = new SimpleDateFormat(FORMAT);
+		dateFormat.setTimeZone(handlingEvent.location().timeZone());
+
+      return dateFormat.format(handlingEvent.completionTime());
     }
 
     /**

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

@@ -1,20 +1,24 @@
 package se.citerus.dddsample.domain.model.location;
 
+import java.util.TimeZone;
+
 import junit.framework.TestCase;
 
 public class LocationTest extends TestCase {
-
+	private static final TimeZone CET = TimeZone.getTimeZone("Europe/Amsterdam"); 
+	
   public void testEquals() {
+	  
     // Same UN locode - equal
-    assertTrue(new Location(new UnLocode("ATEST"),"test-name").
-        equals(new Location(new UnLocode("ATEST"),"test-name")));
+    assertTrue(new Location(new UnLocode("ATEST"),"test-name", CET).
+        equals(new Location(new UnLocode("ATEST"),"test-name", CET)));
 
     // Different UN locodes - not equal
-    assertFalse(new Location(new UnLocode("ATEST"),"test-name").
-         equals(new Location(new UnLocode("TESTB"), "test-name")));
+    assertFalse(new Location(new UnLocode("ATEST"),"test-name", CET).
+         equals(new Location(new UnLocode("TESTB"), "test-name", CET)));
 
     // Always equal to itself
-    Location location = new Location(new UnLocode("ATEST"),"test-name");
+    Location location = new Location(new UnLocode("ATEST"),"test-name", CET);
     assertTrue(location.equals(location));
 
     // Never equal to null
@@ -24,7 +28,7 @@ public class LocationTest extends TestCase {
     assertTrue(Location.UNKNOWN.equals(Location.UNKNOWN));
 
     try {
-      new Location(null, null);
+      new Location(null, null, null);
       fail("Should not allow any null constructor arguments");
     } catch (IllegalArgumentException expected) {}
   }

dddsample/src/test/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapterTest.java

@@ -42,21 +42,21 @@ public class CargoTrackingViewAdapterTest extends TestCase {
     CargoTrackingViewAdapter.HandlingEventViewAdapter event = it.next();
     assertEquals("RECEIVE", event.getType());
     assertEquals("Hangzhou", event.getLocation());
-    assertEquals("1970-01-01 01:00", event.getTime());
+    assertEquals("1970-01-01 08:00 CST", event.getTime());
     assertEquals("", event.getVoyageNumber());
     assertTrue(event.isExpected());
 
     event = it.next();
     assertEquals("LOAD", event.getType());
     assertEquals("Hangzhou", event.getLocation());
-    assertEquals("1970-01-01 01:00", event.getTime());
+    assertEquals("1970-01-01 08:00 CST", event.getTime());
     assertEquals("CM001", event.getVoyageNumber());
     assertTrue(event.isExpected());
 
     event = it.next();
     assertEquals("UNLOAD", event.getType());
     assertEquals("Helsinki", event.getLocation());
-    assertEquals("1970-01-01 01:00", event.getTime());
+    assertEquals("1970-01-01 01:00 CET", event.getTime());
     assertEquals("CM001", event.getVoyageNumber());
     assertTrue(event.isExpected());
   }