mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-16 09:29:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

parameter for number of connections to query

Browse source
This commit is contained in:
Andreas Schildbach 2012-03-20 17:58:01 +01:00
parent 0b40edff29
commit d254923b77
73 changed files with 278 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

11
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -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, 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 DATE_FORMAT = new SimpleDateFormat("yyyyMMdd");
final DateFormat TIME_FORMAT = new SimpleDateFormat("HHmm"); 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("&itdTime=").append(ParserUtils.urlEncode(TIME_FORMAT.format(date)));
uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr"); uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr");
uri.append("&calcNumberOfTrips=").append(numConnections);
uri.append("&ptOptionsActive=1"); // enable public transport options uri.append("&ptOptionsActive=1"); // enable public transport options
uri.append("&itOptionsActive=1"); // enable individual transport options uri.append("&itOptionsActive=1"); // enable individual transport options
uri.append("&changeSpeed=").append(WALKSPEED_MAP.get(walkSpeed)); 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, 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; InputStream is = null;
try 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 Context context = (Context) contextObj;
final String commandUri = context.context; final String commandUri = context.context;

10
enabler/src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -70,7 +70,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
private static final String DEFAULT_ENCODING = "ISO-8859-1"; private static final String DEFAULT_ENCODING = "ISO-8859-1";
private static final String PROD = "hafas"; private static final String PROD = "hafas";
private static final int NUM_CONNECTIONS = 6;
private final String apiUri; private final String apiUri;
private final int numProductBits; 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, 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); final ResultHeader header = new ResultHeader(SERVER_PRODUCT);
@ -795,7 +794,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
// number of connections backwards // number of connections backwards
request.append(" b=\"").append(0).append("\""); request.append(" b=\"").append(0).append("\"");
// number of connection forwards // number of connection forwards
request.append(" f=\"").append(NUM_CONNECTIONS).append("\""); request.append(" f=\"").append(numConnections).append("\"");
// percentual extension of change time // percentual extension of change time
request.append(" chExtension=\"").append(walkSpeed == WalkSpeed.SLOW ? 50 : 0).append("\""); request.append(" chExtension=\"").append(walkSpeed == WalkSpeed.SLOW ? 50 : 0).append("\"");
// TODO nrChanges: max number of changes // 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); 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 Context context = (Context) contextObj;
final StringBuilder request = new StringBuilder("<ConScrReq scrDir=\"").append(later ? 'F' : 'B').append("\" nrCons=\"") final StringBuilder request = new StringBuilder("<ConScrReq scrDir=\"").append(later ? 'F' : 'B').append("\" nrCons=\"")
.append(NUM_CONNECTIONS).append("\">"); .append(numConnections).append("\">");
request.append("<ConResCtxt>").append(later ? context.laterContext : context.earlierContext).append("</ConResCtxt>"); request.append("<ConResCtxt>").append(later ? context.laterContext : context.earlierContext).append("</ConResCtxt>");
request.append("</ConScrReq>"); request.append("</ConScrReq>");

5
enabler/src/de/schildbach/pte/BahnProvider.java
View file

@ -276,7 +276,7 @@ public final class BahnProvider extends AbstractHafasProvider
@Override @Override
public QueryConnectionsResult queryConnections(final Location from, final Location via, final Location to, final Date date, final boolean dep, 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 String uri = connectionsQueryUri(from, via, to, date, dep, products);
final CharSequence page = ParserUtils.scrape(uri); final CharSequence page = ParserUtils.scrape(uri);
@ -317,7 +317,8 @@ public final class BahnProvider extends AbstractHafasProvider
} }
@Override @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; final Context context = (Context) contextObj;

5
enabler/src/de/schildbach/pte/BvgProvider.java
View file

@ -572,7 +572,7 @@ public final class BvgProvider extends AbstractHafasProvider
@Override @Override
public QueryConnectionsResult queryConnections(final Location from, final Location via, final Location to, final Date date, final boolean dep, 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 String uri = connectionsQueryUri(from, via, to, date, dep, products);
final CharSequence page = ParserUtils.scrape(uri); final CharSequence page = ParserUtils.scrape(uri);
@ -627,7 +627,8 @@ public final class BvgProvider extends AbstractHafasProvider
} }
@Override @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; final Context context = (Context) contextObj;

14
enabler/src/de/schildbach/pte/NetworkProvider.java
View file

@ -31,8 +31,8 @@ import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.Style; 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 * @author Andreas Schildbach
*/ */
public interface NetworkProvider public interface NetworkProvider
@ -107,6 +107,8 @@ public interface NetworkProvider
* desired date for departing, mandatory * desired date for departing, mandatory
* @param dep * @param dep
* date is departure date? {@code true} for departure, {@code false} for arrival * date is departure date? {@code true} for departure, {@code false} for arrival
* @param numConnections
* number of connections to query
* @param products * @param products
* products to take into account * products to take into account
* @param walkSpeed * @param walkSpeed
@ -116,8 +118,8 @@ public interface NetworkProvider
* @return result object that can contain alternatives to clear up ambiguousnesses, or contains possible connections * @return result object that can contain alternatives to clear up ambiguousnesses, or contains possible connections
* @throws IOException * @throws IOException
*/ */
QueryConnectionsResult queryConnections(Location from, Location via, Location to, Date date, boolean dep, String products, WalkSpeed walkSpeed, QueryConnectionsResult queryConnections(Location from, Location via, Location to, Date date, boolean dep, int numConnections, String products,
Accessibility accessibility) throws IOException; WalkSpeed walkSpeed, Accessibility accessibility) throws IOException;
/** /**
* Query more connections (e.g. earlier or later) * Query more connections (e.g. earlier or later)
@ -126,10 +128,12 @@ public interface NetworkProvider
* context to query more connections from * context to query more connections from
* @param next * @param next
* {@code true} for get next connections, {@code false} for get previous connections * {@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 * @return result object that contains possible connections
* @throws IOException * @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 * Get details about a connection

4
enabler/src/de/schildbach/pte/VgnProvider.java
View file

@ -51,8 +51,8 @@ public class VgnProvider extends AbstractEfaProvider
@Override @Override
protected String xsltTripRequest2Uri(final Location from, final Location via, final Location to, final Date date, final boolean dep, 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";
} }
} }

20
enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
View file

@ -17,10 +17,17 @@
package de.schildbach.pte.live; package de.schildbach.pte.live;
import java.io.IOException;
import java.util.Date;
import java.util.List; 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.Location;
import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.NearbyStationsResult;
import de.schildbach.pte.dto.QueryConnectionsContext;
import de.schildbach.pte.dto.QueryConnectionsResult;
import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.dto.QueryDeparturesResult;
/** /**
@ -52,4 +59,17 @@ public abstract class AbstractProviderLiveTest
System.out.print(autocomplete.toDebugString() + " "); System.out.print(autocomplete.toDebugString() + " ");
System.out.println(); 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);
}
} }

4
enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java
View file

@ -82,10 +82,10 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java
View file

@ -81,11 +81,11 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 100, null, "Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

18
enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java
View file

@ -82,30 +82,30 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); 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) for (final Connection connection : result.connections)
provider.getConnectionDetails(connection.link); provider.getConnectionDetails(connection.link);
System.out.println(laterResult); System.out.println(laterResult);
final QueryConnectionsResult later2Result = provider.queryMoreConnections(laterResult.context, true); final QueryConnectionsResult later2Result = queryMoreConnections(provider, laterResult.context, true);
System.out.println(later2Result); System.out.println(later2Result);
final QueryConnectionsResult earlierResult = provider.queryMoreConnections(later2Result.context, false); final QueryConnectionsResult earlierResult = queryMoreConnections(provider, later2Result.context, false);
System.out.println(earlierResult); System.out.println(earlierResult);
final QueryConnectionsResult later3Result = provider.queryMoreConnections(earlierResult.context, true); final QueryConnectionsResult later3Result = queryMoreConnections(provider, earlierResult.context, true);
System.out.println(later3Result); System.out.println(later3Result);
} }
@Test @Test
public void slowConnection() throws Exception 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, new Location(LocationType.ANY, 0, null, "Tutzinger-Hof-Platz, Starnberg"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); 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) for (final Connection connection : result.connections)
provider.getConnectionDetails(connection.link); provider.getConnectionDetails(connection.link);
System.out.println(laterResult); System.out.println(laterResult);
@ -114,12 +114,12 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void connectionWithFootway() throws Exception 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"), "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); new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); 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) for (final Connection connection : result.connections)
provider.getConnectionDetails(connection.link); provider.getConnectionDetails(connection.link);
System.out.println(laterResult); System.out.println(laterResult);

22
enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java
View file

@ -81,18 +81,18 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 80000799, "München", "Pasing"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void longConnection() throws Exception 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, new Location(LocationType.STATION, 3001459, "Nürnberg", "Fallrohrstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
@ -102,42 +102,42 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void connectionBetweenCoordinates() throws Exception 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); new Location(LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionBetweenCoordinateAndStation() throws Exception 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); new Location(LocationType.ANY, 0, null, "Ostbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionBetweenAddresses() throws Exception 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, null, new Location(LocationType.ADDRESS, 0, null, "Starnberg, Jahnstraße 50"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionBetweenStationAndAddress() throws Exception 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, new Location(LocationType.ADDRESS, 0, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, ALL_PRODUCTS,
WalkSpeed.NORMAL, Accessibility.NEUTRAL); WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/BsagProviderLiveTest.java
View file

@ -81,11 +81,11 @@ public class BsagProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 28000512, null, "Herdentor"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java
View file

@ -72,11 +72,11 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 26000322, null, "Packhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java
View file

@ -81,10 +81,10 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 86, null, "Markthalle"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

34
enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
View file

@ -88,84 +88,84 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
final QueryConnectionsResult later2Result = provider.queryMoreConnections(laterResult.context, true); final QueryConnectionsResult later2Result = queryMoreConnections(provider, laterResult.context, true);
System.out.println(later2Result); System.out.println(later2Result);
final QueryConnectionsResult earlierResult = provider.queryMoreConnections(later2Result.context, false); final QueryConnectionsResult earlierResult = queryMoreConnections(provider, later2Result.context, false);
System.out.println(earlierResult); System.out.println(earlierResult);
final QueryConnectionsResult later3Result = provider.queryMoreConnections(earlierResult.context, true); final QueryConnectionsResult later3Result = queryMoreConnections(provider, earlierResult.context, true);
System.out.println(later3Result); System.out.println(later3Result);
} }
@Test @Test
public void shortViaConnection() throws Exception 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", new Location(LocationType.STATION, 9044202, "Berlin", "Bundesplatz"), new Location(LocationType.STATION, 9013103, "Berlin",
"Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionBetweenCoordinates() throws Exception 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, new Location(LocationType.ADDRESS, 0, 52513639, 13568648, null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionBetweenCoordinatesAndAddresses() throws Exception 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, "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); "Eisenacher Straße 70, 10823 Berlin, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void viaConnectionBetweenCoordinates() throws Exception 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, 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); null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionBetweenAddresses() throws Exception 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"), "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); new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void viaConnectionBetweenAddresses() throws Exception 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"), "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, new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

7
enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java
View file

@ -81,11 +81,10 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception public void shortConnection() throws Exception
{ {
final QueryConnectionsResult result = provider final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 9001011, null, "Justizgebäude"), null,
.queryConnections(new Location(LocationType.STATION, 9001011, null, "Justizgebäude"), null, new Location(LocationType.STATION, new Location(LocationType.STATION, 2504524, null, "Theater"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
2504524, null, "Theater"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java
View file

@ -73,11 +73,11 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 551922500, null, "Billund Airport"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java
View file

@ -64,11 +64,11 @@ public class DubProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, "Airport Terminal 1, Arrival"), null, new Location(LocationType.STATION, 3505445, null, "Airport Terminal 3"), new Date(), true,
ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

14
enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java
View file

@ -105,7 +105,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void incompleteConnection() throws Exception 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); LocationType.ANY, 0, null, "laat"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
} }
@ -113,33 +113,33 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 25001141, null, "Hannover Bismarckstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionBetweenAnyAndAddress() throws Exception 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"), "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); new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionBetweenAddresses() throws Exception 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, "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); "Lehmkuhlen 5, 25337 Elmshorn, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java
View file

@ -73,11 +73,11 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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(), "Ingolstadt, Hauptbahnhof Stadteinwärts"), null, new Location(LocationType.STATION, 181102, null, "Elisabethstraße"), new Date(),
true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java
View file

@ -81,11 +81,11 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 60461679, null, "Messe/Zeughaus"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java
View file

@ -81,11 +81,11 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void connectionBetweenAddresses() throws Exception 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, "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); "Durmersheimer Straße 6, 76185 Karlsruhe, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

12
enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java
View file

@ -96,7 +96,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void incompleteConnection() throws Exception 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); LocationType.ANY, 0, null, "gel"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
} }
@ -104,22 +104,22 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Linz Auwiesen"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
final QueryConnectionsResult earlierResult = provider.queryMoreConnections(laterResult.context, false); final QueryConnectionsResult earlierResult = queryMoreConnections(provider, laterResult.context, false);
System.out.println(earlierResult); System.out.println(earlierResult);
} }
@Test @Test
public void longConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Linz Hafen"), new Date(), true, ALL_PRODUCTS, WalkSpeed.SLOW, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
// final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); // final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
// System.out.println(laterResult); // System.out.println(laterResult);
} }
} }

8
enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java
View file

@ -73,22 +73,22 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 9440001, null, "Echternach, Gare"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void addressConnection() throws Exception 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(), "Luxembourg, Rue Génistre 2"), null, new Location(LocationType.STATION, 9217081, null, "Luxembourg, Gare Centrale"), new Date(),
true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/MariborProviderLiveTest.java
View file

@ -73,11 +73,11 @@ public class MariborProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 63201746, null, "Flughafen Graz Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java
View file

@ -73,10 +73,10 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java
View file

@ -81,11 +81,11 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 24064226, null, "Schützenhalle"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

24
enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java
View file

@ -81,19 +81,19 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); LocationType.ANY, 0, null, "Pasing"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
final QueryConnectionsResult earlierResult = provider.queryMoreConnections(laterResult.context, false); final QueryConnectionsResult earlierResult = queryMoreConnections(provider, laterResult.context, false);
System.out.println(earlierResult); System.out.println(earlierResult);
} }
@Test @Test
public void longConnection() throws Exception 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, new Location(LocationType.STATION, 0, null, "Ackermannstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
@ -103,42 +103,42 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void connectionBetweenCoordinates() throws Exception 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); new Location(LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionBetweenCoordinateAndStation() throws Exception 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); new Location(LocationType.ANY, 0, null, "Ostbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionBetweenAddresses() throws Exception 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, null, new Location(LocationType.ADDRESS, 0, null, "Starnberg, Jahnstraße 50"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionBetweenStationAndAddress() throws Exception 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, new Location(LocationType.ADDRESS, 0, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, ALL_PRODUCTS,
WalkSpeed.NORMAL, Accessibility.NEUTRAL); WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java
View file

@ -81,11 +81,11 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 3019500, null, "Amberg Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

8
enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java
View file

@ -65,22 +65,22 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void addressConnection() throws Exception 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"), "04319 Leipzig-Engelsdorf", "August-Bebel-Platz"), null, new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"),
new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/NphProviderLiveTest.java
View file

@ -81,11 +81,11 @@ public class NphProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 23007700, "Höxter", "Bahnhof / Rathaus"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java
View file

@ -73,10 +73,10 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); LocationType.STATION, 6642, null, "Bergen BGO"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java
View file

@ -73,7 +73,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); LocationType.STATION, 100066), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL);
System.out.println(result.status + " " + result.connections); System.out.println(result.status + " " + result.connections);
@ -82,7 +82,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void longConnection() throws Exception 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); LocationType.STATION, 103624), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL);
System.out.println(result.status + " " + result.connections); System.out.println(result.status + " " + result.connections);

4
enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java
View file

@ -81,11 +81,11 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 17009001, null, "Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java
View file

@ -73,11 +73,11 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 2200278, null, "Kassel Wilhelmshöher Weg"), new Date(), true, ALL_PRODUCTS,
WalkSpeed.NORMAL, Accessibility.NEUTRAL); WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

16
enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java
View file

@ -81,50 +81,50 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 1190100, null, "Wien"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
assertEquals(QueryConnectionsResult.Status.OK, result.status); assertEquals(QueryConnectionsResult.Status.OK, result.status);
assertTrue(result.connections.size() > 0); 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); System.out.println(laterResult);
} }
@Test @Test
public void slowConnection() throws Exception 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); LocationType.ANY, 0, null, "Azuga!"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
assertEquals(QueryConnectionsResult.Status.OK, result.status); assertEquals(QueryConnectionsResult.Status.OK, result.status);
assertTrue(result.connections.size() > 0); 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); System.out.println(laterResult);
} }
@Test @Test
public void connectionWithFootway() throws Exception 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, new Location(LocationType.ANY, 0, null, "Innsbruck, Gumppstraße 69!"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
assertEquals(QueryConnectionsResult.Status.OK, result.status); assertEquals(QueryConnectionsResult.Status.OK, result.status);
assertTrue(result.connections.size() > 0); 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); System.out.println(laterResult);
} }
@Test @Test
public void connectionWithFootway2() throws Exception 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, null, new Location(LocationType.ADDRESS, 0, null, "Wien, Meidlinger Hauptstraße 1!"), new Date(), true, ALL_PRODUCTS,
WalkSpeed.NORMAL, Accessibility.NEUTRAL); WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
assertEquals(QueryConnectionsResult.Status.OK, result.status); assertEquals(QueryConnectionsResult.Status.OK, result.status);
assertTrue(result.connections.size() > 0); 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); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java
View file

@ -73,11 +73,11 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 5196003, null, "WARSZAWA"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

6
enabler/test/de/schildbach/pte/live/RmvProviderLiveTest.java
View file

@ -73,18 +73,18 @@ public class RmvProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 3000912, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void shortConnectionByName() throws Exception 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, null, new Location(LocationType.ANY, 0, null, "Frankfurt Hauptbahnhof!"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);

23
enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java
View file

@ -81,55 +81,54 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void slowConnection() throws Exception public void slowConnection() throws Exception
{ {
final QueryConnectionsResult result = provider final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null,
.queryConnections(new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, new Location(LocationType.ANY, 0, null, new Location(LocationType.ANY, 0, null, "Laconnex, Mollach"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
"Laconnex, Mollach"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionWithFootway() throws Exception 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, new Location(LocationType.ADDRESS, 0, null, "Einsiedeln, Erlenmoosweg 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionFromAddress() throws Exception 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, "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); 6967206, null, "COLOGNE"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void viaConnection() throws Exception 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, 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); "Düsseldorf Hbf"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

19
enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java
View file

@ -81,44 +81,43 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void slowConnection() throws Exception public void slowConnection() throws Exception
{ {
final QueryConnectionsResult result = provider final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null,
.queryConnections(new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, new Location(LocationType.ANY, 0, null, new Location(LocationType.ANY, 0, null, "Laconnex, Mollach"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
"Laconnex, Mollach"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionWithFootway() throws Exception 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, new Location(LocationType.ADDRESS, 0, null, "Einsiedeln, Erlenmoosweg 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionFromAddress() throws Exception 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, "Dorfstrasse 10, Dällikon, Schweiz"), null, new Location(LocationType.STATION, 8500010, null, "Basel"), new Date(), true,
ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java
View file

@ -73,11 +73,11 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 7498000, null, "STOCKHOLM"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

8
enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java
View file

@ -73,22 +73,22 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 1015755, null, "Harbison Av + Unruh Av"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void addressConnection() throws Exception 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, "Philadelphia 19127", "3601 Main St"), null, new Location(LocationType.STATION, 2090227, null, "Main Street"), new Date(), true,
ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java
View file

@ -73,10 +73,10 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java
View file

@ -73,11 +73,11 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 715210, null, "Flughafen, Lübeck"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

12
enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java
View file

@ -81,13 +81,13 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 8813003, "Brussel", "Centraal"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL);
System.out.println(result.status + " " + result.connections); System.out.println(result.status + " " + result.connections);
if (result.context != null) 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); System.out.println(laterResult.status + " " + laterResult.connections);
} }
} }
@ -95,13 +95,13 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void longConnection() throws Exception 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); new Location(LocationType.STATION, 207272, "Brussel", "Stadion"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL);
System.out.println(result.status + " " + result.connections); System.out.println(result.status + " " + result.connections);
if (result.context != null) 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); System.out.println(laterResult.status + " " + laterResult.connections);
} }
} }
@ -109,14 +109,14 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void connectionFromAddress() throws Exception 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, "Bruxelles - Haren, Rue Paul Janson 9"), null, new Location(LocationType.STATION, 8500010, null, "Basel"), new Date(), true,
ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result.status + " " + result.connections); System.out.println(result.status + " " + result.connections);
if (result.context != null) 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); System.out.println(laterResult.status + " " + laterResult.connections);
} }
} }

4
enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java
View file

@ -73,11 +73,11 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 200101221, "Stockholm", "Abrahamsberg"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java
View file

@ -81,10 +81,10 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java
View file

@ -73,10 +73,10 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java
View file

@ -73,11 +73,11 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 0, "Sydney", "Capitol Square"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

6
enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java
View file

@ -73,18 +73,18 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void postcodeConnection() throws Exception 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, LocationType.STATION, 1016019, 51655903, -397249, null, "Watford (Herts), Watford Town Centre"), new Date(), true, ALL_PRODUCTS,
WalkSpeed.NORMAL, Accessibility.NEUTRAL); WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);

4
enabler/test/de/schildbach/pte/live/TleaProviderLiveTest.java
View file

@ -73,11 +73,11 @@ public class TleaProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java
View file

@ -73,11 +73,11 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/TlseProviderLiveTest.java
View file

@ -73,11 +73,11 @@ public class TlseProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java
View file

@ -73,10 +73,10 @@ public class TlswProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); LocationType.STATION, 0, null, "70003025"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java
View file

@ -73,10 +73,10 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

26
enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
View file

@ -73,69 +73,69 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, null, new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
final QueryConnectionsResult earlierResult = provider.queryMoreConnections(laterResult.context, false); final QueryConnectionsResult earlierResult = queryMoreConnections(provider, laterResult.context, false);
System.out.println(earlierResult); System.out.println(earlierResult);
} }
@Test @Test
public void shortViaConnection() throws Exception 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", new Location(LocationType.STATION, 9044202, "Berlin", "Bundesplatz"), new Location(LocationType.STATION, 9013103, "Berlin",
"Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionBetweenCoordinates() throws Exception 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, new Location(LocationType.ADDRESS, 0, 52513639, 13568648, null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void viaConnectionBetweenCoordinates() throws Exception 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, 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); null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionBetweenAddresses() throws Exception 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"), "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); new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void viaConnectionBetweenAddresses() throws Exception 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"), "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, new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java
View file

@ -81,10 +81,10 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

6
enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java
View file

@ -75,19 +75,19 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 625398, null, "Bremerhaven"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
assertEquals(QueryConnectionsResult.Status.OK, result.status); assertEquals(QueryConnectionsResult.Status.OK, result.status);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test @Test
public void connectionDateOutsideTimetablePeriod() throws Exception 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, new Location(LocationType.STATION, 625398, null, "Bremerhaven"), new Date(1155822689759l), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
assertEquals(QueryConnectionsResult.Status.INVALID_DATE, result.status); assertEquals(QueryConnectionsResult.Status.INVALID_DATE, result.status);

4
enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java
View file

@ -81,11 +81,11 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 510, "Nürnberg", "Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java
View file

@ -73,10 +73,10 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java
View file

@ -81,10 +81,10 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java
View file

@ -73,10 +73,10 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java
View file

@ -73,10 +73,10 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java
View file

@ -81,10 +81,10 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java
View file

@ -105,10 +105,10 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java
View file

@ -97,11 +97,11 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 20009161, "Essen", "Bismarckplatz"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java
View file

@ -73,11 +73,11 @@ public class VrtProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 17009001, null, "Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java
View file

@ -81,10 +81,10 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java
View file

@ -73,10 +73,10 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java
View file

@ -81,10 +81,10 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java
View file

@ -81,10 +81,10 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java
View file

@ -81,10 +81,10 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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); new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }

4
enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java
View file

@ -73,11 +73,11 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception 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, new Location(LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
System.out.println(result); System.out.println(result);
final QueryConnectionsResult laterResult = provider.queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
} }