test-driven-development
diff --git a/‎src/main/java/travelator/UI.java
Lines changed: 4 additions & 5 deletions b/‎src/main/java/travelator/UI.java
Lines changed: 4 additions & 5 deletions
diff --git a/‎src/main/java/travelator/itinerary/Route.kt
Lines changed: 4 additions & 12 deletions b/‎src/main/java/travelator/itinerary/Route.kt
Lines changed: 4 additions & 12 deletions
diff --git a/‎src/test/java/travelator/itinerary/RouteTests.kt
Lines changed: 2 additions & 3 deletions b/‎src/test/java/travelator/itinerary/RouteTests.kt
Lines changed: 2 additions & 3 deletions
@@ -16,20 +16,19 @@ public void render(Iterable<Journey> route) {
 
 
     public void render(List<Journey> route) {
-        for (int i = 0; i < RouteKt.getSize(route); i++) {
-            var journey = RouteKt.get(route, i);
+        for (int i = 0; i < route.size(); i++) {
+            var journey = route.get(i);
             render(journey);
         }
     }
 
     public void renderWithHeader(List<Journey> route) {
         renderHeader(
-            RouteKt.getDepartsFrom(route), // <1>
+            RouteKt.getDepartsFrom(route),
             RouteKt.getArrivesAt(route),
             RouteKt.getDuration(route)
         );
-        for (int i = 0; i < RouteKt.getSize(route); i++) {
-            var journey = RouteKt.get(route, i);
+        for (var journey : route) {
             render(journey);
         }
     }
 
@@ -5,26 +5,18 @@ import java.time.Duration
 
 typealias Route = List<Journey>
 
-val Route.size: Int
-    get() = this.size
-
-operator fun Route.get(index: Int) = this[index]
-
 val Route.departsFrom: Location
-    get() = get(0).departsFrom
+    get() = first().departsFrom
 
 val Route.arrivesAt: Location
-    get() = get(size - 1).arrivesAt
+    get() = last().arrivesAt
 
 val Route.duration: Duration
     get() = Duration.between(
-        get(0).departureTime,
-        get(size - 1).arrivalTime
+        first().departureTime,
+        last().arrivalTime
     )
 
-fun Route.withJourneyAt(index: Int, replacedBy: Journey): Route =
-    this.withItemAt(index, replacedBy)
-
 fun <T> Iterable<T>.withItemAt(index: Int, replacedBy: T): List<T> =
     this.toMutableList().apply {
         this[index] = replacedBy
 
@@ -27,13 +27,12 @@ class RouteTests {
         val journey1 = Journey(waterloo, alton, someTime(), someTime(), RAIL)
         val journey2 = Journey(alton, alresford, someTime(), someTime(), CAMEL)
         val journey3 = Journey(alresford, winchester, someTime(), someTime(), BUS)
-        val route = listOf(journey1, journey2, journey3) // <1>
-
         val replacement = Journey(alton, alresford, someTime(), someTime(), RAIL)
 
+        val route = listOf(journey1, journey2, journey3)
         assertEquals(
             listOf(journey1, replacement, journey3),
-            route.withJourneyAt(1, replacement) // <2>
+            route.withItemAt(1, replacement)
         )
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -16,20 +16,19 @@ public void render(Iterable<Journey> route) {`
`16`	`16`
`17`	`17`
`18`	`18`	`public void render(List<Journey> route) {`
`19`		`- for (int i = 0; i < RouteKt.getSize(route); i++) {`
`20`		`- var journey = RouteKt.get(route, i);`
	`19`	`+ for (int i = 0; i < route.size(); i++) {`
	`20`	`+ var journey = route.get(i);`
`21`	`21`	`render(journey);`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public void renderWithHeader(List<Journey> route) {`
`26`	`26`	`renderHeader(`
`27`		`- RouteKt.getDepartsFrom(route), // <1>`
	`27`	`+ RouteKt.getDepartsFrom(route),`
`28`	`28`	`RouteKt.getArrivesAt(route),`
`29`	`29`	`RouteKt.getDuration(route)`
`30`	`30`	`);`
`31`		`- for (int i = 0; i < RouteKt.getSize(route); i++) {`
`32`		`- var journey = RouteKt.get(route, i);`
	`31`	`+ for (var journey : route) {`
`33`	`32`	`render(journey);`
`34`	`33`	`}`
`35`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,12 @@ class RouteTests {`
`27`	`27`	`val journey1 = Journey(waterloo, alton, someTime(), someTime(), RAIL)`
`28`	`28`	`val journey2 = Journey(alton, alresford, someTime(), someTime(), CAMEL)`
`29`	`29`	`val journey3 = Journey(alresford, winchester, someTime(), someTime(), BUS)`
`30`		`- val route = listOf(journey1, journey2, journey3) // <1>`
`31`		`-`
`32`	`30`	`val replacement = Journey(alton, alresford, someTime(), someTime(), RAIL)`
`33`	`31`
	`32`	`+ val route = listOf(journey1, journey2, journey3)`
`34`	`33`	`assertEquals(`
`35`	`34`	`listOf(journey1, replacement, journey3),`
`36`		`- route.withJourneyAt(1, replacement) // <2>`
	`35`	`+ route.withItemAt(1, replacement)`
`37`	`36`	`)`
`38`	`37`	`}`
`39`	`38`	`}`