diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Q10/TrainTimeTable.java | 5 | ||||
| -rw-r--r-- | src/Q10/TrainTimeTableTest.java | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/Q10/TrainTimeTable.java b/src/Q10/TrainTimeTable.java index 6ef6abb..b79f10e 100644 --- a/src/Q10/TrainTimeTable.java +++ b/src/Q10/TrainTimeTable.java @@ -17,7 +17,7 @@ public class TrainTimeTable { public void delay(String city, int minutes) { System.out.println(String.format("Delay %s by %d minutes", city, minutes)); Station station = stationIn(city); - station.delayBy(minutes); + if (station != null) station.delayBy(minutes); } public void displaySchedule() { @@ -35,7 +35,8 @@ public class TrainTimeTable { } public Station stationIn(String city) { - for (Station station : this.schedule) if (station.getCity() == city) return station; + for (Station station : this.schedule) + if (station.getCity().toLowerCase().equals(city.toLowerCase())) return station; return null; } diff --git a/src/Q10/TrainTimeTableTest.java b/src/Q10/TrainTimeTableTest.java index c0ab35a..2751519 100644 --- a/src/Q10/TrainTimeTableTest.java +++ b/src/Q10/TrainTimeTableTest.java @@ -43,4 +43,14 @@ public class TrainTimeTableTest extends TestCase { assertEquals("00:29", station.getDeparture()); assertEquals(3, station.getDay()); } + + public void test_stationIn() { + assertNotNull(this.subject.stationIn("Edmonton")); + assertEquals("Edmonton", this.subject.stationIn("Edmonton").getCity()); + } + + public void test_stationIn_lowercase() { + assertNotNull(this.subject.stationIn("edmonton")); + assertEquals("Edmonton", this.subject.stationIn("edmonton").getCity()); + } } |
