Prepared demo

wakaleo · Oct 1, 2014 · 40a074e · 40a074e
1 parent df4fe5a
commit 40a074e
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 26 deletions.
diff --git a/...ts/src/test/java/flyinghigh/services/acceptancetests/stepdefs/AirportStepDefinitions.java b/...ts/src/test/java/flyinghigh/services/acceptancetests/stepdefs/AirportStepDefinitions.java
@@ -11,6 +11,7 @@
 import flyinghigh.services.acceptancetests.steps.MyAccountUISteps;
 import net.thucydides.core.annotations.Steps;
 import org.jbehave.core.annotations.Given;
+import org.jbehave.core.annotations.Pending;
 import org.jbehave.core.annotations.Then;
 import org.jbehave.core.annotations.When;
 import org.jbehave.core.model.ExamplesTable;
@@ -44,21 +45,27 @@ public class AirportStepDefinitions {
     public void givenAFrequentFlyer() {
     }
 
+    @Pending
     @Given("$frequentFlyer is a Frequent Flyer member with $points points")
     public void giveSarahSomePoints(String name, int points) throws URISyntaxException {
-        FrequentFlyer frequentFlyer = FrequentFlyer.valueOf(name);
-        restClient.updatePointsFor(frequentFlyer.getNumber(), points);
+//  TODO
+//        FrequentFlyer frequentFlyer = FrequentFlyer.valueOf(name);
+//        restClient.updatePointsFor(frequentFlyer.getNumber(), points);
     }
 
 
+    @Pending
     @Then("she should see an account balance of $expectedPoints points")
     public void shouldSeePointBalanceOf(int expectedPoints) {
-        sarah.shouldSeeAccountBalanceOf(expectedPoints);
+//  TODO
+//        sarah.shouldSeeAccountBalanceOf(expectedPoints);
     }
 
+    @Pending
     @Then("she should see a home city of $homeCity")
     public void shouldSeeHomeCityOf(String homeCity) {
-        sarah.shouldSeeHomeCity(homeCity);
+    // TODO
+    //    sarah.shouldSeeHomeCity(homeCity);
     }
 
     @Given("I need to know what cities I can fly to")

diff --git a/.../src/test/java/flyinghigh/services/acceptancetests/stepdefs/AirportStepUIDefinitions.java b/.../src/test/java/flyinghigh/services/acceptancetests/stepdefs/AirportStepUIDefinitions.java
@@ -54,6 +54,7 @@ public void seeListOfPossibleDestinations() {
 
     @Then("the following destination airports: $airports")
     public void shouldSeeAirports(ExamplesTable airports) {
-        sarah.shouldSeePossibleDestinations(airportNamesFrom(airports));
+//  TODO
+//        sarah.shouldSeePossibleDestinations(airportNamesFrom(airports));
     }
 }
diff --git a/.../test/java/flyinghigh/services/acceptancetests/stepdefs/FrequentFlyerStepDefinitions.java b/.../test/java/flyinghigh/services/acceptancetests/stepdefs/FrequentFlyerStepDefinitions.java
@@ -5,6 +5,7 @@
 import flyinghigh.services.acceptancetests.steps.MyAccountUISteps;
 import net.thucydides.core.annotations.Steps;
 import org.jbehave.core.annotations.Given;
+import org.jbehave.core.annotations.Pending;
 import org.jbehave.core.annotations.Then;
 import org.jbehave.core.annotations.When;
 import org.jbehave.core.model.ExamplesTable;
@@ -26,13 +27,13 @@ public class FrequentFlyerStepDefinitions {
     MyAccountUISteps sarah;
 
     @Given("$frequentFlyer is a Frequent Flyer member")
-    public void giveSarahSomePoints(String name) throws URISyntaxException {
-        FrequentFlyer frequentFlyer = FrequentFlyer.valueOf(name);
-    }
+    public void giveSarahSomePoints(FrequentFlyer frequentFlyer) {}
 
+    @Pending
     @When("she views her account details")
     public void viewAccountDetails() {
-        sarah.openAccountPage();
+//  TODO
+//        sarah.openAccountPage();
     }
 
 

diff --git a/...rc/test/java/flyinghigh/services/acceptancetests/stepdefs/MyAccountStepUIDefinitions.java b/...rc/test/java/flyinghigh/services/acceptancetests/stepdefs/MyAccountStepUIDefinitions.java
@@ -33,13 +33,15 @@ public void openMyAccountPage() {
 
     @When("I calculate the points needed to go from <departure> to <destination>")
     public void calculatePointsNeeded(String departure, String destination) {
-        calculatedPoints = myAccountSteps.calculatePointsNeededBetween(departure,
-                                                                       destination);
+//        TODO
+//        calculatedPoints = myAccountSteps.calculatePointsNeededBetween(departure,
+//                                                                       destination);
     }
 
     @Then("I should see <requiredPoints> points")
     public void shouldSeeRequiredPoints(int requiredPoints) {
-        assertThat(calculatedPoints).isEqualTo(requiredPoints);
+// TODO
+//        assertThat(calculatedPoints).isEqualTo(requiredPoints);
     }
 
 

diff --git a/...ests/src/test/java/flyinghigh/services/acceptancetests/stepdefs/RouteStepDefinitions.java b/...ests/src/test/java/flyinghigh/services/acceptancetests/stepdefs/RouteStepDefinitions.java
@@ -27,11 +27,13 @@ public void setDepartureAndDestination(String departure, String destination) {
     }
     @When("I calculate the number of required points")
     public void calculateRequiredPoints() {
-        calculatedPoints = restClient.calculateRequiredPoints(departure, destination);
+// TODO
+//       calculatedPoints = restClient.calculateRequiredPoints(departure, destination);
     }
 
     @Then("I should obtain <requiredPoints>")
     public void checkCalculatedPoints(int requiredPoints) {
-        assertThat(calculatedPoints).isEqualTo(requiredPoints);
+// TODO
+//        assertThat(calculatedPoints).isEqualTo(requiredPoints);
     }
 }
diff --git a/...tance-tests/src/test/java/flyinghigh/services/acceptancetests/steps/MyAccountUISteps.java b/...tance-tests/src/test/java/flyinghigh/services/acceptancetests/steps/MyAccountUISteps.java
@@ -29,16 +29,19 @@ public int calculatePointsNeededBetween(String departure,
 
     @Step
     public void shouldSeeAccountBalanceOf(int expectedPoints) {
-        assertThat(myAccountPage.getPointBalance()).isEqualTo(expectedPoints);
+    // TODO
+    //    assertThat(myAccountPage.getPointBalance()).isEqualTo(expectedPoints);
     }
 
     @Step
     public void shouldSeeHomeCity(String expectedHomeCity) {
-        assertThat(myAccountPage.getHomeCity()).isEqualTo(expectedHomeCity);
+    //  TODO
+    //    assertThat(myAccountPage.getHomeCity()).isEqualTo(expectedHomeCity);
     }
 
     @Step
     public void shouldSeePossibleDestinations(List<String> expectedAirports) {
-        assertThat(myAccountPage.getPossibleDestinations()).containsAll(expectedAirports);
+    // TODO
+    //    assertThat(myAccountPage.getPossibleDestinations()).containsAll(expectedAirports);
     }
 }
diff --git a/flights-web-service/src/main/java/flyinghigh/services/flights/web/AirportsController.java b/flights-web-service/src/main/java/flyinghigh/services/flights/web/AirportsController.java
@@ -27,7 +27,11 @@ public List<Airport> listAirports() {
 
     @RequestMapping("/rest/api/airports/search/findByCode")
     public Airport findByCode(@RequestParam("code") String code) {
-        return airportRepository.findByCode(code).get(0);
+        List<Airport> matchingAirports = airportRepository.findByCode(code);
+        if (matchingAirports.isEmpty()) {
+            throw new UnknownAirportException(code);
+        }
+        return matchingAirports.get(0);
     }
 
     @RequestMapping(method = RequestMethod.GET, value = "/rest/api/airports/reset")

diff --git a/...ts-web-service/src/main/java/flyinghigh/services/flights/web/UnknownAirportException.java b/...ts-web-service/src/main/java/flyinghigh/services/flights/web/UnknownAirportException.java
@@ -0,0 +1,10 @@
+package flyinghigh.services.flights.web;
+
+/**
+ * Created by john on 30/09/2014.
+ */
+public class UnknownAirportException extends RuntimeException {
+    public UnknownAirportException(String code) {
+        super(code);
+    }
+}
diff --git a/...ice/src/test/java/flyinghigh/services/flights/FindingDestinationAndDepartureAirports.java b/...ice/src/test/java/flyinghigh/services/flights/FindingDestinationAndDepartureAirports.java
@@ -3,6 +3,7 @@
 import com.mongodb.util.Hash;
 import flyinghigh.services.flights.domain.Airport;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,18 +43,20 @@ public void configureBaseUrl() {
     }
 
     @Test
-    public void should_find_airports_with_flights_to_a_given_destination() {
-        List<HashMap> destinations = restTemplate.getForObject(baseUrl + "/rest/api/routes/to?destinationCode={destinationCode}", List.class, "SYD");
+    @Ignore
+    public void should_find_airports_based_on_return_routes() {
+        List<HashMap> destinations = restTemplate.getForObject(baseUrl + "/rest/api/routes/from?departureCode={departureCode}", List.class, "WLG");
 
         assertThat(destinations).isNotEmpty();
         destinations.stream().forEach(
-                destination -> assertThat(destination.get("code")).isNotEqualTo("SYD")
+                destination -> assertThat(destination.get("code")).isNotEqualTo("WLG")
         );
     }
 
     @Test
     public void should_find_airports_with_flights_from_a_given_destination() {
-        List<HashMap> destinations = restTemplate.getForObject(baseUrl + "/rest/api/routes/from?departureCode={departureCode}", List.class, "SYD");
+        List<HashMap> destinations = restTemplate.getForObject(
+                baseUrl + "/rest/api/routes/from?departureCode={departureCode}", List.class, "SYD");
 
         assertThat(destinations).isNotEmpty();
         destinations.stream().forEach(
@@ -62,15 +65,14 @@ public void should_find_airports_with_flights_from_a_given_destination() {
     }
 
     @Test
-    public void should_find_airports_based_on_return_routes() {
-        List<HashMap> destinations = restTemplate.getForObject(baseUrl + "/rest/api/routes/from?departureCode={departureCode}", List.class, "WLG");
+    public void should_find_airports_with_flights_to_a_given_destination() {
+        List<HashMap> destinations = restTemplate.getForObject(baseUrl + "/rest/api/routes/to?destinationCode={destinationCode}", List.class, "SYD");
 
         assertThat(destinations).isNotEmpty();
         destinations.stream().forEach(
-                destination -> assertThat(destination.get("code")).isNotEqualTo("WEL")
+                destination -> assertThat(destination.get("code")).isNotEqualTo("SYD")
         );
     }
 
 
-
 }