|
|
@@ -43,17 +43,17 @@ public class CargoTrackingControllerTest extends TestCase {
|
|
43
|
43
|
final Location a5 = new Location(new UnLocode("AA","AAA"), "AAAAA");
|
|
44
|
44
|
final Location b5 = new Location(new UnLocode("BB","BBB"), "BBBBB");
|
|
45
|
45
|
Cargo cargo = new Cargo(trackingId, a5, b5);
|
|
46
|
|
- HandlingEvent event = new HandlingEvent(cargo, new Date(10L), new Date(20L), HandlingEvent.Type.RECEIVE, b5);
|
|
47
|
|
-// cargo.handle(event);
|
|
|
46
|
+ HandlingEvent event = new HandlingEvent(cargo, new Date(10L), new Date(20L), HandlingEvent.Type.RECEIVE, b5, null);
|
|
48
|
47
|
|
|
49
|
48
|
// TODO: use DTO assemblers
|
|
50
|
49
|
CargoWithHistoryDTO cargoDTO = new CargoWithHistoryDTO(
|
|
51
|
50
|
cargo.trackingId().idString(),
|
|
52
|
51
|
cargo.origin().unLocode().idString(),
|
|
53
|
52
|
cargo.finalDestination().unLocode().idString(),
|
|
54
|
|
- StatusCode.claimed,
|
|
|
53
|
+ StatusCode.CLAIMED,
|
|
55
|
54
|
"AAAAA",
|
|
56
|
|
- "BALO");
|
|
|
55
|
+ "BALO",
|
|
|
56
|
+ cargo.isMisdirected());
|
|
57
|
57
|
cargoDTO.addEvent(new HandlingEventDTO(
|
|
58
|
58
|
event.location().unLocode().idString(),
|
|
59
|
59
|
event.type().toString(),
|