Commit fc18b37
Changed files (2)
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;
}
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());
+ }
}