ZipCodeWilmington
/
CargoApp
Следить 4
В избранное 0
Форкнуть 0
Код Задачи 0 Pull Request'ы 0 Релизы 7 Вики Активность
Просмотр исходного кода

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

Patrik Fredriksson 19 лет назад
Родитель
c31fc6c1eb
Сommit
dfcfd459b9
2 измененных файлов: 51 добавлений и 33 удалений
Разделённый вид Показать статистику Diff
  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,11 +1,12 @@
1 1 
 package se.citerus.dddsample.domain;
2 2
3 
+import junit.framework.TestCase;
4 
+
3 5 
 import java.text.DateFormat;
4 6 
 import java.text.ParseException;
7 
+import java.text.SimpleDateFormat;
5 8 
 import java.util.Date;
6 9
7 
-import junit.framework.TestCase;
8 
-
9 10
10 11 
 public class CargoTest extends TestCase{
11 12 
 	public void testCurrentLocationUnloaded() throws Exception {
 
@@ -38,14 +39,14 @@ public class CargoTest extends TestCase{
38 39
39 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 45 
 	    final CarrierMovement hamburgToHongKong =
45 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 51 
 		return cargo;
51 52 
 	}
 
@@ -55,13 +56,13 @@ public class CargoTest extends TestCase{
55 56
56 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 62 
 	    final CarrierMovement hamburgToHongKong =
62 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 67 
 		return cargo;
67 68 
 	}
 
@@ -70,20 +71,20 @@ public class CargoTest extends TestCase{
70 71
71 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 77 
 	    final CarrierMovement hamburgToHongKong =
77 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 83 
 	    final CarrierMovement hongKongToMelbourne =
83 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 89 
 		return cargo;
89 90 
 	}
 
@@ -93,24 +94,32 @@ public class CargoTest extends TestCase{
93 94
94 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 100 
 	    final CarrierMovement hamburgToHongKong =
100 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 106 
 	    final CarrierMovement hongKongToMelbourne =
106 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 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,12 +1,13 @@
1 1 
 package se.citerus.dddsample.domain;
2 2
3 
+import junit.framework.TestCase;
4 
+
3 5 
 import java.text.DateFormat;
4 6 
 import java.text.ParseException;
7 
+import java.text.SimpleDateFormat;
5 8 
 import java.util.Date;
6 9 
 import java.util.SortedSet;
7 10
8 
-import junit.framework.TestCase;
9 
-
10 11 
 public class TrackingScenarioTest extends TestCase {
11 12
12 13 
   public void testTrackingScenarioStage1() throws Exception {
 
@@ -31,21 +32,29 @@ public class TrackingScenarioTest extends TestCase {
31 32 
     final CarrierMovement stockholmToHamburg =
32 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 39 
     final CarrierMovement hamburgToHongKong =
39 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 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 
 }