From d254923b77806598c41e68f51070491b8ea76ac7 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 20 Mar 2012 17:58:01 +0100 Subject: [PATCH] parameter for number of connections to query --- .../schildbach/pte/AbstractEfaProvider.java | 11 +++--- .../schildbach/pte/AbstractHafasProvider.java | 10 +++--- .../src/de/schildbach/pte/BahnProvider.java | 5 +-- .../src/de/schildbach/pte/BvgProvider.java | 5 +-- .../de/schildbach/pte/NetworkProvider.java | 14 +++++--- .../src/de/schildbach/pte/VgnProvider.java | 4 +-- .../pte/live/AbstractProviderLiveTest.java | 20 +++++++++++ .../pte/live/AtcProviderLiveTest.java | 4 +-- .../pte/live/AvvProviderLiveTest.java | 4 +-- .../pte/live/BahnProviderLiveTest.java | 18 +++++----- .../pte/live/BayernProviderLiveTest.java | 22 ++++++------ .../pte/live/BsagProviderLiveTest.java | 4 +-- .../pte/live/BsvagProviderLiveTest.java | 4 +-- .../pte/live/BvbProviderLiveTest.java | 4 +-- .../pte/live/BvgProviderLiveTest.java | 34 +++++++++---------- .../pte/live/DingProviderLiveTest.java | 7 ++-- .../pte/live/DsbProviderLiveTest.java | 4 +-- .../pte/live/DubProviderLiveTest.java | 4 +-- .../pte/live/GvhProviderLiveTest.java | 14 ++++---- .../pte/live/InvgProviderLiveTest.java | 4 +-- .../pte/live/IvbProviderLiveTest.java | 4 +-- .../pte/live/KvvProviderLiveTest.java | 4 +-- .../pte/live/LinzProviderLiveTest.java | 12 +++---- .../pte/live/LuProviderLiveTest.java | 8 ++--- .../pte/live/MariborProviderLiveTest.java | 4 +-- .../pte/live/MetProviderLiveTest.java | 4 +-- .../pte/live/MvgProviderLiveTest.java | 4 +-- .../pte/live/MvvProviderLiveTest.java | 24 ++++++------- .../pte/live/NaldoProviderLiveTest.java | 4 +-- .../pte/live/NasaProviderLiveTest.java | 8 ++--- .../pte/live/NphProviderLiveTest.java | 4 +-- .../pte/live/NriProviderLiveTest.java | 4 +-- .../pte/live/NsProviderLiveTest.java | 4 +-- .../pte/live/NvbwProviderLiveTest.java | 4 +-- .../pte/live/NvvProviderLiveTest.java | 4 +-- .../pte/live/OebbProviderLiveTest.java | 16 ++++----- .../pte/live/PlProviderLiveTest.java | 4 +-- .../pte/live/RmvProviderLiveTest.java | 6 ++-- .../pte/live/RtProviderLiveTest.java | 23 ++++++------- .../pte/live/SbbProviderLiveTest.java | 19 +++++------ .../pte/live/SeProviderLiveTest.java | 4 +-- .../pte/live/SeptaProviderLiveTest.java | 8 ++--- .../pte/live/SfProviderLiveTest.java | 4 +-- .../pte/live/ShProviderLiveTest.java | 4 +-- .../pte/live/SncbProviderLiveTest.java | 12 +++---- .../pte/live/StockholmProviderLiveTest.java | 4 +-- .../pte/live/StvProviderLiveTest.java | 4 +-- .../pte/live/SvvProviderLiveTest.java | 4 +-- .../pte/live/SydneyProviderLiveTest.java | 4 +-- .../pte/live/TflProviderLiveTest.java | 6 ++-- .../pte/live/TleaProviderLiveTest.java | 4 +-- .../pte/live/TlemProviderLiveTest.java | 4 +-- .../pte/live/TlseProviderLiveTest.java | 4 +-- .../pte/live/TlswProviderLiveTest.java | 4 +-- .../pte/live/VagfrProviderLiveTest.java | 4 +-- .../pte/live/VbbProviderLiveTest.java | 26 +++++++------- .../pte/live/VblProviderLiveTest.java | 4 +-- .../pte/live/VbnProviderLiveTest.java | 6 ++-- .../pte/live/VgnProviderLiveTest.java | 4 +-- .../pte/live/VgsProviderLiveTest.java | 4 +-- .../pte/live/VmobilProviderLiveTest.java | 4 +-- .../pte/live/VmsProviderLiveTest.java | 4 +-- .../pte/live/VmvProviderLiveTest.java | 4 +-- .../pte/live/VorProviderLiveTest.java | 4 +-- .../pte/live/VrnProviderLiveTest.java | 4 +-- .../pte/live/VrrProviderLiveTest.java | 4 +-- .../pte/live/VrtProviderLiveTest.java | 4 +-- .../pte/live/VvmProviderLiveTest.java | 4 +-- .../pte/live/VvoProviderLiveTest.java | 4 +-- .../pte/live/VvsProviderLiveTest.java | 4 +-- .../pte/live/VvtProviderLiveTest.java | 4 +-- .../pte/live/VvvProviderLiveTest.java | 4 +-- .../pte/live/ZvvProviderLiveTest.java | 4 +-- 73 files changed, 278 insertions(+), 252 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index b0cffccc..2108b5bc 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1564,7 +1564,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider } protected String xsltTripRequest2Uri(final Location from, final Location via, final Location to, final Date date, final boolean dep, - final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) + final int numConnections, final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) { final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMdd"); final DateFormat TIME_FORMAT = new SimpleDateFormat("HHmm"); @@ -1588,6 +1588,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider uri.append("&itdTime=").append(ParserUtils.urlEncode(TIME_FORMAT.format(date))); uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr"); + uri.append("&calcNumberOfTrips=").append(numConnections); + uri.append("&ptOptionsActive=1"); // enable public transport options uri.append("&itOptionsActive=1"); // enable individual transport options uri.append("&changeSpeed=").append(WALKSPEED_MAP.get(walkSpeed)); @@ -1666,9 +1668,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider } public QueryConnectionsResult queryConnections(final Location from, final Location via, final Location to, final Date date, final boolean dep, - final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException + final int numConnections, final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException { - final String uri = xsltTripRequest2Uri(from, via, to, date, dep, products, walkSpeed, accessibility); + final String uri = xsltTripRequest2Uri(from, via, to, date, dep, numConnections, products, walkSpeed, accessibility); InputStream is = null; try @@ -1687,7 +1689,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider } } - public QueryConnectionsResult queryMoreConnections(final QueryConnectionsContext contextObj, final boolean later) throws IOException + public QueryConnectionsResult queryMoreConnections(final QueryConnectionsContext contextObj, final boolean later, final int numConnections) + throws IOException { final Context context = (Context) contextObj; final String commandUri = context.context; diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index db2a10be..4a3ed3a8 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -70,7 +70,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider private static final String DEFAULT_ENCODING = "ISO-8859-1"; private static final String PROD = "hafas"; - private static final int NUM_CONNECTIONS = 6; private final String apiUri; private final int numProductBits; @@ -727,7 +726,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider } public QueryConnectionsResult queryConnections(Location from, Location via, Location to, final Date date, final boolean dep, - final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException + final int numConnections, final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException { final ResultHeader header = new ResultHeader(SERVER_PRODUCT); @@ -795,7 +794,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider // number of connections backwards request.append(" b=\"").append(0).append("\""); // number of connection forwards - request.append(" f=\"").append(NUM_CONNECTIONS).append("\""); + request.append(" f=\"").append(numConnections).append("\""); // percentual extension of change time request.append(" chExtension=\"").append(walkSpeed == WalkSpeed.SLOW ? 50 : 0).append("\""); // TODO nrChanges: max number of changes @@ -805,12 +804,13 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider return queryConnections(null, true, request.toString(), from, via, to); } - public QueryConnectionsResult queryMoreConnections(final QueryConnectionsContext contextObj, final boolean later) throws IOException + public QueryConnectionsResult queryMoreConnections(final QueryConnectionsContext contextObj, final boolean later, final int numConnections) + throws IOException { final Context context = (Context) contextObj; final StringBuilder request = new StringBuilder(""); + .append(numConnections).append("\">"); request.append("").append(later ? context.laterContext : context.earlierContext).append(""); request.append(""); diff --git a/enabler/src/de/schildbach/pte/BahnProvider.java b/enabler/src/de/schildbach/pte/BahnProvider.java index 679aefe2..6215c4b8 100644 --- a/enabler/src/de/schildbach/pte/BahnProvider.java +++ b/enabler/src/de/schildbach/pte/BahnProvider.java @@ -276,7 +276,7 @@ public final class BahnProvider extends AbstractHafasProvider @Override public QueryConnectionsResult queryConnections(final Location from, final Location via, final Location to, final Date date, final boolean dep, - final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException + final int numConnections, final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException { final String uri = connectionsQueryUri(from, via, to, date, dep, products); final CharSequence page = ParserUtils.scrape(uri); @@ -317,7 +317,8 @@ public final class BahnProvider extends AbstractHafasProvider } @Override - public QueryConnectionsResult queryMoreConnections(final QueryConnectionsContext contextObj, final boolean later) throws IOException + public QueryConnectionsResult queryMoreConnections(final QueryConnectionsContext contextObj, final boolean later, final int numConnections) + throws IOException { final Context context = (Context) contextObj; diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java index 5dc2786c..d19f67ca 100644 --- a/enabler/src/de/schildbach/pte/BvgProvider.java +++ b/enabler/src/de/schildbach/pte/BvgProvider.java @@ -572,7 +572,7 @@ public final class BvgProvider extends AbstractHafasProvider @Override public QueryConnectionsResult queryConnections(final Location from, final Location via, final Location to, final Date date, final boolean dep, - final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException + final int numConnections, final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException { final String uri = connectionsQueryUri(from, via, to, date, dep, products); final CharSequence page = ParserUtils.scrape(uri); @@ -627,7 +627,8 @@ public final class BvgProvider extends AbstractHafasProvider } @Override - public QueryConnectionsResult queryMoreConnections(final QueryConnectionsContext contextObj, final boolean later) throws IOException + public QueryConnectionsResult queryMoreConnections(final QueryConnectionsContext contextObj, final boolean later, final int numConnections) + throws IOException { final Context context = (Context) contextObj; diff --git a/enabler/src/de/schildbach/pte/NetworkProvider.java b/enabler/src/de/schildbach/pte/NetworkProvider.java index 710d9c5b..b393d83e 100644 --- a/enabler/src/de/schildbach/pte/NetworkProvider.java +++ b/enabler/src/de/schildbach/pte/NetworkProvider.java @@ -31,8 +31,8 @@ import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.dto.Style; /** - * Interface to be implemented by providers of transportation networks - * + * Interface to be implemented by providers of transportation networks. + * * @author Andreas Schildbach */ public interface NetworkProvider @@ -107,6 +107,8 @@ public interface NetworkProvider * desired date for departing, mandatory * @param dep * date is departure date? {@code true} for departure, {@code false} for arrival + * @param numConnections + * number of connections to query * @param products * products to take into account * @param walkSpeed @@ -116,8 +118,8 @@ public interface NetworkProvider * @return result object that can contain alternatives to clear up ambiguousnesses, or contains possible connections * @throws IOException */ - QueryConnectionsResult queryConnections(Location from, Location via, Location to, Date date, boolean dep, String products, WalkSpeed walkSpeed, - Accessibility accessibility) throws IOException; + QueryConnectionsResult queryConnections(Location from, Location via, Location to, Date date, boolean dep, int numConnections, String products, + WalkSpeed walkSpeed, Accessibility accessibility) throws IOException; /** * Query more connections (e.g. earlier or later) @@ -126,10 +128,12 @@ public interface NetworkProvider * context to query more connections from * @param next * {@code true} for get next connections, {@code false} for get previous connections + * @param numConnections + * number of connections to query * @return result object that contains possible connections * @throws IOException */ - QueryConnectionsResult queryMoreConnections(QueryConnectionsContext context, boolean later) throws IOException; + QueryConnectionsResult queryMoreConnections(QueryConnectionsContext context, boolean later, int numConnections) throws IOException; /** * Get details about a connection diff --git a/enabler/src/de/schildbach/pte/VgnProvider.java b/enabler/src/de/schildbach/pte/VgnProvider.java index 9cf51561..360a9fb2 100644 --- a/enabler/src/de/schildbach/pte/VgnProvider.java +++ b/enabler/src/de/schildbach/pte/VgnProvider.java @@ -51,8 +51,8 @@ public class VgnProvider extends AbstractEfaProvider @Override protected String xsltTripRequest2Uri(final Location from, final Location via, final Location to, final Date date, final boolean dep, - final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) + final int numConnections, final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) { - return super.xsltTripRequest2Uri(from, via, to, date, dep, products, walkSpeed, accessibility) + "&itdLPxx_showTariffLevel=1"; + return super.xsltTripRequest2Uri(from, via, to, date, dep, numConnections, products, walkSpeed, accessibility) + "&itdLPxx_showTariffLevel=1"; } } diff --git a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java index 5a0dd036..fd71411f 100644 --- a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java @@ -17,10 +17,17 @@ package de.schildbach.pte.live; +import java.io.IOException; +import java.util.Date; import java.util.List; +import de.schildbach.pte.NetworkProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; +import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.NearbyStationsResult; +import de.schildbach.pte.dto.QueryConnectionsContext; +import de.schildbach.pte.dto.QueryConnectionsResult; import de.schildbach.pte.dto.QueryDeparturesResult; /** @@ -52,4 +59,17 @@ public abstract class AbstractProviderLiveTest System.out.print(autocomplete.toDebugString() + " "); System.out.println(); } + + protected final QueryConnectionsResult queryConnections(final NetworkProvider provider, final Location from, final Location via, + final Location to, final Date date, final boolean dep, final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) + throws IOException + { + return provider.queryConnections(from, via, to, date, dep, 4, products, walkSpeed, accessibility); + } + + protected final QueryConnectionsResult queryMoreConnections(final NetworkProvider provider, final QueryConnectionsContext context, + final boolean later) throws IOException + { + return provider.queryMoreConnections(context, later, 4); + } } diff --git a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java index a2111464..7ed455d2 100644 --- a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java @@ -82,10 +82,10 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java index 325c61c5..3444daad 100644 --- a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java @@ -81,11 +81,11 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 101, null, "Königsplatz"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 101, null, "Königsplatz"), null, new Location(LocationType.STATION, 100, null, "Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java index e6ad82b3..3d11055b 100644 --- a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java @@ -82,30 +82,30 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 8011160, null, "Berlin Hbf"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8011160, null, "Berlin Hbf"), null, new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); for (final Connection connection : result.connections) provider.getConnectionDetails(connection.link); System.out.println(laterResult); - final QueryConnectionsResult later2Result = provider.queryMoreConnections(laterResult.context, true); + final QueryConnectionsResult later2Result = queryMoreConnections(provider, laterResult.context, true); System.out.println(later2Result); - final QueryConnectionsResult earlierResult = provider.queryMoreConnections(later2Result.context, false); + final QueryConnectionsResult earlierResult = queryMoreConnections(provider, later2Result.context, false); System.out.println(earlierResult); - final QueryConnectionsResult later3Result = provider.queryMoreConnections(earlierResult.context, true); + final QueryConnectionsResult later3Result = queryMoreConnections(provider, earlierResult.context, true); System.out.println(later3Result); } @Test public void slowConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Marienburger Str., Berlin"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Marienburger Str., Berlin"), null, new Location(LocationType.ANY, 0, null, "Tutzinger-Hof-Platz, Starnberg"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); for (final Connection connection : result.connections) provider.getConnectionDetails(connection.link); System.out.println(laterResult); @@ -114,12 +114,12 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest @Test public void connectionWithFootway() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "Berlin - Mitte, Unter den Linden 24"), null, new Location(LocationType.ADDRESS, 0, null, "Starnberg, Possenhofener Straße 13"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); for (final Connection connection : result.connections) provider.getConnectionDetails(connection.link); System.out.println(laterResult); diff --git a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java index af5ac2ce..67d1f2f6 100644 --- a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java @@ -81,18 +81,18 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 80000793, "München", "Ostbahnhof"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 80000793, "München", "Ostbahnhof"), null, new Location(LocationType.STATION, 80000799, "München", "Pasing"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void longConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 1005530, "Starnberg", "Arbeitsamt"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1005530, "Starnberg", "Arbeitsamt"), null, new Location(LocationType.STATION, 3001459, "Nürnberg", "Fallrohrstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); @@ -102,42 +102,42 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest @Test public void connectionBetweenCoordinates() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 48165238, 11577473), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 48165238, 11577473), null, new Location(LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenCoordinateAndStation() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 48238341, 11478230), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 48238341, 11478230), null, new Location(LocationType.ANY, 0, null, "Ostbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, "München, Maximilianstr. 1"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "München, Maximilianstr. 1"), null, new Location(LocationType.ADDRESS, 0, null, "Starnberg, Jahnstraße 50"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenStationAndAddress() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 1220, null, "Josephsburg"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1220, null, "Josephsburg"), null, new Location(LocationType.ADDRESS, 0, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/BsagProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BsagProviderLiveTest.java index 9f41df2d..16e17e33 100644 --- a/enabler/test/de/schildbach/pte/live/BsagProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BsagProviderLiveTest.java @@ -81,11 +81,11 @@ public class BsagProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 28000257, null, "Bremen, Hauptbahnhof"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 28000257, null, "Bremen, Hauptbahnhof"), null, new Location(LocationType.STATION, 28000512, null, "Herdentor"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java index 97a6852e..71d89a0b 100644 --- a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java @@ -72,11 +72,11 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 26000178, null, "Hauptbahnhof"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 26000178, null, "Hauptbahnhof"), null, new Location(LocationType.STATION, 26000322, null, "Packhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java index 51d0afd4..00514edb 100644 --- a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java @@ -81,10 +81,10 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 10000, null, "Bahnhof"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 10000, null, "Bahnhof"), null, new Location(LocationType.STATION, 86, null, "Markthalle"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java index ca726c62..e9d70d4b 100644 --- a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java @@ -88,84 +88,84 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), null, new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); - final QueryConnectionsResult later2Result = provider.queryMoreConnections(laterResult.context, true); + final QueryConnectionsResult later2Result = queryMoreConnections(provider, laterResult.context, true); System.out.println(later2Result); - final QueryConnectionsResult earlierResult = provider.queryMoreConnections(later2Result.context, false); + final QueryConnectionsResult earlierResult = queryMoreConnections(provider, later2Result.context, false); System.out.println(earlierResult); - final QueryConnectionsResult later3Result = provider.queryMoreConnections(earlierResult.context, true); + final QueryConnectionsResult later3Result = queryMoreConnections(provider, earlierResult.context, true); System.out.println(later3Result); } @Test public void shortViaConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), new Location(LocationType.STATION, 9044202, "Berlin", "Bundesplatz"), new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenCoordinates() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), null, new Location(LocationType.ADDRESS, 0, 52513639, 13568648, null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenCoordinatesAndAddresses() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 52536099, 13426309, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 52536099, 13426309, null, "Christburger Straße 1, 10405 Berlin, Deutschland"), null, new Location(LocationType.ADDRESS, 0, 52486400, 13350744, null, "Eisenacher Straße 70, 10823 Berlin, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void viaConnectionBetweenCoordinates() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), new Location(LocationType.ADDRESS, 0, 52479868, 13324247, null, null), new Location(LocationType.ADDRESS, 0, 52513639, 13568648, null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "10715 Bln Charlb.-Wilm., Weimarische Str. 7"), null, new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void viaConnectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "10715 Bln Charlb.-Wilm., Weimarische Str. 7"), new Location(LocationType.ADDRESS, 0, null, "10115 Bln Mitte, Hannoversche Str. 20"), new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java index 2bc649d5..72711f9a 100644 --- a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java @@ -81,11 +81,10 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider - .queryConnections(new Location(LocationType.STATION, 9001011, null, "Justizgebäude"), null, new Location(LocationType.STATION, - 2504524, null, "Theater"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 9001011, null, "Justizgebäude"), null, + new Location(LocationType.STATION, 2504524, null, "Theater"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java index 45c086cc..1197c6ab 100644 --- a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java @@ -73,11 +73,11 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 900000011, null, "Copenhagen Airport"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 900000011, null, "Copenhagen Airport"), null, new Location(LocationType.STATION, 551922500, null, "Billund Airport"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java index 04c84119..2313cd13 100644 --- a/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java @@ -64,11 +64,11 @@ public class DubProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 3505565, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 3505565, null, "Airport Terminal 1, Arrival"), null, new Location(LocationType.STATION, 3505445, null, "Airport Terminal 3"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java index 1f4cf999..d4738e9c 100644 --- a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java @@ -105,7 +105,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest @Test public void incompleteConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "hann"), null, new Location( + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "hann"), null, new Location( LocationType.ANY, 0, null, "laat"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result); } @@ -113,33 +113,33 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 25000031, null, "Hannover Hauptbahnhof"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 25000031, null, "Hannover Hauptbahnhof"), null, new Location(LocationType.STATION, 25001141, null, "Hannover Bismarckstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenAnyAndAddress() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, 53069619, 8799202, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, 53069619, 8799202, null, "bremen, neustadtswall 12"), null, new Location(LocationType.ADDRESS, 0, 53104124, 8788575, null, "Bremen Glücksburger Straße 37"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 53622859, 10133545, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 53622859, 10133545, null, "Zamenhofweg 14, 22159 Hamburg, Deutschland"), null, new Location(LocationType.ADDRESS, 0, 53734260, 9674990, null, "Lehmkuhlen 5, 25337 Elmshorn, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java index bd1a5435..0356a766 100644 --- a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java @@ -73,11 +73,11 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 80302, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 80302, null, "Ingolstadt, Hauptbahnhof Stadteinwärts"), null, new Location(LocationType.STATION, 181102, null, "Elisabethstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java index 88696dda..d486f0f9 100644 --- a/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java @@ -81,11 +81,11 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 60466402, null, "Kochstraße"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 60466402, null, "Kochstraße"), null, new Location(LocationType.STATION, 60461679, null, "Messe/Zeughaus"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java index eee606ec..23faa66e 100644 --- a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java @@ -81,11 +81,11 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest @Test public void connectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 48985089, 8402709, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 48985089, 8402709, null, "Konstanzer Straße 17, 76199 Karlsruhe, Deutschland"), null, new Location(LocationType.ADDRESS, 0, 49007706, 8356358, null, "Durmersheimer Straße 6, 76185 Karlsruhe, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java index b57cd122..82ef0ef8 100644 --- a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java @@ -96,7 +96,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest @Test public void incompleteConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "linz"), null, new Location( + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "linz"), null, new Location( LocationType.ANY, 0, null, "gel"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result); } @@ -104,22 +104,22 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Linz Hauptbahnhof"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Linz Hauptbahnhof"), null, new Location(LocationType.STATION, 0, null, "Linz Auwiesen"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); - final QueryConnectionsResult earlierResult = provider.queryMoreConnections(laterResult.context, false); + final QueryConnectionsResult earlierResult = queryMoreConnections(provider, laterResult.context, false); System.out.println(earlierResult); } @Test public void longConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Linz Auwiesen"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Linz Auwiesen"), null, new Location(LocationType.STATION, 0, null, "Linz Hafen"), new Date(), true, ALL_PRODUCTS, WalkSpeed.SLOW, Accessibility.NEUTRAL); System.out.println(result); - // final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + // final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); // System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java index 842b528e..124794ef 100644 --- a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java @@ -73,22 +73,22 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 9409001, null, "Echternach, Bel Air"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 9409001, null, "Echternach, Bel Air"), null, new Location(LocationType.STATION, 9440001, null, "Echternach, Gare"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void addressConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 49611610, 6130265, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 49611610, 6130265, null, "Luxembourg, Rue Génistre 2"), null, new Location(LocationType.STATION, 9217081, null, "Luxembourg, Gare Centrale"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/MariborProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MariborProviderLiveTest.java index f8df05bf..fdb5e7fb 100644 --- a/enabler/test/de/schildbach/pte/live/MariborProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MariborProviderLiveTest.java @@ -73,11 +73,11 @@ public class MariborProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 63202999, null, "Graz Marburger Straße"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 63202999, null, "Graz Marburger Straße"), null, new Location(LocationType.STATION, 63201746, null, "Flughafen Graz Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java index 0637fdc6..85858495 100644 --- a/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java @@ -73,10 +73,10 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java index 433a35dc..37ea1129 100644 --- a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java @@ -81,11 +81,11 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 24510104, null, "Schützenplatz"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 24510104, null, "Schützenplatz"), null, new Location(LocationType.STATION, 24064226, null, "Schützenhalle"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java index c2c86a70..0487a099 100644 --- a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java @@ -81,19 +81,19 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Marienplatz"), null, new Location( + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Marienplatz"), null, new Location( LocationType.ANY, 0, null, "Pasing"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); - final QueryConnectionsResult earlierResult = provider.queryMoreConnections(laterResult.context, false); + final QueryConnectionsResult earlierResult = queryMoreConnections(provider, laterResult.context, false); System.out.println(earlierResult); } @Test public void longConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Starnberg, Arbeitsamt"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Starnberg, Arbeitsamt"), null, new Location(LocationType.STATION, 0, null, "Ackermannstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); @@ -103,42 +103,42 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest @Test public void connectionBetweenCoordinates() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 48165238, 11577473), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 48165238, 11577473), null, new Location(LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenCoordinateAndStation() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 48238341, 11478230), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 48238341, 11478230), null, new Location(LocationType.ANY, 0, null, "Ostbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, "München, Maximilianstr. 1"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "München, Maximilianstr. 1"), null, new Location(LocationType.ADDRESS, 0, null, "Starnberg, Jahnstraße 50"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenStationAndAddress() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 1220, null, "Josephsburg"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1220, null, "Josephsburg"), null, new Location(LocationType.ADDRESS, 0, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java index bdf87e04..7de1a6ee 100644 --- a/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java @@ -81,11 +81,11 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 3019697, null, "Amberg Kurfürstenbad"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 3019697, null, "Amberg Kurfürstenbad"), null, new Location(LocationType.STATION, 3019500, null, "Amberg Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java index bbca40b1..22a9c5ad 100644 --- a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java @@ -65,22 +65,22 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 13002, null, "Leipzig, Augustusplatz"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 13002, null, "Leipzig, Augustusplatz"), null, new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void addressConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 51334078, 12478331, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 51334078, 12478331, "04319 Leipzig-Engelsdorf", "August-Bebel-Platz"), null, new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NphProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NphProviderLiveTest.java index 4082804d..27ac567e 100644 --- a/enabler/test/de/schildbach/pte/live/NphProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NphProviderLiveTest.java @@ -81,11 +81,11 @@ public class NphProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 23007000, "Paderborn", "Paderborn Hbf"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 23007000, "Paderborn", "Paderborn Hbf"), null, new Location(LocationType.STATION, 23007700, "Höxter", "Bahnhof / Rathaus"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java index e6cff177..219880a6 100644 --- a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java @@ -73,10 +73,10 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 8059, null, "Oslo"), null, new Location( + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8059, null, "Oslo"), null, new Location( LocationType.STATION, 6642, null, "Bergen BGO"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java index fa52ca0a..f7ee1a91 100644 --- a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java @@ -73,7 +73,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 100024), null, new Location( + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 100024), null, new Location( LocationType.STATION, 100066), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); @@ -82,7 +82,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest @Test public void longConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 100024), null, new Location( + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 100024), null, new Location( LocationType.STATION, 103624), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); diff --git a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java index bfbf5c2d..cc61ec9e 100644 --- a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java @@ -81,11 +81,11 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 17002402, null, "Bahnhof"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 17002402, null, "Bahnhof"), null, new Location(LocationType.STATION, 17009001, null, "Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java index 7957c9fd..4bd9f15e 100644 --- a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java @@ -73,11 +73,11 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 2200007, null, "Kassel Wilhelmshöhe"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 2200007, null, "Kassel Wilhelmshöhe"), null, new Location(LocationType.STATION, 2200278, null, "Kassel Wilhelmshöher Weg"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java index 6fdced54..c4ed5d3c 100644 --- a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java @@ -81,50 +81,50 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 1140101, null, "Linz"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1140101, null, "Linz"), null, new Location(LocationType.STATION, 1190100, null, "Wien"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); assertEquals(QueryConnectionsResult.Status.OK, result.status); assertTrue(result.connections.size() > 0); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void slowConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Ramsen Zoll!"), null, new Location( + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Ramsen Zoll!"), null, new Location( LocationType.ANY, 0, null, "Azuga!"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); assertEquals(QueryConnectionsResult.Status.OK, result.status); assertTrue(result.connections.size() > 0); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionWithFootway() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Graz, Haselweg!"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Graz, Haselweg!"), null, new Location(LocationType.ANY, 0, null, "Innsbruck, Gumppstraße 69!"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); assertEquals(QueryConnectionsResult.Status.OK, result.status); assertTrue(result.connections.size() > 0); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionWithFootway2() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Wien, Krottenbachstraße 110!"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Wien, Krottenbachstraße 110!"), null, new Location(LocationType.ADDRESS, 0, null, "Wien, Meidlinger Hauptstraße 1!"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); assertEquals(QueryConnectionsResult.Status.OK, result.status); assertTrue(result.connections.size() > 0); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java index 36adddf6..f52cd421 100644 --- a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java @@ -73,11 +73,11 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 5196001, null, "KRAKÓW"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 5196001, null, "KRAKÓW"), null, new Location(LocationType.STATION, 5196003, null, "WARSZAWA"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/RmvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/RmvProviderLiveTest.java index 9f7f2e5c..989d7b10 100644 --- a/enabler/test/de/schildbach/pte/live/RmvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/RmvProviderLiveTest.java @@ -73,18 +73,18 @@ public class RmvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 3000001, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 3000001, null, "Hauptwache"), null, new Location(LocationType.STATION, 3000912, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void shortConnectionByName() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Frankfurt Bockenheimer Warte!"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Frankfurt Bockenheimer Warte!"), null, new Location(LocationType.ANY, 0, null, "Frankfurt Hauptbahnhof!"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); diff --git a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java index 1eacc62c..1caec7a1 100644 --- a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java @@ -81,55 +81,54 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 8503000, null, "Zürich HB"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8503000, null, "Zürich HB"), null, new Location(LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void slowConnection() throws Exception { - final QueryConnectionsResult result = provider - .queryConnections(new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, new Location(LocationType.ANY, 0, null, - "Laconnex, Mollach"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, + new Location(LocationType.ANY, 0, null, "Laconnex, Mollach"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionWithFootway() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, "Spiez, Seestraße 62"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "Spiez, Seestraße 62"), null, new Location(LocationType.ADDRESS, 0, null, "Einsiedeln, Erlenmoosweg 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionFromAddress() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 51521886, -51447, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 51521886, -51447, null, "26 Coopers Close, Poplar, Greater London E1 4, Vereinigtes Königreich"), null, new Location(LocationType.STATION, 8096022, 50941312, 6967206, null, "COLOGNE"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void viaConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 8400056, null, "Amsterdam RAI"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8400056, null, "Amsterdam RAI"), new Location(LocationType.STATION, 8400058, null, "Amsterdam Centraal"), new Location(LocationType.STATION, 8000085, null, "Düsseldorf Hbf"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java index 51b4d70d..920c114a 100644 --- a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java @@ -81,44 +81,43 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 8503000, null, "Zürich HB"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8503000, null, "Zürich HB"), null, new Location(LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void slowConnection() throws Exception { - final QueryConnectionsResult result = provider - .queryConnections(new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, new Location(LocationType.ANY, 0, null, - "Laconnex, Mollach"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, + new Location(LocationType.ANY, 0, null, "Laconnex, Mollach"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionWithFootway() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, "Spiez, Seestraße 62"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "Spiez, Seestraße 62"), null, new Location(LocationType.ADDRESS, 0, null, "Einsiedeln, Erlenmoosweg 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionFromAddress() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "Dorfstrasse 10, Dällikon, Schweiz"), null, new Location(LocationType.STATION, 8500010, null, "Basel"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java index 1a46eba1..a81a3105 100644 --- a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java @@ -73,11 +73,11 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 7414867, null, "Luleå Airport"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 7414867, null, "Luleå Airport"), null, new Location(LocationType.STATION, 7498000, null, "STOCKHOLM"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java index 73c8f247..d5a30a63 100644 --- a/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java @@ -73,22 +73,22 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 2090227, null, "Main Street"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 2090227, null, "Main Street"), null, new Location(LocationType.STATION, 1015755, null, "Harbison Av + Unruh Av"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void addressConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 40015670, -75209400, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 40015670, -75209400, "Philadelphia 19127", "3601 Main St"), null, new Location(LocationType.STATION, 2090227, null, "Main Street"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java index 4ee4dab7..0d8996b2 100644 --- a/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java @@ -73,10 +73,10 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java index aea4e0d1..a0d921f9 100644 --- a/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java @@ -73,11 +73,11 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 8002547, null, "Flughafen Hamburg"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8002547, null, "Flughafen Hamburg"), null, new Location(LocationType.STATION, 715210, null, "Flughafen, Lübeck"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java index e435c77c..bf6ed463 100644 --- a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java @@ -81,13 +81,13 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 8821006, "Antwerpen", "Centraal"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8821006, "Antwerpen", "Centraal"), null, new Location(LocationType.STATION, 8813003, "Brussel", "Centraal"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); if (result.context != null) { - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult.status + " " + laterResult.connections); } } @@ -95,13 +95,13 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest @Test public void longConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 207280, "Brussel", "Wannecouter"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 207280, "Brussel", "Wannecouter"), null, new Location(LocationType.STATION, 207272, "Brussel", "Stadion"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); if (result.context != null) { - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult.status + " " + laterResult.connections); } } @@ -109,14 +109,14 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest @Test public void connectionFromAddress() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "Bruxelles - Haren, Rue Paul Janson 9"), null, new Location(LocationType.STATION, 8500010, null, "Basel"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); if (result.context != null) { - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult.status + " " + laterResult.connections); } } diff --git a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java index ad12bb0c..746d7577 100644 --- a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java @@ -73,11 +73,11 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 200101051, "Stockholm", "T-Centralen"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 200101051, "Stockholm", "T-Centralen"), null, new Location(LocationType.STATION, 200101221, "Stockholm", "Abrahamsberg"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java index 09f2bbfb..367eb5ee 100644 --- a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java @@ -81,10 +81,10 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java index aa59f683..6f15ad74 100644 --- a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java @@ -73,10 +73,10 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java index 33a46a67..858070d3 100644 --- a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java @@ -73,11 +73,11 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 10101100, "Sydney", "Central Station"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 10101100, "Sydney", "Central Station"), null, new Location(LocationType.STATION, 0, "Sydney", "Capitol Square"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java index 6aada6cf..75397592 100644 --- a/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java @@ -73,18 +73,18 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void postcodeConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "sw19 8ta"), null, new Location( + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "sw19 8ta"), null, new Location( LocationType.STATION, 1016019, 51655903, -397249, null, "Watford (Herts), Watford Town Centre"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); diff --git a/enabler/test/de/schildbach/pte/live/TleaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TleaProviderLiveTest.java index 425d964e..eb5b251c 100644 --- a/enabler/test/de/schildbach/pte/live/TleaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TleaProviderLiveTest.java @@ -73,11 +73,11 @@ public class TleaProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java index e88ce187..645b3576 100644 --- a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java @@ -73,11 +73,11 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/TlseProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlseProviderLiveTest.java index 7eff97c6..b42ce2ed 100644 --- a/enabler/test/de/schildbach/pte/live/TlseProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TlseProviderLiveTest.java @@ -73,11 +73,11 @@ public class TlseProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java index 9cd48cc5..3108386e 100644 --- a/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java @@ -73,10 +73,10 @@ public class TlswProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "70003023"), null, new Location( + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "70003023"), null, new Location( LocationType.STATION, 0, null, "70003025"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java index 2635154d..40824ac2 100644 --- a/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java @@ -73,10 +73,10 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java index b2aa5bb2..60bae8fd 100644 --- a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java @@ -73,69 +73,69 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), null, new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); - final QueryConnectionsResult earlierResult = provider.queryMoreConnections(laterResult.context, false); + final QueryConnectionsResult earlierResult = queryMoreConnections(provider, laterResult.context, false); System.out.println(earlierResult); } @Test public void shortViaConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), new Location(LocationType.STATION, 9044202, "Berlin", "Bundesplatz"), new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenCoordinates() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), null, new Location(LocationType.ADDRESS, 0, 52513639, 13568648, null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void viaConnectionBetweenCoordinates() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), new Location(LocationType.ADDRESS, 0, 52479868, 13324247, null, null), new Location(LocationType.ADDRESS, 0, 52513639, 13568648, null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "10715 Bln Charlb.-Wilm., Weimarische Str. 7"), null, new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void viaConnectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "10715 Bln Charlb.-Wilm., Weimarische Str. 7"), new Location(LocationType.ADDRESS, 0, null, "10115 Bln Mitte, Hannoversche Str. 20"), new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java index fc055343..6cbf50a5 100644 --- a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java @@ -81,10 +81,10 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java index 30f5d1d8..b2b0e523 100644 --- a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java @@ -75,19 +75,19 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 8096109, null, "Oldenburg"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8096109, null, "Oldenburg"), null, new Location(LocationType.STATION, 625398, null, "Bremerhaven"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); assertEquals(QueryConnectionsResult.Status.OK, result.status); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } @Test public void connectionDateOutsideTimetablePeriod() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 8096109, null, "Oldenburg"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8096109, null, "Oldenburg"), null, new Location(LocationType.STATION, 625398, null, "Bremerhaven"), new Date(1155822689759l), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); assertEquals(QueryConnectionsResult.Status.INVALID_DATE, result.status); diff --git a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java index 2085cd8a..f8b67f70 100644 --- a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java @@ -81,11 +81,11 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 451, "Nürnberg", "Ostring"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 451, "Nürnberg", "Ostring"), null, new Location(LocationType.STATION, 510, "Nürnberg", "Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java index 99f1e1a5..dbc38ebf 100644 --- a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java @@ -73,10 +73,10 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java index 8efe65b8..c653ffaa 100644 --- a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java @@ -81,10 +81,10 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java index 5f16a62b..61abbd8b 100644 --- a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java @@ -73,10 +73,10 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java index 1136ef09..9e688978 100644 --- a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java @@ -73,10 +73,10 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java index c30715c0..54e7b2bd 100644 --- a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java @@ -81,10 +81,10 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java index efa7f38b..f0f6dea8 100644 --- a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java @@ -105,10 +105,10 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java index 17cffae2..edbf9534 100644 --- a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java @@ -97,11 +97,11 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 20009289, "Essen", "Hauptbahnhof"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 20009289, "Essen", "Hauptbahnhof"), null, new Location(LocationType.STATION, 20009161, "Essen", "Bismarckplatz"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java index d360ffbd..40edceaa 100644 --- a/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java @@ -73,11 +73,11 @@ public class VrtProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 17002402, null, "Bahnhof"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 17002402, null, "Bahnhof"), null, new Location(LocationType.STATION, 17009001, null, "Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java index 4fcf18c1..321c0a9e 100644 --- a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java @@ -81,10 +81,10 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java index 2f933166..85399414 100644 --- a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java @@ -73,10 +73,10 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java index 2f4714ed..a7fd8758 100644 --- a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java @@ -81,10 +81,10 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java index 60a12354..2a43983b 100644 --- a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java @@ -81,10 +81,10 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java index bbec78e1..5fdaafd9 100644 --- a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java @@ -81,10 +81,10 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java index 6ef8bcbe..005a7c48 100644 --- a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java @@ -73,11 +73,11 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 8503000, null, "Zürich HB"), null, + final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8503000, null, "Zürich HB"), null, new Location(LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); System.out.println(laterResult); } }