ZipCodeWilmington
/
CargoApp
關注 4
收藏 0
複製 0
程式碼 問題 0 合併請求 0 版本發佈 7 Wiki 活動
瀏覽代碼

Changed date formats to ISO 8601 to prevent tests from failing due to locale issues.

Patrik Fredriksson 19 年之前
父節點
c31fc6c1eb
當前提交
dfcfd459b9
共有 2 個檔案被更改，包括 51 行新增 和 33 行删除
統一視圖 顯示文件統計
  1. 32
    23
      dddsample/src/test/java/se/citerus/dddsample/domain/CargoTest.java
  2. 19
    10
      dddsample/src/test/java/se/citerus/dddsample/domain/TrackingScenarioTest.java

+ 32
- 23
dddsample/src/test/java/se/citerus/dddsample/domain/CargoTest.java 查看文件

1 
 package se.citerus.dddsample.domain;
 1 
 package se.citerus.dddsample.domain;
2
2
3 
+import junit.framework.TestCase;
4 
+
3 
 import java.text.DateFormat;
 5 
 import java.text.DateFormat;
4 
 import java.text.ParseException;
 6 
 import java.text.ParseException;
7 
+import java.text.SimpleDateFormat;
5 
 import java.util.Date;
 8 
 import java.util.Date;
6
9
7 
-import junit.framework.TestCase;
8 
-
9
10
10 
 public class CargoTest extends TestCase{
 11 
 public class CargoTest extends TestCase{
11 
 	public void testCurrentLocationUnloaded() throws Exception {
 12 
 	public void testCurrentLocationUnloaded() throws Exception {
38
39
39 
 		final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
 40 
 		final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
40
41
41 
-	    cargo.handle(new HandlingEvent(getDate("01-Dec-07"), HandlingEvent.Type.ON, stockholmToHamburg));
42 
-	    cargo.handle(new HandlingEvent(getDate("02-Dec-07"), HandlingEvent.Type.OFF, stockholmToHamburg));
42 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.ON, stockholmToHamburg));
43 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.OFF, stockholmToHamburg));
43
44
44 
 	    final CarrierMovement hamburgToHongKong =
 45 
 	    final CarrierMovement hamburgToHongKong =
45 
 	       new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
 46 
 	       new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
46
47
47 
-	    cargo.handle(new HandlingEvent(getDate("03-Dec-07"), HandlingEvent.Type.ON, hamburgToHongKong));
48 
-	    cargo.handle(new HandlingEvent(getDate("04-Dec-07"), HandlingEvent.Type.OFF, hamburgToHongKong));
48 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.ON, hamburgToHongKong));
49 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-04"), HandlingEvent.Type.OFF, hamburgToHongKong));
49
50
50 
 		return cargo;
 51 
 		return cargo;
51 
 	}
 52 
 	}
55
56
56 
 		final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
 57 
 		final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
57
58
58 
-	    cargo.handle(new HandlingEvent(getDate("01-Dec-07"), HandlingEvent.Type.ON, stockholmToHamburg));
59 
-	    cargo.handle(new HandlingEvent(getDate("02-Dec-07"), HandlingEvent.Type.OFF, stockholmToHamburg));
59 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.ON, stockholmToHamburg));
60 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.OFF, stockholmToHamburg));
60
61
61 
 	    final CarrierMovement hamburgToHongKong =
 62 
 	    final CarrierMovement hamburgToHongKong =
62 
 	       new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
 63 
 	       new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
63
64
64 
-	    cargo.handle(new HandlingEvent(getDate("03-Dec-07"), HandlingEvent.Type.ON, hamburgToHongKong));
65 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.ON, hamburgToHongKong));
65
66
66 
 		return cargo;
 67 
 		return cargo;
67 
 	}
 68 
 	}
70
71
71 
 		final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
 72 
 		final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
72
73
73 
-	    cargo.handle(new HandlingEvent(getDate("01-Dec-07"), HandlingEvent.Type.ON, stockholmToHamburg));
74 
-	    cargo.handle(new HandlingEvent(getDate("02-Dec-07"), HandlingEvent.Type.OFF, stockholmToHamburg));
74 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.ON, stockholmToHamburg));
75 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.OFF, stockholmToHamburg));
75
76
76 
 	    final CarrierMovement hamburgToHongKong =
 77 
 	    final CarrierMovement hamburgToHongKong =
77 
 	       new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
 78 
 	       new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
78
79
79 
-	    cargo.handle(new HandlingEvent(getDate("03-Dec-07"), HandlingEvent.Type.ON, hamburgToHongKong));
80 
-	    cargo.handle(new HandlingEvent(getDate("04-Dec-07"), HandlingEvent.Type.OFF, hamburgToHongKong));
80 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.ON, hamburgToHongKong));
81 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-04"), HandlingEvent.Type.OFF, hamburgToHongKong));
81
82
82 
 	    final CarrierMovement hongKongToMelbourne =
 83 
 	    final CarrierMovement hongKongToMelbourne =
83 
 		       new CarrierMovement(new Location("CNHGK"), new Location("AUMEL"));
 84 
 		       new CarrierMovement(new Location("CNHGK"), new Location("AUMEL"));
84
85
85 
-	    cargo.handle(new HandlingEvent(getDate("05-Dec-07"), HandlingEvent.Type.ON, hongKongToMelbourne));
86 
-	    cargo.handle(new HandlingEvent(getDate("07-Dec-07"), HandlingEvent.Type.OFF, hongKongToMelbourne));
86 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-05"), HandlingEvent.Type.ON, hongKongToMelbourne));
87 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-07"), HandlingEvent.Type.OFF, hongKongToMelbourne));
87
88
88 
 		return cargo;
 89 
 		return cargo;
89 
 	}
 90 
 	}
93
94
94 
 		final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
 95 
 		final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
95
96
96 
-	    cargo.handle(new HandlingEvent(getDate("01-Dec-07"), HandlingEvent.Type.ON, stockholmToHamburg));
97 
-	    cargo.handle(new HandlingEvent(getDate("02-Dec-07"), HandlingEvent.Type.OFF, stockholmToHamburg));
97 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.ON, stockholmToHamburg));
98 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.OFF, stockholmToHamburg));
98
99
99 
 	    final CarrierMovement hamburgToHongKong =
 100 
 	    final CarrierMovement hamburgToHongKong =
100 
 	       new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
 101 
 	       new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
101
102
102 
-	    cargo.handle(new HandlingEvent(getDate("03-Dec-07"), HandlingEvent.Type.ON, hamburgToHongKong));
103 
-	    cargo.handle(new HandlingEvent(getDate("04-Dec-07"), HandlingEvent.Type.OFF, hamburgToHongKong));
103 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.ON, hamburgToHongKong));
104 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-04"), HandlingEvent.Type.OFF, hamburgToHongKong));
104
105
105 
 	    final CarrierMovement hongKongToMelbourne =
 106 
 	    final CarrierMovement hongKongToMelbourne =
106 
 		       new CarrierMovement(new Location("CNHGK"), new Location("AUMEL"));
 107 
 		       new CarrierMovement(new Location("CNHGK"), new Location("AUMEL"));
107
108
108 
-	    cargo.handle(new HandlingEvent(getDate("05-Dec-07"), HandlingEvent.Type.ON, hongKongToMelbourne));
109 
+	    cargo.handle(new HandlingEvent(getDate("2007-12-05"), HandlingEvent.Type.ON, hongKongToMelbourne));
109
110
110 
 		return cargo;
 111 
 		return cargo;
111 
 	}
 112 
 	}
112
113
113 
-	private Date getDate(String date) throws ParseException {
114 
-		return DateFormat.getDateInstance(DateFormat.DEFAULT).parse(date);
115 
-	}
114 
+	/**
115 
+   * Parse an ISO 8601 (YYYY-MM-DD) String to Date
116 
+   *
117 
+   * @param isoFormat String to parse.
118 
+   * @return Created date instance.
119 
+   * @throws ParseException Thrown if parsing fails.
120 
+   */
121 
+  private Date getDate(String isoFormat) throws ParseException {
122 
+    final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
123 
+    return dateFormat.parse(isoFormat);
124 
+  }
116 
 }
 125 
 }

+ 19
- 10
dddsample/src/test/java/se/citerus/dddsample/domain/TrackingScenarioTest.java 查看文件

1 
 package se.citerus.dddsample.domain;
 1 
 package se.citerus.dddsample.domain;
2
2
3 
+import junit.framework.TestCase;
4 
+
3 
 import java.text.DateFormat;
 5 
 import java.text.DateFormat;
4 
 import java.text.ParseException;
 6 
 import java.text.ParseException;
7 
+import java.text.SimpleDateFormat;
5 
 import java.util.Date;
 8 
 import java.util.Date;
6 
 import java.util.SortedSet;
 9 
 import java.util.SortedSet;
7
10
8 
-import junit.framework.TestCase;
9 
-
10 
 public class TrackingScenarioTest extends TestCase {
 11 
 public class TrackingScenarioTest extends TestCase {
11
12
12 
   public void testTrackingScenarioStage1() throws Exception {
 13 
   public void testTrackingScenarioStage1() throws Exception {
31 
     final CarrierMovement stockholmToHamburg =
 32 
     final CarrierMovement stockholmToHamburg =
32 
        new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
 33 
        new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
33
34
34 
-
35 
-    cargo.handle(new HandlingEvent(getDate("01-Dec-07"), HandlingEvent.Type.ON, stockholmToHamburg));
36 
-    cargo.handle(new HandlingEvent(getDate("02-Dec-07"), HandlingEvent.Type.OFF, stockholmToHamburg));
35 
+
36 
+    cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.ON, stockholmToHamburg));
37 
+    cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.OFF, stockholmToHamburg));
37
38
38 
     final CarrierMovement hamburgToHongKong =
 39 
     final CarrierMovement hamburgToHongKong =
39 
        new CarrierMovement(new Location("DEHAM"), new Location("CNHKG"));
 40 
        new CarrierMovement(new Location("DEHAM"), new Location("CNHKG"));
40
41
41 
-    cargo.handle(new HandlingEvent(getDate("03-Dec-07"), HandlingEvent.Type.ON, hamburgToHongKong));
42 
-    cargo.handle(new HandlingEvent(getDate("05-Dec-07"), HandlingEvent.Type.OFF, hamburgToHongKong));
42 
+    cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.ON, hamburgToHongKong));
43 
+    cargo.handle(new HandlingEvent(getDate("2007-12-05"), HandlingEvent.Type.OFF, hamburgToHongKong));
43
44
44 
     return cargo;
 45 
     return cargo;
45 
   }
 46 
   }
46
47
47 
-	private Date getDate(String date) throws ParseException {
48 
-		return DateFormat.getDateInstance(DateFormat.DEFAULT).parse(date);
49 
-	}
48 
+  /**
49 
+   * Parse an ISO 8601 (YYYY-MM-DD) String to Date
50 
+   *
51 
+   * @param isoFormat String to parse.
52 
+   * @return Created date instance.
53 
+   * @throws ParseException Thrown if parsing fails.
54 
+   */
55 
+  private Date getDate(String isoFormat) throws ParseException {
56 
+    final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
57 
+    return dateFormat.parse(isoFormat);
58 
+  }
50
59
51 
 }
 60 
 }