diff --git a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java index 71150dec..ec823766 100644 --- a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java @@ -73,9 +73,29 @@ public abstract class AbstractProviderLiveTest // System.out.println(trip); } - protected final QueryDeparturesResult queryDepartures(final String stationId, boolean equivs) throws IOException + protected final NearbyStationsResult queryNearbyStations(final Location location) throws IOException { - final QueryDeparturesResult result = provider.queryDepartures(stationId, new Date(), 0, equivs); + return queryNearbyStations(location, 0, 0); + } + + protected final NearbyStationsResult queryNearbyStations(final Location location, final int maxDistance, final int maxStations) + throws IOException + { + return provider.queryNearbyStations(location, maxDistance, maxStations); + } + + protected final QueryDeparturesResult queryDepartures(final String stationId, final boolean equivs) throws IOException + { + return queryDepartures(stationId, 0, equivs); + } + + protected final QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + { + final QueryDeparturesResult result = provider.queryDepartures(stationId, new Date(), maxDepartures, equivs); + + // for (final StationDepartures stationDepartures : result.stationDepartures) + // for (final Departure departure : stationDepartures.departures) + // System.out.println(departure); if (result.status == QueryDeparturesResult.Status.OK) { @@ -88,6 +108,11 @@ public abstract class AbstractProviderLiveTest return result; } + protected final SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException + { + return provider.suggestLocations(constraint); + } + protected final QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep, final Collection products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException { diff --git a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java index dc69bcda..678c8726 100644 --- a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java @@ -45,7 +45,7 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "740"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "740")); print(result); } @@ -54,7 +54,7 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest public void nearbyStationsByCoordinate() throws Exception { // TODO bad coordinate! - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 8168907, 10609969), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 8168907, 10609969)); print(result); } @@ -70,7 +70,7 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("ponte"); + final SuggestLocationsResult result = suggestLocations("ponte"); print(result); } @@ -78,7 +78,7 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grünwink"); + final SuggestLocationsResult result = suggestLocations("grünwink"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java index 8fcb5b42..dc5a616c 100644 --- a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java @@ -48,7 +48,7 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "100"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "100")); print(result); } @@ -56,7 +56,7 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48367233, 10894976), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48367233, 10894976)); print(result); } @@ -72,7 +72,7 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -80,7 +80,7 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grünwink"); + final SuggestLocationsResult result = suggestLocations("grünwink"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java index 11ec841c..ff8f6cd2 100644 --- a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java @@ -47,7 +47,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "692991"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "692991")); print(result); } @@ -55,7 +55,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 52525589, 13369548), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52525589, 13369548)); print(result); } @@ -78,7 +78,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Güntzelstr. (U)"); + final SuggestLocationsResult result = suggestLocations("Güntzelstr. (U)"); print(result); @@ -88,7 +88,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Dammt"); + final SuggestLocationsResult result = suggestLocations("Dammt"); print(result); @@ -98,7 +98,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIdentified() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Berlin"); + final SuggestLocationsResult result = suggestLocations("Berlin"); print(result); } @@ -106,7 +106,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsAddress() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("München, Friedenstraße 2"); + final SuggestLocationsResult result = suggestLocations("München, Friedenstraße 2"); print(result); assertEquals(LocationType.ADDRESS, result.getLocations().get(0).type); diff --git a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java index 79635bd1..8781e915 100644 --- a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java @@ -47,7 +47,7 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "3001459"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "3001459")); print(result); } @@ -55,7 +55,7 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48135232, 11560650), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48135232, 11560650)); print(result); } @@ -76,7 +76,7 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Marien"); + final SuggestLocationsResult result = suggestLocations("Marien"); print(result); } @@ -84,7 +84,7 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } @@ -92,7 +92,7 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsAddress() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("München, Friedenstraße 2"); + final SuggestLocationsResult result = suggestLocations("München, Friedenstraße 2"); print(result); } @@ -100,13 +100,13 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsLocal() throws Exception { - final SuggestLocationsResult regensburgResult = provider.suggestLocations("Regensburg"); + final SuggestLocationsResult regensburgResult = suggestLocations("Regensburg"); assertEquals("80001083", regensburgResult.getLocations().iterator().next().id); - final SuggestLocationsResult munichResult = provider.suggestLocations("München"); + final SuggestLocationsResult munichResult = suggestLocations("München"); assertEquals("80000689", munichResult.getLocations().iterator().next().id); - final SuggestLocationsResult nurembergResult = provider.suggestLocations("Nürnberg"); + final SuggestLocationsResult nurembergResult = suggestLocations("Nürnberg"); assertEquals("80001020", nurembergResult.getLocations().iterator().next().id); } diff --git a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java index fc84a4a3..9e0d8459 100644 --- a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java @@ -50,7 +50,7 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "26000178"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "26000178")); print(result); } @@ -58,7 +58,7 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 52272065, 10524788), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52272065, 10524788)); print(result); } @@ -74,7 +74,7 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kurf"); + final SuggestLocationsResult result = suggestLocations("Kurf"); print(result); } @@ -82,7 +82,7 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } @@ -90,7 +90,7 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsCoverage() throws Exception { - final SuggestLocationsResult braunschweigResult = provider.suggestLocations("Braunschweig Rhönweg"); + final SuggestLocationsResult braunschweigResult = suggestLocations("Braunschweig Rhönweg"); print(braunschweigResult); assertThat(braunschweigResult.getLocations(), hasItem(new Location(LocationType.STATION, "26000351"))); } diff --git a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java index 65d9f210..0efcd071 100644 --- a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java @@ -48,7 +48,7 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "10000"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "10000")); print(result); } @@ -56,7 +56,7 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 47551466, 7585187), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47551466, 7585187)); print(result); } @@ -72,7 +72,7 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Haupt"); + final SuggestLocationsResult result = suggestLocations("Haupt"); print(result); } @@ -80,7 +80,7 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java index 4deb5095..5292b027 100644 --- a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java @@ -48,7 +48,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "9220302"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "9220302")); assertEquals(NearbyStationsResult.Status.OK, result.status); print(result); } @@ -56,7 +56,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 52486400, 13350744), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52486400, 13350744)); print(result); } @@ -64,7 +64,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsInvalidStation() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "2449475"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "2449475")); assertEquals(NearbyStationsResult.Status.INVALID_STATION, result.status); } @@ -90,7 +90,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Güntzelstr."); + final SuggestLocationsResult result = suggestLocations("Güntzelstr."); print(result); @@ -100,7 +100,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsLocality() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("seeling"); + final SuggestLocationsResult result = suggestLocations("seeling"); print(result); @@ -110,7 +110,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsAddress() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Berlin, Sophienstr. 24"); + final SuggestLocationsResult result = suggestLocations("Berlin, Sophienstr. 24"); print(result); @@ -120,7 +120,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("nol"); + final SuggestLocationsResult result = suggestLocations("nol"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java index 73310137..cd347bc9 100644 --- a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java @@ -48,7 +48,7 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "90001611"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "90001611")); print(result); } @@ -56,7 +56,7 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48401092, 9992037), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48401092, 9992037)); print(result); } @@ -72,7 +72,7 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -80,7 +80,7 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java index b9c50daf..675a9b49 100644 --- a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java @@ -47,7 +47,7 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8600858"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8600858")); print(result); } @@ -55,7 +55,7 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 55670305, 12554169), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 55670305, 12554169)); print(result); } @@ -79,7 +79,7 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Airport"); + final SuggestLocationsResult result = suggestLocations("Airport"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java index 98535d4f..9ac2ed9c 100644 --- a/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java @@ -47,7 +47,7 @@ public class DubProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "3500131"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "3500131")); print(result); } @@ -55,7 +55,7 @@ public class DubProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 25269008, 55312672), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 25269008, 55312672)); print(result); } @@ -63,7 +63,7 @@ public class DubProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Airport"); + final SuggestLocationsResult result = suggestLocations("Airport"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java index 2d66832a..d9607d6e 100644 --- a/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java @@ -47,7 +47,7 @@ public class EireannProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8013500"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8013500")); print(result); } @@ -55,7 +55,7 @@ public class EireannProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 53343993, -6267371), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 53343993, -6267371)); print(result); } @@ -79,7 +79,7 @@ public class EireannProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Dublin"); + final SuggestLocationsResult result = suggestLocations("Dublin"); print(result); } @@ -87,7 +87,7 @@ public class EireannProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Busáras"); + final SuggestLocationsResult result = suggestLocations("Busáras"); print(result); } @@ -95,7 +95,7 @@ public class EireannProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsAddress() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Dorfstrasse 10, Dällikon, Schweiz"); + final SuggestLocationsResult result = suggestLocations("Dorfstrasse 10, Dällikon, Schweiz"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java index ac0515b4..3a4b9b89 100644 --- a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java @@ -48,7 +48,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "25000031"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "25000031")); print(result); } @@ -56,7 +56,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 52379497, 9735832), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52379497, 9735832)); print(result); } @@ -72,7 +72,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -80,7 +80,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } @@ -88,7 +88,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIdentified() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Hannover, Hannoversche Straße"); + final SuggestLocationsResult result = suggestLocations("Hannover, Hannoversche Straße"); print(result); } @@ -96,7 +96,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsCity() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Hannover"); + final SuggestLocationsResult result = suggestLocations("Hannover"); print(result); } @@ -104,7 +104,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Hannover"); + final SuggestLocationsResult result = suggestLocations("Hannover"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java index 64bf55ca..a0154ab5 100644 --- a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java @@ -47,7 +47,7 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "80301"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "80301")); print(result); } @@ -55,7 +55,7 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48744678, 11437941), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48744678, 11437941)); print(result); } @@ -79,7 +79,7 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Flughafen"); + final SuggestLocationsResult result = suggestLocations("Flughafen"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java index 97d9023e..c0b96747 100644 --- a/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java @@ -48,7 +48,7 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "60401187"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "60401187")); print(result); } @@ -56,7 +56,7 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 47271228, 11402063), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47271228, 11402063)); print(result); } @@ -72,7 +72,7 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -80,7 +80,7 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java index be906513..f98e090a 100644 --- a/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java @@ -47,7 +47,7 @@ public class JetProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "1055"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "1055")); print(result); } @@ -55,7 +55,7 @@ public class JetProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 31769757, 35213506), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 31769757, 35213506)); print(result); } @@ -84,7 +84,7 @@ public class JetProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("הנשיא - מוזיאון האיסלם, ירושלים"); + final SuggestLocationsResult result = suggestLocations("הנשיא - מוזיאון האיסלם, ירושלים"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java index 695bd8d5..188af625 100644 --- a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java @@ -48,7 +48,7 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "7000090"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "7000090")); print(result); } @@ -56,7 +56,7 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 49008184, 8400736), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 49008184, 8400736)); print(result); } @@ -72,7 +72,7 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -80,7 +80,7 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grünwink"); + final SuggestLocationsResult result = suggestLocations("grünwink"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java index 0c4d869d..0af8df62 100644 --- a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java @@ -48,7 +48,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "60500090"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "60500090")); print(result); } @@ -56,7 +56,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48305726, 14287863), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48305726, 14287863)); print(result); } @@ -71,7 +71,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Friedhof"); + final SuggestLocationsResult result = suggestLocations("Friedhof"); print(result); } @@ -79,7 +79,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } @@ -87,7 +87,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIdentified() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Leonding, Haag"); + final SuggestLocationsResult result = suggestLocations("Leonding, Haag"); print(result); } @@ -95,7 +95,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsCity() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Leonding"); + final SuggestLocationsResult result = suggestLocations("Leonding"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java index 45504de3..45283c10 100644 --- a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java @@ -47,7 +47,7 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "200501001"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "200501001")); print(result); } @@ -55,7 +55,7 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 49610187, 6132746), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 49610187, 6132746)); print(result); } @@ -79,7 +79,7 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Aéroport"); + final SuggestLocationsResult result = suggestLocations("Aéroport"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java index ba6ae336..41570149 100644 --- a/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java @@ -48,7 +48,7 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "10001167"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "10001167")); print(result); } @@ -56,7 +56,7 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, -37800941, 144966545), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, -37800941, 144966545)); print(result); } @@ -80,7 +80,7 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java index c443e74d..9b327ec3 100644 --- a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java @@ -50,7 +50,7 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "24200006"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "24200006")); print(result); } @@ -58,7 +58,7 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 51219852, 7639217), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51219852, 7639217)); print(result); } @@ -74,7 +74,7 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Schützenhalle"); + final SuggestLocationsResult result = suggestLocations("Schützenhalle"); print(result); } @@ -82,7 +82,7 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } @@ -90,19 +90,19 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsCoverage() throws Exception { - final SuggestLocationsResult luedenscheidResult = provider.suggestLocations("Lüdenscheid Freibad"); + final SuggestLocationsResult luedenscheidResult = suggestLocations("Lüdenscheid Freibad"); print(luedenscheidResult); assertThat(luedenscheidResult.getLocations(), hasItem(new Location(LocationType.STATION, "24200153"))); - final SuggestLocationsResult iserlohnResult = provider.suggestLocations("Iserlohn Rathaus"); + final SuggestLocationsResult iserlohnResult = suggestLocations("Iserlohn Rathaus"); print(iserlohnResult); assertThat(iserlohnResult.getLocations(), hasItem(new Location(LocationType.STATION, "24200764"))); - final SuggestLocationsResult plettenbergResult = provider.suggestLocations("Plettenberg Friedhof"); + final SuggestLocationsResult plettenbergResult = suggestLocations("Plettenberg Friedhof"); print(plettenbergResult); assertThat(plettenbergResult.getLocations(), hasItem(new Location(LocationType.STATION, "24202864"))); - final SuggestLocationsResult mendenResult = provider.suggestLocations("Menden Am Gillfeld"); + final SuggestLocationsResult mendenResult = suggestLocations("Menden Am Gillfeld"); print(mendenResult); assertThat(mendenResult.getLocations(), hasItem(new Location(LocationType.STATION, "24202193"))); } diff --git a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java index 3ba49dc9..d4f214d6 100644 --- a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java @@ -49,7 +49,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "350"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "350")); print(result); } @@ -57,7 +57,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48135232, 11560650), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48135232, 11560650)); print(result); } @@ -82,7 +82,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Marien"); + final SuggestLocationsResult result = suggestLocations("Marien"); print(result); } @@ -90,7 +90,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } @@ -98,16 +98,16 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsLocal() throws Exception { - final SuggestLocationsResult fraunhoferStrResult = provider.suggestLocations("fraunhofer"); + final SuggestLocationsResult fraunhoferStrResult = suggestLocations("fraunhofer"); assertThat(fraunhoferStrResult.getLocations(), hasItem(new Location(LocationType.STATION, "1000150"))); - final SuggestLocationsResult hirschgartenResult = provider.suggestLocations("Hirschgarten"); + final SuggestLocationsResult hirschgartenResult = suggestLocations("Hirschgarten"); assertEquals("München", hirschgartenResult.getLocations().get(0).place); - final SuggestLocationsResult ostbahnhofResult = provider.suggestLocations("Ostbahnhof"); + final SuggestLocationsResult ostbahnhofResult = suggestLocations("Ostbahnhof"); assertEquals("München", ostbahnhofResult.getLocations().get(0).place); - final SuggestLocationsResult marienplatzResult = provider.suggestLocations("Marienplatz"); + final SuggestLocationsResult marienplatzResult = suggestLocations("Marienplatz"); assertEquals("München", marienplatzResult.getLocations().get(0).place); } diff --git a/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java index 256433c7..0445826f 100644 --- a/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java @@ -48,7 +48,7 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "53019174"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "53019174")); print(result); } @@ -56,7 +56,7 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48493550, 9205656), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48493550, 9205656)); print(result); } @@ -79,7 +79,7 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kurf"); + final SuggestLocationsResult result = suggestLocations("Kurf"); print(result); } @@ -87,7 +87,7 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grünwink"); + final SuggestLocationsResult result = suggestLocations("grünwink"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java index 38a6bde3..2d62d78c 100644 --- a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java @@ -48,7 +48,7 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "13000"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "13000")); print(result); } @@ -56,7 +56,7 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 51346546, 12383333), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51346546, 12383333)); print(result); assertEquals(NearbyStationsResult.Status.OK, result.status); @@ -90,7 +90,7 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Flughafen"); + final SuggestLocationsResult result = suggestLocations("Flughafen"); print(result); } @@ -98,7 +98,7 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Höhle"); + final SuggestLocationsResult result = suggestLocations("Höhle"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java index 56232932..ed191ad8 100644 --- a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java @@ -47,7 +47,7 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "112270"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "112270")); print(result); } @@ -55,7 +55,7 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 59911871, 10764999), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 59911871, 10764999)); print(result); } @@ -79,7 +79,7 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Oslo"); + final SuggestLocationsResult result = suggestLocations("Oslo"); print(result); } @@ -87,7 +87,7 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Skøyen"); + final SuggestLocationsResult result = suggestLocations("Skøyen"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java index 766451d6..d385b855 100644 --- a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java @@ -46,7 +46,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8800004"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8800004")); print(result); } @@ -54,7 +54,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 52377548, 4901218), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52377548, 4901218)); print(result); } @@ -78,7 +78,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Brussel S"); + final SuggestLocationsResult result = suggestLocations("Brussel S"); print(result); } @@ -86,7 +86,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Brüssel"); + final SuggestLocationsResult result = suggestLocations("Brüssel"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java index f2608593..09e7f790 100644 --- a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java @@ -50,7 +50,7 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "6900001"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "6900001")); print(result); } @@ -58,7 +58,7 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48778953, 9178963), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48778953, 9178963)); print(result); } @@ -74,7 +74,7 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -82,7 +82,7 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } @@ -90,15 +90,15 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsCoverage() throws Exception { - final SuggestLocationsResult freiburgResult = provider.suggestLocations("Freiburg Hauptbahnhof"); + final SuggestLocationsResult freiburgResult = suggestLocations("Freiburg Hauptbahnhof"); print(freiburgResult); assertThat(freiburgResult.getLocations(), hasItem(new Location(LocationType.STATION, "6906508"))); - final SuggestLocationsResult baselResult = provider.suggestLocations("Basel"); + final SuggestLocationsResult baselResult = suggestLocations("Basel"); print(baselResult); assertThat(baselResult.getLocations(), hasItem(new Location(LocationType.STATION, "51000007"))); - final SuggestLocationsResult constanceResult = provider.suggestLocations("Konstanz"); + final SuggestLocationsResult constanceResult = suggestLocations("Konstanz"); print(constanceResult); assertThat(constanceResult.getLocations(), hasItem(new Location(LocationType.STATION, "8706554"))); } diff --git a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java index 293c0fa7..f9511905 100644 --- a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java @@ -49,7 +49,7 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "3000001"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "3000001")); print(result); } @@ -57,7 +57,7 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 50108625, 8669604), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 50108625, 8669604)); print(result); } @@ -65,7 +65,7 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinateKassel() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 51318447, 9496250), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51318447, 9496250)); print(result); } @@ -104,7 +104,7 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Flughafen"); + final SuggestLocationsResult result = suggestLocations("Flughafen"); print(result); } @@ -112,7 +112,7 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIdentified() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kassel Wilhelmshöhe"); + final SuggestLocationsResult result = suggestLocations("Kassel Wilhelmshöhe"); print(result); } @@ -120,7 +120,7 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("könig"); + final SuggestLocationsResult result = suggestLocations("könig"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java index 22a4dd96..99ea048e 100644 --- a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java @@ -48,7 +48,7 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "902006"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "902006")); print(result); } @@ -56,7 +56,7 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48200239, 16370773), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48200239, 16370773)); print(result); assertEquals(NearbyStationsResult.Status.OK, result.status); @@ -84,7 +84,7 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Wien"); + final SuggestLocationsResult result = suggestLocations("Wien"); print(result); assertTrue(result.getLocations().size() > 0); @@ -93,7 +93,7 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Obirhöhle"); + final SuggestLocationsResult result = suggestLocations("Obirhöhle"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/PacaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/PacaProviderLiveTest.java index 1733d3c0..9ecc8fe9 100644 --- a/enabler/test/de/schildbach/pte/live/PacaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/PacaProviderLiveTest.java @@ -46,7 +46,7 @@ public class PacaProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("aeroport"); + final SuggestLocationsResult result = suggestLocations("aeroport"); print(result); } @@ -54,7 +54,7 @@ public class PacaProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIdentified() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("EGANAUDE, Biot"); + final SuggestLocationsResult result = suggestLocations("EGANAUDE, Biot"); print(result); } @@ -62,7 +62,7 @@ public class PacaProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Aéroport"); + final SuggestLocationsResult result = suggestLocations("Aéroport"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java index c8460c8b..4cf46657 100644 --- a/enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java @@ -54,7 +54,7 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsAddress() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48877523, 2378353), 700, 10); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48877523, 2378353), 700, 10); assertEquals(NearbyStationsResult.Status.OK, result.status); @@ -64,7 +64,7 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsAddress2() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48785420, 2212050), 2000, 30); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48785420, 2212050), 2000, 30); assertEquals(NearbyStationsResult.Status.OK, result.status); @@ -74,7 +74,7 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsStation() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "stop_point:RTP:SP:3926410"), 700, 10); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "stop_point:RTP:SP:3926410"), 700, 10); assertEquals(NearbyStationsResult.Status.OK, result.status); @@ -84,7 +84,7 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsPoi() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.POI, "poi:n668579722"), 700, 10); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.POI, "poi:n668579722"), 700, 10); assertEquals(NearbyStationsResult.Status.OK, result.status); @@ -94,7 +94,7 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsInvalidStation() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "stop_point:RTP:SP:392"), 700, 10); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "stop_point:RTP:SP:392"), 700, 10); assertEquals(NearbyStationsResult.Status.INVALID_STATION, result.status); @@ -105,7 +105,7 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest public void queryDeparturesEquivsFalse() throws Exception { final int maxDepartures = 5; - final QueryDeparturesResult result = provider.queryDepartures("stop_point:RTP:SP:3926410", new Date(), maxDepartures, false); + final QueryDeparturesResult result = queryDepartures("stop_point:RTP:SP:3926410", maxDepartures, false); assertEquals(QueryDeparturesResult.Status.OK, result.status); assertEquals(1, result.stationDepartures.size()); @@ -118,7 +118,7 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest public void queryDeparturesEquivsTrue() throws Exception { final int maxDepartures = 5; - final QueryDeparturesResult result = provider.queryDepartures("stop_point:RTP:SP:3926410", new Date(), maxDepartures, true); + final QueryDeparturesResult result = queryDepartures("stop_point:RTP:SP:3926410", maxDepartures, true); assertEquals(QueryDeparturesResult.Status.OK, result.status); assertTrue(result.stationDepartures.size() > 1); @@ -137,7 +137,7 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest @Test public void queryDeparturesInvalidStation() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("stop_point:RTP:SP:999999", new Date(), 0, false); + final QueryDeparturesResult result = queryDepartures("stop_point:RTP:SP:999999", false); assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status); } @@ -145,7 +145,7 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - SuggestLocationsResult result = provider.suggestLocations("bellevi"); + final SuggestLocationsResult result = suggestLocations("bellevi"); assertTrue(result.getLocations().size() > 0); @@ -155,7 +155,7 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsFromAddress() throws Exception { - SuggestLocationsResult result = provider.suggestLocations("13 rue man"); + final SuggestLocationsResult result = suggestLocations("13 rue man"); assertTrue(result.getLocations().size() > 0); @@ -165,7 +165,7 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsNoLocation() throws Exception { - SuggestLocationsResult result = provider.suggestLocations("bellevilleadasdjkaskd"); + final SuggestLocationsResult result = suggestLocations("bellevilleadasdjkaskd"); assertEquals(result.getLocations().size(), 0); @@ -302,17 +302,17 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest 48847168, 2261272), Calendar.getInstance().getTime(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); final QueryTripsContext context = result.context; - final QueryTripsResult nextResult = provider.queryMoreTrips(context, true); + final QueryTripsResult nextResult = queryMoreTrips(context, true); print(nextResult); - final QueryTripsResult prevResult = provider.queryMoreTrips(context, false); + final QueryTripsResult prevResult = queryMoreTrips(context, false); print(prevResult); } @Test public void getArea() throws Exception { - Point[] polygon = provider.getArea(); + final Point[] polygon = provider.getArea(); assertTrue(polygon.length > 0); } @@ -320,13 +320,13 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest @Test public void directionsSession() throws Exception { - SuggestLocationsResult suggestedDepartures = provider.suggestLocations("13 rue man"); + final SuggestLocationsResult suggestedDepartures = suggestLocations("13 rue man"); assertTrue(suggestedDepartures.getLocations().size() > 0); - Location departure = suggestedDepartures.getLocations().get(0); + final Location departure = suggestedDepartures.getLocations().get(0); - SuggestLocationsResult suggestedArrivals = provider.suggestLocations("10 marcel dassault veli"); + final SuggestLocationsResult suggestedArrivals = suggestLocations("10 marcel dassault veli"); assertTrue(suggestedArrivals.getLocations().size() > 0); - Location arrival = suggestedDepartures.getLocations().get(0); + final Location arrival = suggestedDepartures.getLocations().get(0); final QueryTripsResult result = queryTrips(departure, null, arrival, new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); assertEquals(QueryTripsResult.Status.OK, result.status); diff --git a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java index 5fcb7430..bb1495cb 100644 --- a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java @@ -47,7 +47,7 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "5100065"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "5100065")); print(result); } @@ -55,7 +55,7 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 52227027, 20989795), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52227027, 20989795)); print(result); } @@ -79,7 +79,7 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Warszawa"); + final SuggestLocationsResult result = suggestLocations("Warszawa"); print(result); } @@ -87,7 +87,7 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Służewiec"); + final SuggestLocationsResult result = suggestLocations("Służewiec"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/RsagProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/RsagProviderLiveTest.java index cba0ec8c..4b0ff49a 100644 --- a/enabler/test/de/schildbach/pte/live/RsagProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/RsagProviderLiveTest.java @@ -49,7 +49,7 @@ public class RsagProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8010304"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8010304")); print(result); } @@ -57,7 +57,7 @@ public class RsagProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 54078314, 12131715), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 54078314, 12131715)); print(result); } @@ -81,7 +81,7 @@ public class RsagProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Rostock"); + final SuggestLocationsResult result = suggestLocations("Rostock"); print(result); } @@ -89,7 +89,7 @@ public class RsagProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Lütten Klein"); + final SuggestLocationsResult result = suggestLocations("Lütten Klein"); print(result); @@ -99,11 +99,11 @@ public class RsagProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsCoverage() throws Exception { - final SuggestLocationsResult rostockResult = provider.suggestLocations("Rostock"); + final SuggestLocationsResult rostockResult = suggestLocations("Rostock"); print(rostockResult); assertThat(rostockResult.getLocations(), hasItem(new Location(LocationType.STATION, "8010304"))); - final SuggestLocationsResult warnemuendeResult = provider.suggestLocations("Warnemünde"); + final SuggestLocationsResult warnemuendeResult = suggestLocations("Warnemünde"); print(warnemuendeResult); assertThat(warnemuendeResult.getLocations(), hasItem(new Location(LocationType.STATION, "8013236"))); } @@ -111,7 +111,7 @@ public class RsagProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsLocality() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("lange"); + final SuggestLocationsResult result = suggestLocations("lange"); assertEquals("Rostock", result.getLocations().get(0).place); assertEquals("Lange Straße", result.getLocations().get(0).name); } diff --git a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java index 8ec1b8f9..aba0e162 100644 --- a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java @@ -47,7 +47,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8500010"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8500010")); print(result); } @@ -55,7 +55,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 52525589, 13369548), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52525589, 13369548)); print(result); } @@ -79,7 +79,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("haupt"); + final SuggestLocationsResult result = suggestLocations("haupt"); print(result); } @@ -87,7 +87,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsAddress() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Dorfstrasse 10, Dällikon, Schweiz"); + final SuggestLocationsResult result = suggestLocations("Dorfstrasse 10, Dällikon, Schweiz"); print(result); } @@ -95,7 +95,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsEncoding() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Dorfstrasse 1, Schäftland"); + final SuggestLocationsResult result = suggestLocations("Dorfstrasse 1, Schäftland"); assertEquals("Schöftland, Dorfstrasse", result.getLocations().get(0).name); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java index 6cfe3d96..6a6d4d36 100644 --- a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java @@ -47,7 +47,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8500010"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8500010")); print(result); } @@ -55,7 +55,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 52525589, 13369548), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52525589, 13369548)); print(result); } @@ -79,7 +79,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("haupt"); + final SuggestLocationsResult result = suggestLocations("haupt"); print(result); } @@ -87,7 +87,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Höhle"); + final SuggestLocationsResult result = suggestLocations("Höhle"); print(result); } @@ -95,7 +95,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsAddress() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Dorfstrasse 10, Dällikon, Schweiz"); + final SuggestLocationsResult result = suggestLocations("Dorfstrasse 10, Dällikon, Schweiz"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java index 3721c9bc..05b7bf67 100644 --- a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java @@ -47,7 +47,7 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "7414867"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "7414867")); print(result); } @@ -55,7 +55,7 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 57709311, 11988459), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 57709311, 11988459)); print(result); } @@ -79,7 +79,7 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Airport"); + final SuggestLocationsResult result = suggestLocations("Airport"); print(result); } @@ -87,7 +87,7 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Luleå"); + final SuggestLocationsResult result = suggestLocations("Luleå"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java index b9c2c772..828c3a6b 100644 --- a/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java @@ -47,7 +47,7 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "2090227"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "2090227")); print(result); } @@ -55,7 +55,7 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 39954122, -75161705), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 39954122, -75161705)); print(result); } @@ -79,7 +79,7 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Airport"); + final SuggestLocationsResult result = suggestLocations("Airport"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java index b7f624a6..6a24c849 100644 --- a/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java @@ -48,7 +48,7 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "10001017"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "10001017")); print(result); } @@ -56,7 +56,7 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 37777811, -122419481), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 37777811, -122419481)); print(result); } @@ -72,7 +72,7 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java index d5daae56..b639148c 100644 --- a/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java @@ -47,7 +47,7 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8002547"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8002547")); print(result); } @@ -71,7 +71,7 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Lübeck"); + final SuggestLocationsResult result = suggestLocations("Lübeck"); print(result); } @@ -79,7 +79,7 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Achterüm"); + final SuggestLocationsResult result = suggestLocations("Achterüm"); print(result); } @@ -87,7 +87,7 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithoutCoordinatesInResult() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("aachen"); + final SuggestLocationsResult result = suggestLocations("aachen"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java index b6716124..088169f6 100644 --- a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java @@ -47,7 +47,7 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8813003"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8813003")); print(result); } @@ -55,7 +55,7 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 50748017, 3407118), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 50748017, 3407118)); print(result); } @@ -79,7 +79,7 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Brussel S"); + final SuggestLocationsResult result = suggestLocations("Brussel S"); print(result); } @@ -87,7 +87,7 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Brüssel"); + final SuggestLocationsResult result = suggestLocations("Brüssel"); print(result); } @@ -95,7 +95,7 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsAddress() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Rue Paul Janson 9, 1030 Bruxelles"); + final SuggestLocationsResult result = suggestLocations("Rue Paul Janson 9, 1030 Bruxelles"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java index cd33858b..3813502b 100644 --- a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java @@ -47,7 +47,7 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "301109600"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "301109600")); print(result); } @@ -55,7 +55,7 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 59329897, 18072281), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 59329897, 18072281)); print(result); } @@ -79,7 +79,7 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Luleå Airport"); + final SuggestLocationsResult result = suggestLocations("Luleå Airport"); print(result); } @@ -87,7 +87,7 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("östra"); + final SuggestLocationsResult result = suggestLocations("östra"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java index 2783222b..b9c1a5ad 100644 --- a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java @@ -50,7 +50,7 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "63203040"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "63203040")); print(result); } @@ -58,7 +58,7 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 47072612, 15431814), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47072612, 15431814)); print(result); } @@ -74,7 +74,7 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -82,7 +82,7 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } @@ -90,23 +90,23 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsCoverage() throws Exception { - final SuggestLocationsResult grazResult = provider.suggestLocations("Graz Brauhaus"); + final SuggestLocationsResult grazResult = suggestLocations("Graz Brauhaus"); print(grazResult); assertThat(grazResult.getLocations(), hasItem(new Location(LocationType.STATION, "63203044"))); - final SuggestLocationsResult leobenResult = provider.suggestLocations("Leoben Blockhäuser"); + final SuggestLocationsResult leobenResult = suggestLocations("Leoben Blockhäuser"); print(leobenResult); assertThat(leobenResult.getLocations(), hasItem(new Location(LocationType.STATION, "63206224"))); - final SuggestLocationsResult bruckResult = provider.suggestLocations("Bruck Hauptplatz"); + final SuggestLocationsResult bruckResult = suggestLocations("Bruck Hauptplatz"); print(bruckResult); assertThat(bruckResult.getLocations(), hasItem(new Location(LocationType.STATION, "63202063"))); - final SuggestLocationsResult kindbergResult = provider.suggestLocations("Kindberg Friedhof"); + final SuggestLocationsResult kindbergResult = suggestLocations("Kindberg Friedhof"); print(kindbergResult); assertThat(kindbergResult.getLocations(), hasItem(new Location(LocationType.STATION, "63208877"))); - final SuggestLocationsResult mariborResult = provider.suggestLocations("Maribor Dravograjska Sokolska"); + final SuggestLocationsResult mariborResult = suggestLocations("Maribor Dravograjska Sokolska"); print(mariborResult); assertThat(mariborResult.getLocations(), hasItem(new Location(LocationType.STATION, "63300136"))); } diff --git a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java index c64134ba..8f065301 100644 --- a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java @@ -50,7 +50,7 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "60650002"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "60650002")); print(result); } @@ -58,7 +58,7 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 47809195, 13054919), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47809195, 13054919)); print(result); } @@ -74,7 +74,7 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -82,19 +82,19 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsCoverage() throws Exception { - final SuggestLocationsResult salzburgResult = provider.suggestLocations("Salzburg Süd"); + final SuggestLocationsResult salzburgResult = suggestLocations("Salzburg Süd"); print(salzburgResult); assertThat(salzburgResult.getLocations(), hasItem(new Location(LocationType.STATION, "60650458"))); - final SuggestLocationsResult strasswalchenResult = provider.suggestLocations("Straßwalchen West"); + final SuggestLocationsResult strasswalchenResult = suggestLocations("Straßwalchen West"); print(strasswalchenResult); assertThat(strasswalchenResult.getLocations(), hasItem(new Location(LocationType.STATION, "60656483"))); - final SuggestLocationsResult schwarzachResult = provider.suggestLocations("Schwarzach Abtsdorf"); + final SuggestLocationsResult schwarzachResult = suggestLocations("Schwarzach Abtsdorf"); print(schwarzachResult); assertThat(schwarzachResult.getLocations(), hasItem(new Location(LocationType.STATION, "60656614"))); - final SuggestLocationsResult trimmelkamResult = provider.suggestLocations("Trimmelkam"); + final SuggestLocationsResult trimmelkamResult = suggestLocations("Trimmelkam"); print(trimmelkamResult); assertThat(trimmelkamResult.getLocations(), hasItem(new Location(LocationType.STATION, "60640776"))); } diff --git a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java index 147bcfa4..c0fad912 100644 --- a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java @@ -48,7 +48,7 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "10101101"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "10101101")); print(result); } @@ -56,7 +56,7 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, -32823911, 151462824), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, -32823911, 151462824)); print(result); } @@ -72,7 +72,7 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Town Hall Station"); + final SuggestLocationsResult result = suggestLocations("Town Hall Station"); print(result); } @@ -80,7 +80,7 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java index ec1219ef..a6f2eaf3 100644 --- a/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java @@ -48,7 +48,7 @@ public class TfiProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "51013670"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "51013670")); print(result); } @@ -56,7 +56,7 @@ public class TfiProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 53348656, -6262221), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 53348656, -6262221)); print(result); } @@ -72,7 +72,7 @@ public class TfiProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Lower O'Connell Street"); + final SuggestLocationsResult result = suggestLocations("Lower O'Connell Street"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java index 8cc02fa4..90df7f53 100644 --- a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java @@ -48,17 +48,17 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result1 = provider.queryNearbyStations(new Location(LocationType.STATION, "1001003"), 0, 0); + final NearbyStationsResult result1 = queryNearbyStations(new Location(LocationType.STATION, "1001003")); print(result1); - final NearbyStationsResult result2 = provider.queryNearbyStations(new Location(LocationType.STATION, "1000086"), 0, 0); + final NearbyStationsResult result2 = queryNearbyStations(new Location(LocationType.STATION, "1000086")); print(result2); } @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 51507161, -0127144), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51507161, -0127144)); print(result); } @@ -89,7 +89,7 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Lower Arncott The Plough"); + final SuggestLocationsResult result = suggestLocations("Lower Arncott The Plough"); print(result); } @@ -97,7 +97,7 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Birming"); + final SuggestLocationsResult result = suggestLocations("Birming"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java index e103d6c1..904301dd 100644 --- a/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java @@ -50,7 +50,7 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "6930112"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "6930112")); print(result); } @@ -58,7 +58,7 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48000295, 7854338), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48000295, 7854338)); print(result); } @@ -74,7 +74,7 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kurf"); + final SuggestLocationsResult result = suggestLocations("Kurf"); print(result); } @@ -82,7 +82,7 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsCoverage() throws Exception { - final SuggestLocationsResult freiburgResult = provider.suggestLocations("Betzenhauser Torplatz"); + final SuggestLocationsResult freiburgResult = suggestLocations("Betzenhauser Torplatz"); print(freiburgResult); assertThat(freiburgResult.getLocations(), hasItem(new Location(LocationType.STATION, "6930503"))); } diff --git a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java index 6fb73265..6a99325e 100644 --- a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java @@ -48,7 +48,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "9007102"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "9007102")); print(result); } @@ -56,14 +56,14 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsInvalidStation() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "2449475"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "2449475")); assertEquals(NearbyStationsResult.Status.INVALID_STATION, result.status); } @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 52548505, 1338864), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52548505, 1338864)); print(result); } @@ -89,7 +89,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Haubachstr."); + final SuggestLocationsResult result = suggestLocations("Haubachstr."); print(result); @@ -99,7 +99,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Güntzelstr."); + final SuggestLocationsResult result = suggestLocations("Güntzelstr."); print(result); @@ -109,7 +109,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsAddress() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Sophienstr. 24"); + final SuggestLocationsResult result = suggestLocations("Sophienstr. 24"); print(result); @@ -119,7 +119,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("nol"); + final SuggestLocationsResult result = suggestLocations("nol"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java index 990b86b3..2a472d82 100644 --- a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java @@ -48,7 +48,7 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "119"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "119")); print(result); } @@ -56,7 +56,7 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 47049107, 8312502), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47049107, 8312502)); print(result); } @@ -72,7 +72,7 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -80,7 +80,7 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java index 8540f508..45b33c2c 100644 --- a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java @@ -47,7 +47,7 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8000110"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8000110")); print(result); } @@ -55,7 +55,7 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 51318447, 9496250), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51318447, 9496250)); print(result); } @@ -79,7 +79,7 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Coppengrave"); + final SuggestLocationsResult result = suggestLocations("Coppengrave"); print(result); } @@ -87,7 +87,7 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Göttingen Hauptbahnhof"); + final SuggestLocationsResult result = suggestLocations("Göttingen Hauptbahnhof"); print(result); diff --git a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java index 8aa4de43..72fa24ce 100644 --- a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java @@ -45,7 +45,7 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "3000510"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "3000510")); print(result); } @@ -53,7 +53,7 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 49455472, 11079655), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 49455472, 11079655)); print(result); } @@ -69,7 +69,7 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -77,7 +77,7 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java index 3fb30045..b6d29cbb 100644 --- a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java @@ -47,7 +47,7 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8000244"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8000244")); print(result); } @@ -55,7 +55,7 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 49234783, 6995687), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 49234783, 6995687)); print(result); } @@ -63,7 +63,7 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Flughafen"); + final SuggestLocationsResult result = suggestLocations("Flughafen"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java index ea2376ae..1367368b 100644 --- a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java @@ -48,7 +48,7 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "60001296"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "60001296")); print(result); } @@ -56,7 +56,7 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 47271228, 11402063), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47271228, 11402063)); print(result); } @@ -72,7 +72,7 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -80,7 +80,7 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java index 27f163c9..5604c15c 100644 --- a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java @@ -48,7 +48,7 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "36030062"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "36030062")); print(result); } @@ -56,7 +56,7 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 50832754, 12918348), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 50832754, 12918348)); print(result); } @@ -72,7 +72,7 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java index 560243de..e061ae2f 100644 --- a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java @@ -48,7 +48,7 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "44402031"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "44402031")); print(result); } @@ -56,7 +56,7 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 53637555, 11392593), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 53637555, 11392593)); print(result); } @@ -72,7 +72,7 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java index f80a6584..1a3dbf41 100644 --- a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java @@ -50,7 +50,7 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "60203090"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "60203090")); print(result); } @@ -58,7 +58,7 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48207355, 16370602), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48207355, 16370602)); print(result); } @@ -74,7 +74,7 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -82,7 +82,7 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } @@ -90,11 +90,11 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsCoverage() throws Exception { - final SuggestLocationsResult huetteldorfResult = provider.suggestLocations("Hütteldorf"); + final SuggestLocationsResult huetteldorfResult = suggestLocations("Hütteldorf"); print(huetteldorfResult); assertThat(huetteldorfResult.getLocations(), hasItem(new Location(LocationType.STATION, "60200560"))); - final SuggestLocationsResult wienerNeustadtResult = provider.suggestLocations("Wiener Neustadt Nord"); + final SuggestLocationsResult wienerNeustadtResult = suggestLocations("Wiener Neustadt Nord"); print(wienerNeustadtResult); assertThat(wienerNeustadtResult.getLocations(), hasItem(new Location(LocationType.STATION, "60205223"))); } diff --git a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java index a49c1c41..a18aa214 100644 --- a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java @@ -48,20 +48,20 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result1 = provider.queryNearbyStations(new Location(LocationType.STATION, "6032236"), 0, 0); + final NearbyStationsResult result1 = queryNearbyStations(new Location(LocationType.STATION, "6032236")); print(result1); - final NearbyStationsResult result2 = provider.queryNearbyStations(new Location(LocationType.STATION, "17001301"), 0, 0); + final NearbyStationsResult result2 = queryNearbyStations(new Location(LocationType.STATION, "17001301")); print(result2); } @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result1 = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 49486561, 8477297), 0, 0); + final NearbyStationsResult result1 = queryNearbyStations(new Location(LocationType.ADDRESS, 49486561, 8477297)); print(result1); - final NearbyStationsResult result2 = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 49757571, 6639147), 0, 0); + final NearbyStationsResult result2 = queryNearbyStations(new Location(LocationType.ADDRESS, 49757571, 6639147)); print(result2); } @@ -78,35 +78,35 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } @Test public void suggestLocationsIdentified() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Bremen, KUR"); + final SuggestLocationsResult result = suggestLocations("Bremen, KUR"); print(result); } @Test public void suggestLocationsLocality() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Bremen"); + final SuggestLocationsResult result = suggestLocations("Bremen"); print(result); } @Test public void suggestLocationsCity() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Mannheim"); + final SuggestLocationsResult result = suggestLocations("Mannheim"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java index df85021c..87e548fb 100644 --- a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java @@ -50,7 +50,7 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "20019904"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "20019904")); print(result); } @@ -58,11 +58,11 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 51218693, 6777785), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51218693, 6777785)); print(result); - final NearbyStationsResult result2 = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 51719648, 8754330), 0, 0); + final NearbyStationsResult result2 = queryNearbyStations(new Location(LocationType.ADDRESS, 51719648, 8754330)); print(result2); } @@ -94,11 +94,11 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); - final SuggestLocationsResult paderbornResult = provider.suggestLocations("Paderborn Hbf"); + final SuggestLocationsResult paderbornResult = suggestLocations("Paderborn Hbf"); print(paderbornResult); } @@ -106,7 +106,7 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } @@ -114,7 +114,7 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIdentified() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Düsseldorf, Am Frohnhof"); + final SuggestLocationsResult result = suggestLocations("Düsseldorf, Am Frohnhof"); print(result); } @@ -122,23 +122,23 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsCoverage() throws Exception { - final SuggestLocationsResult cologneResult = provider.suggestLocations("Köln Ebertplatz"); + final SuggestLocationsResult cologneResult = suggestLocations("Köln Ebertplatz"); print(cologneResult); assertThat(cologneResult.getLocations(), hasItem(new Location(LocationType.STATION, "22000035"))); - final SuggestLocationsResult dortmundResult = provider.suggestLocations("Dortmund Zugstraße"); + final SuggestLocationsResult dortmundResult = suggestLocations("Dortmund Zugstraße"); print(dortmundResult); assertThat(dortmundResult.getLocations(), hasItem(new Location(LocationType.STATION, "20000524"))); - final SuggestLocationsResult duesseldorfResult = provider.suggestLocations("Düsseldorf Sternstraße"); + final SuggestLocationsResult duesseldorfResult = suggestLocations("Düsseldorf Sternstraße"); print(duesseldorfResult); assertThat(duesseldorfResult.getLocations(), hasItem(new Location(LocationType.STATION, "20018017"))); - final SuggestLocationsResult muensterResult = provider.suggestLocations("Münster Vennheideweg"); + final SuggestLocationsResult muensterResult = suggestLocations("Münster Vennheideweg"); print(muensterResult); assertThat(muensterResult.getLocations(), hasItem(new Location(LocationType.STATION, "24047291"))); - final SuggestLocationsResult aachenResult = provider.suggestLocations("Aachen Elisenbrunnen"); + final SuggestLocationsResult aachenResult = suggestLocations("Aachen Elisenbrunnen"); print(aachenResult); assertThat(aachenResult.getLocations(), hasItem(new Location(LocationType.STATION, "21001029"))); } @@ -146,7 +146,7 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsCity() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Düsseldorf"); + final SuggestLocationsResult result = suggestLocations("Düsseldorf"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java index 4387b63f..df0b6105 100644 --- a/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java @@ -47,7 +47,7 @@ public class VsnProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8000128"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8000128")); print(result); } @@ -55,7 +55,7 @@ public class VsnProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 51536614, 9925673), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51536614, 9925673)); print(result); } @@ -79,7 +79,7 @@ public class VsnProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Hannover"); + final SuggestLocationsResult result = suggestLocations("Hannover"); print(result); } @@ -87,7 +87,7 @@ public class VsnProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Göttingen"); + final SuggestLocationsResult result = suggestLocations("Göttingen"); print(result); } @@ -95,7 +95,7 @@ public class VsnProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithoutCoordinatesInResult() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("aachen"); + final SuggestLocationsResult result = suggestLocations("aachen"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java index 463a5b9c..d9630ad5 100644 --- a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java @@ -48,7 +48,7 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "3000510"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "3000510")); print(result); } @@ -56,7 +56,7 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 49455472, 11079655), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 49455472, 11079655)); print(result); } @@ -72,7 +72,7 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -80,7 +80,7 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java index 66d9056f..278b5eb2 100644 --- a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java @@ -50,7 +50,7 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "33000013"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "33000013")); print(result); } @@ -58,7 +58,7 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 51052467, 13733196), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51052467, 13733196)); print(result); } @@ -74,7 +74,7 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -82,7 +82,7 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Hülßestraße"); + final SuggestLocationsResult result = suggestLocations("Hülßestraße"); print(result); } @@ -90,7 +90,7 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsCoverage() throws Exception { - final SuggestLocationsResult dresdenResult = provider.suggestLocations("Dresden Postplatz"); + final SuggestLocationsResult dresdenResult = suggestLocations("Dresden Postplatz"); print(dresdenResult); assertThat(dresdenResult.getLocations(), hasItem(new Location(LocationType.STATION, "33000037"))); } @@ -98,7 +98,7 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestAddressLocation() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Dresden, Töpferstr. 10"); + final SuggestLocationsResult result = suggestLocations("Dresden, Töpferstr. 10"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java index d5606b89..6e10da49 100644 --- a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java @@ -48,7 +48,7 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "6118"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "6118")); print(result); } @@ -56,7 +56,7 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48775005, 9166517), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48775005, 9166517)); print(result); } @@ -72,7 +72,7 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -80,7 +80,7 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java index 45bad8a7..7caf5b02 100644 --- a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java @@ -48,7 +48,7 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "60101187"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "60101187")); print(result); } @@ -56,7 +56,7 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 47271228, 11402063), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47271228, 11402063)); print(result); } @@ -72,7 +72,7 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -80,7 +80,7 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java index 8b48fbbd..897a48be 100644 --- a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java @@ -48,7 +48,7 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "80007271"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "80007271")); print(result); } @@ -56,7 +56,7 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 50776518, 12056032), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 50776518, 12056032)); print(result); } @@ -72,7 +72,7 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kirchweidach, Kirchweidach"); + final SuggestLocationsResult result = suggestLocations("Kirchweidach, Kirchweidach"); print(result); } @@ -80,7 +80,7 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java index f4a1074d..a0054509 100644 --- a/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java @@ -50,7 +50,7 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "60203090"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "60203090")); print(result); } @@ -58,7 +58,7 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 48207355, 16370602), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48207355, 16370602)); print(result); } @@ -74,7 +74,7 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = suggestLocations("Kur"); print(result); } @@ -82,7 +82,7 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("grün"); + final SuggestLocationsResult result = suggestLocations("grün"); print(result); } @@ -90,11 +90,11 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsCoverage() throws Exception { - final SuggestLocationsResult huetteldorfResult = provider.suggestLocations("Wien Hütteldorf"); + final SuggestLocationsResult huetteldorfResult = suggestLocations("Wien Hütteldorf"); print(huetteldorfResult); assertThat(huetteldorfResult.getLocations(), hasItem(new Location(LocationType.STATION, "60200560"))); - final SuggestLocationsResult wienerNeustadtResult = provider.suggestLocations("Wiener Neustadt Nord"); + final SuggestLocationsResult wienerNeustadtResult = suggestLocations("Wiener Neustadt Nord"); print(wienerNeustadtResult); assertThat(wienerNeustadtResult.getLocations(), hasItem(new Location(LocationType.STATION, "60205223"))); } diff --git a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java index c2cadb8f..0450b86a 100644 --- a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java @@ -47,7 +47,7 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByStation() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8503000"), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8503000")); print(result); } @@ -55,7 +55,7 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 47378968, 8540534), 0, 0); + final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47378968, 8540534)); print(result); } @@ -79,7 +79,7 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocations() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Flughafen"); + final SuggestLocationsResult result = suggestLocations("Flughafen"); print(result); }