From dd54582eade4b3acbb07c9b657f6c40e0c63acd8 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Fri, 7 Oct 2011 19:11:24 +0000 Subject: [PATCH] accessibility for connections query git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@818 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- .../schildbach/pte/AbstractEfaProvider.java | 11 +++++++--- .../schildbach/pte/AbstractHafasProvider.java | 2 +- src/de/schildbach/pte/BahnProvider.java | 2 +- src/de/schildbach/pte/BvgProvider.java | 2 +- src/de/schildbach/pte/NetworkProvider.java | 15 +++++++++----- .../pte/live/AtcProviderLiveTest.java | 3 ++- .../pte/live/AvvProviderLiveTest.java | 4 +++- .../pte/live/BahnProviderLiveTest.java | 9 ++++++--- .../pte/live/BayernProviderLiveTest.java | 20 +++++++++++-------- .../pte/live/BsagProviderLiveTest.java | 8 ++++---- .../pte/live/BsvagProviderLiveTest.java | 4 +++- .../pte/live/BvbProviderLiveTest.java | 6 +++--- .../pte/live/BvgProviderLiveTest.java | 18 ++++++++++------- .../pte/live/DingProviderLiveTest.java | 6 ++++-- .../pte/live/DsbProviderLiveTest.java | 4 +++- .../pte/live/DubProviderLiveTest.java | 3 ++- .../pte/live/GvhProviderLiveTest.java | 10 ++++++---- .../pte/live/InvgProviderLiveTest.java | 3 ++- .../pte/live/IvbProviderLiveTest.java | 4 +++- .../pte/live/KvvProviderLiveTest.java | 3 ++- .../pte/live/LinzProviderLiveTest.java | 10 +++++----- .../pte/live/LuProviderLiveTest.java | 6 ++++-- .../pte/live/MariborProviderLiveTest.java | 4 +++- .../pte/live/MetProviderLiveTest.java | 7 ++++--- .../pte/live/MvgProviderLiveTest.java | 4 +++- .../pte/live/MvvProviderLiveTest.java | 15 ++++++++------ .../pte/live/NaldoProviderLiveTest.java | 6 ++++-- .../pte/live/NasaProviderLiveTest.java | 6 ++++-- .../pte/live/NphProviderLiveTest.java | 4 +++- .../pte/live/NriProviderLiveTest.java | 5 +++-- .../pte/live/NsProviderLiveTest.java | 5 +++-- .../pte/live/NvbwProviderLiveTest.java | 4 +++- .../pte/live/NvvProviderLiveTest.java | 7 ++++--- .../pte/live/OebbProviderLiveTest.java | 14 +++++++------ .../pte/live/PlProviderLiveTest.java | 4 +++- .../pte/live/RmvProviderLiveTest.java | 11 ++++++---- .../pte/live/RtProviderLiveTest.java | 14 ++++++++----- .../pte/live/SbbProviderLiveTest.java | 14 ++++++++----- .../pte/live/SeProviderLiveTest.java | 6 ++++-- .../pte/live/SeptaProviderLiveTest.java | 6 ++++-- .../pte/live/SfProviderLiveTest.java | 5 +++-- .../pte/live/ShProviderLiveTest.java | 4 +++- .../pte/live/SncbProviderLiveTest.java | 7 ++++--- .../pte/live/StockholmProviderLiveTest.java | 8 +++++--- .../pte/live/StvProviderLiveTest.java | 5 +++-- .../pte/live/SvvProviderLiveTest.java | 5 +++-- .../pte/live/SydneyProviderLiveTest.java | 8 +++++--- .../pte/live/TflProviderLiveTest.java | 8 +++++--- .../pte/live/TleaProviderLiveTest.java | 6 ++++-- .../pte/live/TlemProviderLiveTest.java | 6 ++++-- .../pte/live/TlseProviderLiveTest.java | 6 ++++-- .../pte/live/TlswProviderLiveTest.java | 5 +++-- .../pte/live/VagfrProviderLiveTest.java | 7 ++++--- .../pte/live/VbbProviderLiveTest.java | 16 +++++++++------ .../pte/live/VblProviderLiveTest.java | 5 +++-- .../pte/live/VbnProviderLiveTest.java | 7 +++++-- .../pte/live/VgsProviderLiveTest.java | 5 +++-- .../pte/live/VmobilProviderLiveTest.java | 3 ++- .../pte/live/VmsProviderLiveTest.java | 5 +++-- .../pte/live/VmvProviderLiveTest.java | 7 ++++--- .../pte/live/VorProviderLiveTest.java | 5 +++-- .../pte/live/VrnProviderLiveTest.java | 5 +++-- .../pte/live/VrrProviderLiveTest.java | 7 ++++--- .../pte/live/VrtProviderLiveTest.java | 6 ++++-- .../pte/live/VvmProviderLiveTest.java | 3 ++- .../pte/live/VvoProviderLiveTest.java | 7 ++++--- .../pte/live/VvsProviderLiveTest.java | 5 +++-- .../pte/live/VvtProviderLiveTest.java | 7 ++++--- .../pte/live/ZvvProviderLiveTest.java | 4 +++- 69 files changed, 293 insertions(+), 173 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index 0f7ad6a0..3b484d7b 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1459,7 +1459,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider } private String xsltTripRequest2Uri(final Location from, final Location via, final Location to, final Date date, final boolean dep, - final String products, final WalkSpeed walkSpeed) + final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) { final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMdd"); final DateFormat TIME_FORMAT = new SimpleDateFormat("HHmm"); @@ -1486,6 +1486,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider uri.append("&ptOptionsActive=1"); uri.append("&changeSpeed=").append(WALKSPEED_MAP.get(walkSpeed)); + if (accessibility == Accessibility.BARRIER_FREE) + uri.append("&imparedOptionsActive=1").append("&wheelchair=on").append("&noSolidStairs=on"); + else if (accessibility == Accessibility.LIMITED) + uri.append("&imparedOptionsActive=1").append("&wheelchair=on").append("&lowPlatformVhcl=on").append("&noSolidStairs=on"); + if (products != null) { uri.append("&includedMeans=checkbox"); @@ -1556,9 +1561,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider } public QueryConnectionsResult queryConnections(final Location from, final Location via, final Location to, final Date date, final boolean dep, - final String products, final WalkSpeed walkSpeed) throws IOException + final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException { - final String uri = xsltTripRequest2Uri(from, via, to, date, dep, products, walkSpeed); + final String uri = xsltTripRequest2Uri(from, via, to, date, dep, products, walkSpeed, accessibility); InputStream is = null; try diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java index a968598e..309609fd 100644 --- a/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/src/de/schildbach/pte/AbstractHafasProvider.java @@ -626,7 +626,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider } public QueryConnectionsResult queryConnections(Location from, Location via, Location to, final Date date, final boolean dep, - final String products, final WalkSpeed walkSpeed) throws IOException + final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException { final ResultHeader header = new ResultHeader(SERVER_PRODUCT); diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index a1344336..5341cf51 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -256,7 +256,7 @@ public final class BahnProvider extends AbstractHafasProvider @Override public QueryConnectionsResult queryConnections(final Location from, final Location via, final Location to, final Date date, final boolean dep, - final String products, final WalkSpeed walkSpeed) throws IOException + final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException { final String uri = connectionsQueryUri(from, via, to, date, dep, products); final CharSequence page = ParserUtils.scrape(uri); diff --git a/src/de/schildbach/pte/BvgProvider.java b/src/de/schildbach/pte/BvgProvider.java index 80b39704..167e4c7a 100644 --- a/src/de/schildbach/pte/BvgProvider.java +++ b/src/de/schildbach/pte/BvgProvider.java @@ -548,7 +548,7 @@ public final class BvgProvider extends AbstractHafasProvider @Override public QueryConnectionsResult queryConnections(final Location from, final Location via, final Location to, final Date date, final boolean dep, - final String products, final WalkSpeed walkSpeed) throws IOException + final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException { final String uri = connectionsQueryUri(from, via, to, date, dep, products); final CharSequence page = ParserUtils.scrape(uri); diff --git a/src/de/schildbach/pte/NetworkProvider.java b/src/de/schildbach/pte/NetworkProvider.java index 9f261583..186ef48a 100644 --- a/src/de/schildbach/pte/NetworkProvider.java +++ b/src/de/schildbach/pte/NetworkProvider.java @@ -45,6 +45,11 @@ public interface NetworkProvider SLOW, NORMAL, FAST } + public enum Accessibility + { + NEUTRAL, LIMITED, BARRIER_FREE + } + NetworkId id(); boolean hasCapabilities(Capability... capabilities); @@ -101,16 +106,16 @@ public interface NetworkProvider * @param dep * date is departure date? {@code true} for departure, {@code false} for arrival * @param products - * TODO + * products to take into account * @param walkSpeed * how fast can you walk? - * @param products - * products to take into account + * @param accessibility + * how accessible do you need the route to be? * @return result object that can contain alternatives to clear up ambiguousnesses, or contains possible connections * @throws IOException */ - QueryConnectionsResult queryConnections(Location from, Location via, Location to, Date date, boolean dep, String products, WalkSpeed walkSpeed) - throws IOException; + QueryConnectionsResult queryConnections(Location from, Location via, Location to, Date date, boolean dep, String products, WalkSpeed walkSpeed, + Accessibility accessibility) throws IOException; /** * Query more connections (e.g. earlier or later) diff --git a/test/de/schildbach/pte/live/AtcProviderLiveTest.java b/test/de/schildbach/pte/live/AtcProviderLiveTest.java index f37fb9e7..7b853db7 100644 --- a/test/de/schildbach/pte/live/AtcProviderLiveTest.java +++ b/test/de/schildbach/pte/live/AtcProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.AtcProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -91,7 +92,7 @@ public class AtcProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/AvvProviderLiveTest.java b/test/de/schildbach/pte/live/AvvProviderLiveTest.java index b32bdc3c..f49109b0 100644 --- a/test/de/schildbach/pte/live/AvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/AvvProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.AvvProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -90,7 +91,8 @@ public class AvvProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/BahnProviderLiveTest.java b/test/de/schildbach/pte/live/BahnProviderLiveTest.java index bf075a6c..d3c34ee6 100644 --- a/test/de/schildbach/pte/live/BahnProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BahnProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.BahnProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Connection; import de.schildbach.pte.dto.Location; @@ -91,7 +92,8 @@ public class BahnProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); for (final Connection connection : result.connections) @@ -103,7 +105,8 @@ public class BahnProviderLiveTest public void slowConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); for (final Connection connection : result.connections) @@ -116,7 +119,7 @@ public class BahnProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, "Berlin - Mitte, Unter den Linden 24"), null, new Location(LocationType.ADDRESS, 0, null, "Starnberg, Possenhofener Straße 13"), - new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); diff --git a/test/de/schildbach/pte/live/BayernProviderLiveTest.java b/test/de/schildbach/pte/live/BayernProviderLiveTest.java index 784a2eb6..848218ab 100644 --- a/test/de/schildbach/pte/live/BayernProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BayernProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.BayernProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -69,7 +70,7 @@ public class BayernProviderLiveTest list(autocompletes); } - + @Test public void autocompleteWithUmlaut() throws Exception { @@ -89,8 +90,9 @@ public class BayernProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 80000793, "München", "Ostbahnhof"), null, new Location( - LocationType.STATION, 80000799, "München", "Pasing"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 80000793, "München", "Ostbahnhof"), null, + new Location(LocationType.STATION, 80000799, "München", "Pasing"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -100,7 +102,8 @@ public class BayernProviderLiveTest public void longConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); // seems like there are no more connections all the time } @@ -109,7 +112,7 @@ public class BayernProviderLiveTest public void connectionBetweenCoordinates() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 48165238, 11577473), null, - new Location(LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -119,7 +122,7 @@ public class BayernProviderLiveTest public void connectionBetweenCoordinateAndStation() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 48238341, 11478230), null, - new Location(LocationType.ANY, 0, null, "Ostbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.ANY, 0, null, "Ostbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -129,7 +132,8 @@ public class BayernProviderLiveTest public void connectionBetweenAddresses() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -140,7 +144,7 @@ public class BayernProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 1220, null, "Josephsburg"), null, new Location(LocationType.ADDRESS, 0, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, ALL_PRODUCTS, - WalkSpeed.NORMAL); + WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/BsagProviderLiveTest.java b/test/de/schildbach/pte/live/BsagProviderLiveTest.java index ba34adc8..cb29987d 100644 --- a/test/de/schildbach/pte/live/BsagProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BsagProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.BsagProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -60,7 +61,7 @@ public class BsagProviderLiveTest list(autocompletes); } - + @Test public void autocompleteWithUmlaut() throws Exception { @@ -69,8 +70,6 @@ public class BsagProviderLiveTest list(autocompletes); } - - private void list(final List autocompletes) { System.out.print(autocompletes.size() + " "); @@ -83,7 +82,8 @@ public class BsagProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/BsvagProviderLiveTest.java b/test/de/schildbach/pte/live/BsvagProviderLiveTest.java index d321d95c..d8218b96 100644 --- a/test/de/schildbach/pte/live/BsvagProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BsvagProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.BsvagProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -81,7 +82,8 @@ public class BsvagProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/BvbProviderLiveTest.java b/test/de/schildbach/pte/live/BvbProviderLiveTest.java index 58c1e62c..4130ce73 100644 --- a/test/de/schildbach/pte/live/BvbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BvbProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.BvbProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -69,7 +70,7 @@ public class BvbProviderLiveTest list(autocompletes); } - + @Test public void autocompleteWithUmlaut() throws Exception { @@ -78,7 +79,6 @@ public class BvbProviderLiveTest list(autocompletes); } - private void list(final List autocompletes) { System.out.print(autocompletes.size() + " "); @@ -91,7 +91,7 @@ public class BvbProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 10000, null, "Bahnhof"), null, - new Location(LocationType.STATION, 86, null, "Markthalle"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 86, null, "Markthalle"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/test/de/schildbach/pte/live/BvgProviderLiveTest.java index aa53b7cf..56184d51 100644 --- a/test/de/schildbach/pte/live/BvgProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BvgProviderLiveTest.java @@ -25,6 +25,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.BvgProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -97,7 +98,8 @@ public class BvgProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -108,7 +110,7 @@ public class BvgProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), new Location(LocationType.STATION, 9044202, "Berlin", "Bundesplatz"), new Location(LocationType.STATION, 9013103, "Berlin", - "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -118,7 +120,8 @@ public class BvgProviderLiveTest public void connectionBetweenCoordinates() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -129,7 +132,7 @@ public class BvgProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 52536099, 13426309, null, "Christburger Straße 1, 10405 Berlin, Deutschland"), null, new Location(LocationType.ADDRESS, 0, 52486400, 13350744, null, - "Eisenacher Straße 70, 10823 Berlin, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + "Eisenacher Straße 70, 10823 Berlin, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -140,7 +143,7 @@ public class BvgProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), new Location(LocationType.ADDRESS, 0, 52479868, 13324247, null, null), new Location(LocationType.ADDRESS, 0, 52513639, 13568648, - null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -151,7 +154,7 @@ public class BvgProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, "10715 Bln Charlb.-Wilm., Weimarische Str. 7"), null, new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), - new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -162,7 +165,8 @@ public class BvgProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, "10715 Bln Charlb.-Wilm., Weimarische Str. 7"), new Location(LocationType.ADDRESS, 0, null, "10115 Bln Mitte, Hannoversche Str. 20"), - new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/DingProviderLiveTest.java b/test/de/schildbach/pte/live/DingProviderLiveTest.java index 4ce2140e..a6dfa54e 100644 --- a/test/de/schildbach/pte/live/DingProviderLiveTest.java +++ b/test/de/schildbach/pte/live/DingProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.DingProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -81,8 +82,9 @@ public class DingProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 9001011, null, "Justizgebäude"), null, - new Location(LocationType.STATION, 2504524, null, "Theater"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + final QueryConnectionsResult result = provider + .queryConnections(new Location(LocationType.STATION, 9001011, null, "Justizgebäude"), null, new Location(LocationType.STATION, + 2504524, null, "Theater"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/DsbProviderLiveTest.java b/test/de/schildbach/pte/live/DsbProviderLiveTest.java index 3224d0f9..07117669 100644 --- a/test/de/schildbach/pte/live/DsbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/DsbProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.DsbProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -82,7 +83,8 @@ public class DsbProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/DubProviderLiveTest.java b/test/de/schildbach/pte/live/DubProviderLiveTest.java index 7ab53aeb..50f39278 100644 --- a/test/de/schildbach/pte/live/DubProviderLiveTest.java +++ b/test/de/schildbach/pte/live/DubProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.DubProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -74,7 +75,7 @@ public class DubProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 3505565, null, "Airport Terminal 1, Arrival"), null, new Location(LocationType.STATION, 3505445, null, "Airport Terminal 3"), new Date(), true, - ALL_PRODUCTS, WalkSpeed.NORMAL); + ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/GvhProviderLiveTest.java b/test/de/schildbach/pte/live/GvhProviderLiveTest.java index d37871f0..d79f1851 100644 --- a/test/de/schildbach/pte/live/GvhProviderLiveTest.java +++ b/test/de/schildbach/pte/live/GvhProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.GvhProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -114,7 +115,7 @@ public class GvhProviderLiveTest public void incompleteConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "hann"), null, new Location( - LocationType.ANY, 0, null, "laat"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST); + LocationType.ANY, 0, null, "laat"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result); } @@ -122,7 +123,8 @@ public class GvhProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -133,7 +135,7 @@ public class GvhProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, 53069619, 8799202, null, "bremen, neustadtswall 12"), null, new Location(LocationType.ADDRESS, 0, 53104124, 8788575, null, "Bremen Glücksburger Straße 37"), - new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -144,7 +146,7 @@ public class GvhProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 53622859, 10133545, null, "Zamenhofweg 14, 22159 Hamburg, Deutschland"), null, new Location(LocationType.ADDRESS, 0, 53734260, 9674990, null, - "Lehmkuhlen 5, 25337 Elmshorn, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + "Lehmkuhlen 5, 25337 Elmshorn, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/InvgProviderLiveTest.java b/test/de/schildbach/pte/live/InvgProviderLiveTest.java index 61610b6e..7627d3f0 100644 --- a/test/de/schildbach/pte/live/InvgProviderLiveTest.java +++ b/test/de/schildbach/pte/live/InvgProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.InvgProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -83,7 +84,7 @@ public class InvgProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 80302, null, "Ingolstadt, Hauptbahnhof Stadteinwärts"), null, new Location(LocationType.STATION, 181102, null, "Elisabethstraße"), new Date(), - true, ALL_PRODUCTS, WalkSpeed.NORMAL); + true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/IvbProviderLiveTest.java b/test/de/schildbach/pte/live/IvbProviderLiveTest.java index 6d03a28b..664ed372 100644 --- a/test/de/schildbach/pte/live/IvbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/IvbProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.IvbProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -82,7 +83,8 @@ public class IvbProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/KvvProviderLiveTest.java b/test/de/schildbach/pte/live/KvvProviderLiveTest.java index 639b2f81..0bbd746a 100644 --- a/test/de/schildbach/pte/live/KvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/KvvProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.KvvProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -91,7 +92,7 @@ public class KvvProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 48985089, 8402709, null, "Konstanzer Straße 17, 76199 Karlsruhe, Deutschland"), null, new Location(LocationType.ADDRESS, 0, 49007706, 8356358, null, - "Durmersheimer Straße 6, 76185 Karlsruhe, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + "Durmersheimer Straße 6, 76185 Karlsruhe, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/LinzProviderLiveTest.java b/test/de/schildbach/pte/live/LinzProviderLiveTest.java index 8d9270b3..09dff717 100644 --- a/test/de/schildbach/pte/live/LinzProviderLiveTest.java +++ b/test/de/schildbach/pte/live/LinzProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.LinzProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -68,8 +69,7 @@ public class LinzProviderLiveTest list(autocompletes); } - - + @Test public void autocompleteWithUmlaut() throws Exception { @@ -106,7 +106,7 @@ public class LinzProviderLiveTest public void incompleteConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "linz"), null, new Location( - LocationType.ANY, 0, null, "gel"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST); + LocationType.ANY, 0, null, "gel"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result); } @@ -114,7 +114,7 @@ public class LinzProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Linz Hauptbahnhof"), null, - new Location(LocationType.STATION, 0, null, "Linz Auwiesen"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST); + new Location(LocationType.STATION, 0, null, "Linz Auwiesen"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -124,7 +124,7 @@ public class LinzProviderLiveTest public void longConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Linz Auwiesen"), null, - new Location(LocationType.STATION, 0, null, "Linz Hafen"), new Date(), true, ALL_PRODUCTS, WalkSpeed.SLOW); + new Location(LocationType.STATION, 0, null, "Linz Hafen"), new Date(), true, ALL_PRODUCTS, WalkSpeed.SLOW, Accessibility.NEUTRAL); System.out.println(result); // final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); // System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/LuProviderLiveTest.java b/test/de/schildbach/pte/live/LuProviderLiveTest.java index d22563aa..a58d2726 100644 --- a/test/de/schildbach/pte/live/LuProviderLiveTest.java +++ b/test/de/schildbach/pte/live/LuProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.LuProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -82,7 +83,8 @@ public class LuProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -93,7 +95,7 @@ public class LuProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 49611610, 6130265, null, "Luxembourg, Rue Génistre 2"), null, new Location(LocationType.STATION, 9217081, null, "Luxembourg, Gare Centrale"), new Date(), - true, ALL_PRODUCTS, WalkSpeed.NORMAL); + true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/MariborProviderLiveTest.java b/test/de/schildbach/pte/live/MariborProviderLiveTest.java index e1006136..8b8a8573 100644 --- a/test/de/schildbach/pte/live/MariborProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MariborProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.MariborProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -82,7 +83,8 @@ public class MariborProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/MetProviderLiveTest.java b/test/de/schildbach/pte/live/MetProviderLiveTest.java index c302d7d3..d893bc42 100644 --- a/test/de/schildbach/pte/live/MetProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MetProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.MetProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -77,12 +78,12 @@ public class MetProviderLiveTest System.out.print(autocomplete.toDebugString() + " "); System.out.println(); } - + @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), - null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/MvgProviderLiveTest.java b/test/de/schildbach/pte/live/MvgProviderLiveTest.java index 3e0afacc..5c665605 100644 --- a/test/de/schildbach/pte/live/MvgProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MvgProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.MvgProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -90,7 +91,8 @@ public class MvgProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/test/de/schildbach/pte/live/MvvProviderLiveTest.java index 2e73c66e..bb045723 100644 --- a/test/de/schildbach/pte/live/MvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MvvProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.MvvProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -90,7 +91,7 @@ public class MvvProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Marienplatz"), null, new Location( - LocationType.ANY, 0, null, "Pasing"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + LocationType.ANY, 0, null, "Pasing"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -100,7 +101,8 @@ public class MvvProviderLiveTest public void longConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); // seems like there are no more connections all the time } @@ -109,7 +111,7 @@ public class MvvProviderLiveTest public void connectionBetweenCoordinates() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 48165238, 11577473), null, - new Location(LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -119,7 +121,7 @@ public class MvvProviderLiveTest public void connectionBetweenCoordinateAndStation() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 48238341, 11478230), null, - new Location(LocationType.ANY, 0, null, "Ostbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.ANY, 0, null, "Ostbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -129,7 +131,8 @@ public class MvvProviderLiveTest public void connectionBetweenAddresses() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -140,7 +143,7 @@ public class MvvProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 1220, null, "Josephsburg"), null, new Location(LocationType.ADDRESS, 0, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, ALL_PRODUCTS, - WalkSpeed.NORMAL); + WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/NaldoProviderLiveTest.java b/test/de/schildbach/pte/live/NaldoProviderLiveTest.java index 090d30d6..6d175e40 100644 --- a/test/de/schildbach/pte/live/NaldoProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NaldoProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.NaldoProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -69,7 +70,7 @@ public class NaldoProviderLiveTest list(autocompletes); } - + @Test public void autocompleteWithUmlaut() throws Exception { @@ -90,7 +91,8 @@ public class NaldoProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/NasaProviderLiveTest.java b/test/de/schildbach/pte/live/NasaProviderLiveTest.java index a896b2b9..89dc1321 100644 --- a/test/de/schildbach/pte/live/NasaProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NasaProviderLiveTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Test; import de.schildbach.pte.NasaProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -74,7 +75,8 @@ public class NasaProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -85,7 +87,7 @@ public class NasaProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 51334078, 12478331, "04319 Leipzig-Engelsdorf", "August-Bebel-Platz"), null, new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"), - new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/NphProviderLiveTest.java b/test/de/schildbach/pte/live/NphProviderLiveTest.java index 76c7d252..2bd6816d 100644 --- a/test/de/schildbach/pte/live/NphProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NphProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.NphProvider; import de.schildbach.pte.dto.Location; @@ -82,7 +83,8 @@ public class NphProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/NriProviderLiveTest.java b/test/de/schildbach/pte/live/NriProviderLiveTest.java index b27636ef..ab1cdefc 100644 --- a/test/de/schildbach/pte/live/NriProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NriProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.NriProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.NriProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -82,7 +83,7 @@ public class NriProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 8059, null, "Oslo"), null, new Location( - LocationType.STATION, 6642, null, "Bergen BGO"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + LocationType.STATION, 6642, null, "Bergen BGO"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/NsProviderLiveTest.java b/test/de/schildbach/pte/live/NsProviderLiveTest.java index 4929d8b7..d139511f 100644 --- a/test/de/schildbach/pte/live/NsProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NsProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.NsProvider; import de.schildbach.pte.dto.Location; @@ -81,7 +82,7 @@ public class NsProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 100024), null, new Location( - LocationType.STATION, 100066), new Date(), true, null, WalkSpeed.FAST); + LocationType.STATION, 100066), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); } @@ -90,7 +91,7 @@ public class NsProviderLiveTest public void longConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 100024), null, new Location( - LocationType.STATION, 103624), new Date(), true, null, WalkSpeed.FAST); + LocationType.STATION, 103624), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); } diff --git a/test/de/schildbach/pte/live/NvbwProviderLiveTest.java b/test/de/schildbach/pte/live/NvbwProviderLiveTest.java index 436eb6ce..4ac7cad8 100644 --- a/test/de/schildbach/pte/live/NvbwProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NvbwProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.NvbwProvider; import de.schildbach.pte.dto.Location; @@ -90,7 +91,8 @@ public class NvbwProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/NvvProviderLiveTest.java b/test/de/schildbach/pte/live/NvvProviderLiveTest.java index 2505a781..239eee3d 100644 --- a/test/de/schildbach/pte/live/NvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NvvProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.NvvProvider; import de.schildbach.pte.dto.Location; @@ -81,9 +82,9 @@ public class NvvProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider - .queryConnections(new Location(LocationType.STATION, 2200007, null, "Kassel Wilhelmshöhe"), null, new Location(LocationType.STATION, - 2200278, null, "Kassel Wilhelmshöher Weg"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 2200007, null, "Kassel Wilhelmshöhe"), + null, new Location(LocationType.STATION, 2200278, null, "Kassel Wilhelmshöher Weg"), new Date(), true, ALL_PRODUCTS, + WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/OebbProviderLiveTest.java b/test/de/schildbach/pte/live/OebbProviderLiveTest.java index 65a77c3d..dede8459 100644 --- a/test/de/schildbach/pte/live/OebbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/OebbProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.OebbProvider; import de.schildbach.pte.dto.Location; @@ -82,7 +83,7 @@ public class OebbProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 1140101, null, "Linz"), null, - new Location(LocationType.STATION, 1190100, null, "Wien"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 1190100, null, "Wien"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -92,7 +93,7 @@ public class OebbProviderLiveTest public void slowConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Ramsen, Zoll"), null, new Location( - LocationType.ANY, 0, null, "Azuga"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + LocationType.ANY, 0, null, "Azuga"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -102,7 +103,8 @@ public class OebbProviderLiveTest public void connectionWithFootway() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Graz, Haselweg"), null, - new Location(LocationType.ADDRESS, 0, null, "Innsbruck, Gumppstraße 69"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.ADDRESS, 0, null, "Innsbruck, Gumppstraße 69"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -111,9 +113,9 @@ public class OebbProviderLiveTest @Test public void connectionWithFootway2() throws Exception { - final QueryConnectionsResult result = provider - .queryConnections(new Location(LocationType.ANY, 0, null, "Wien, Krottenbachstraße 110!"), null, new Location(LocationType.ADDRESS, - 0, null, "Wien, Meidlinger Hauptstraße 1"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Wien, Krottenbachstraße 110!"), + null, new Location(LocationType.ADDRESS, 0, null, "Wien, Meidlinger Hauptstraße 1"), new Date(), true, ALL_PRODUCTS, + WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/PlProviderLiveTest.java b/test/de/schildbach/pte/live/PlProviderLiveTest.java index 2ee61a8d..5b5c24c3 100644 --- a/test/de/schildbach/pte/live/PlProviderLiveTest.java +++ b/test/de/schildbach/pte/live/PlProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.PlProvider; import de.schildbach.pte.dto.Location; @@ -82,7 +83,8 @@ public class PlProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/RmvProviderLiveTest.java b/test/de/schildbach/pte/live/RmvProviderLiveTest.java index bf334a60..4fe0b06f 100644 --- a/test/de/schildbach/pte/live/RmvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/RmvProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.RmvProvider; import de.schildbach.pte.dto.Location; @@ -81,8 +82,9 @@ public class RmvProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 3000001, null, "Hauptwache"), - null, new Location(LocationType.STATION, 3000912, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 3000001, null, "Hauptwache"), null, + new Location(LocationType.STATION, 3000912, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -91,8 +93,9 @@ public class RmvProviderLiveTest @Test public void shortConnectionByName() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(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); + final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Frankfurt Bockenheimer Warte!"), + null, new Location(LocationType.ANY, 0, null, "Frankfurt Hauptbahnhof!"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + Accessibility.NEUTRAL); System.out.println(result); } } diff --git a/test/de/schildbach/pte/live/RtProviderLiveTest.java b/test/de/schildbach/pte/live/RtProviderLiveTest.java index 3d2e0772..cb5e4fb4 100644 --- a/test/de/schildbach/pte/live/RtProviderLiveTest.java +++ b/test/de/schildbach/pte/live/RtProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.RtProvider; import de.schildbach.pte.dto.Location; @@ -90,7 +91,8 @@ public class RtProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -99,8 +101,9 @@ public class RtProviderLiveTest @Test public void slowConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, - new Location(LocationType.ANY, 0, null, "Laconnex, Mollach"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + final QueryConnectionsResult result = provider + .queryConnections(new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, new Location(LocationType.ANY, 0, null, + "Laconnex, Mollach"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -110,7 +113,8 @@ public class RtProviderLiveTest public void connectionWithFootway() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -121,7 +125,7 @@ public class RtProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 51521886, -51447, null, "26 Coopers Close, Poplar, Greater London E1 4, Vereinigtes Königreich"), null, new Location(LocationType.STATION, 8096022, 50941312, - 6967206, null, "COLOGNE"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + 6967206, null, "COLOGNE"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/SbbProviderLiveTest.java b/test/de/schildbach/pte/live/SbbProviderLiveTest.java index a2f7d168..4b41c5a3 100644 --- a/test/de/schildbach/pte/live/SbbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SbbProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.SbbProvider; import de.schildbach.pte.dto.Location; @@ -90,7 +91,8 @@ public class SbbProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -99,8 +101,9 @@ public class SbbProviderLiveTest @Test public void slowConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, - new Location(LocationType.ANY, 0, null, "Laconnex, Mollach"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + final QueryConnectionsResult result = provider + .queryConnections(new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, new Location(LocationType.ANY, 0, null, + "Laconnex, Mollach"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -110,7 +113,8 @@ public class SbbProviderLiveTest public void connectionWithFootway() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -121,7 +125,7 @@ public class SbbProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, "Dorfstrasse 10, Dällikon, Schweiz"), null, new Location(LocationType.STATION, 8500010, null, "Basel"), new Date(), true, - ALL_PRODUCTS, WalkSpeed.NORMAL); + ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/SeProviderLiveTest.java b/test/de/schildbach/pte/live/SeProviderLiveTest.java index 4625b97a..6491d5a4 100644 --- a/test/de/schildbach/pte/live/SeProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SeProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.SeProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.SeProvider; import de.schildbach.pte.dto.Departure; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -87,7 +88,8 @@ public class SeProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/SeptaProviderLiveTest.java b/test/de/schildbach/pte/live/SeptaProviderLiveTest.java index 3055b21b..7b23066d 100644 --- a/test/de/schildbach/pte/live/SeptaProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SeptaProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.SeptaProvider; import de.schildbach.pte.dto.Location; @@ -82,7 +83,8 @@ public class SeptaProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -93,7 +95,7 @@ public class SeptaProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 40015670, -75209400, "Philadelphia 19127", "3601 Main St"), null, new Location(LocationType.STATION, 2090227, null, "Main Street"), new Date(), true, - ALL_PRODUCTS, WalkSpeed.NORMAL); + ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/SfProviderLiveTest.java b/test/de/schildbach/pte/live/SfProviderLiveTest.java index c6b42a84..f7762dc1 100644 --- a/test/de/schildbach/pte/live/SfProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SfProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.SfProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.SfProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -82,7 +83,7 @@ public class SfProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/ShProviderLiveTest.java b/test/de/schildbach/pte/live/ShProviderLiveTest.java index 27662077..a2e6da87 100644 --- a/test/de/schildbach/pte/live/ShProviderLiveTest.java +++ b/test/de/schildbach/pte/live/ShProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.ShProvider; import de.schildbach.pte.dto.Location; @@ -82,7 +83,8 @@ public class ShProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/SncbProviderLiveTest.java b/test/de/schildbach/pte/live/SncbProviderLiveTest.java index d5f19aea..ea8e691a 100644 --- a/test/de/schildbach/pte/live/SncbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SncbProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.SncbProvider; import de.schildbach.pte.dto.Location; @@ -90,7 +91,7 @@ public class SncbProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 8821006, "Antwerpen", "Centraal"), null, - new Location(LocationType.STATION, 8813003, "Brussel", "Centraal"), new Date(), true, null, WalkSpeed.FAST); + new Location(LocationType.STATION, 8813003, "Brussel", "Centraal"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); if (result.context != null) @@ -104,7 +105,7 @@ public class SncbProviderLiveTest public void longConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 207280, "Brussel", "Wannecouter"), null, - new Location(LocationType.STATION, 207272, "Brussel", "Stadion"), new Date(), true, null, WalkSpeed.FAST); + new Location(LocationType.STATION, 207272, "Brussel", "Stadion"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); if (result.context != null) @@ -119,7 +120,7 @@ public class SncbProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, "Bruxelles - Haren, Rue Paul Janson 9"), null, new Location(LocationType.STATION, 8500010, null, "Basel"), new Date(), true, - ALL_PRODUCTS, WalkSpeed.NORMAL); + ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); if (result.context != null) diff --git a/test/de/schildbach/pte/live/StockholmProviderLiveTest.java b/test/de/schildbach/pte/live/StockholmProviderLiveTest.java index 0f2955b3..30ddf9bf 100644 --- a/test/de/schildbach/pte/live/StockholmProviderLiveTest.java +++ b/test/de/schildbach/pte/live/StockholmProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.StockholmProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.StockholmProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -77,12 +78,13 @@ public class StockholmProviderLiveTest System.out.print(autocomplete.toDebugString() + " "); System.out.println(); } - + @Test public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/StvProviderLiveTest.java b/test/de/schildbach/pte/live/StvProviderLiveTest.java index 5677a7ea..b2dc3f58 100644 --- a/test/de/schildbach/pte/live/StvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/StvProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.StvProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.StvProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -90,7 +91,7 @@ public class StvProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/SvvProviderLiveTest.java b/test/de/schildbach/pte/live/SvvProviderLiveTest.java index 615062be..5b5458ed 100644 --- a/test/de/schildbach/pte/live/SvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SvvProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.SvvProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.SvvProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -82,7 +83,7 @@ public class SvvProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/SydneyProviderLiveTest.java b/test/de/schildbach/pte/live/SydneyProviderLiveTest.java index 168520a3..78292ba4 100644 --- a/test/de/schildbach/pte/live/SydneyProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SydneyProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.SydneyProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.SydneyProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -81,8 +82,9 @@ public class SydneyProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 10101100, "Sydney", "Central Station"), null, - new Location(LocationType.STATION, 0, "Sydney", "Capitol Square"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 10101100, "Sydney", "Central Station"), + null, new Location(LocationType.STATION, 0, "Sydney", "Capitol Square"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/TflProviderLiveTest.java b/test/de/schildbach/pte/live/TflProviderLiveTest.java index c97de9ee..63ef9b00 100644 --- a/test/de/schildbach/pte/live/TflProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TflProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.TflProvider; import de.schildbach.pte.dto.Location; @@ -81,8 +82,9 @@ public class TflProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(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); + final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), + null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -93,7 +95,7 @@ public class TflProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "sw19 8ta"), null, new Location( LocationType.STATION, 1016019, 51655903, -397249, null, "Watford (Herts), Watford Town Centre"), new Date(), true, ALL_PRODUCTS, - WalkSpeed.NORMAL); + WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); } } diff --git a/test/de/schildbach/pte/live/TleaProviderLiveTest.java b/test/de/schildbach/pte/live/TleaProviderLiveTest.java index 37901a58..c7e76250 100644 --- a/test/de/schildbach/pte/live/TleaProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TleaProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.TleaProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.TleaProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -82,7 +83,8 @@ public class TleaProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/TlemProviderLiveTest.java b/test/de/schildbach/pte/live/TlemProviderLiveTest.java index 12b9c23f..226f17e9 100644 --- a/test/de/schildbach/pte/live/TlemProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TlemProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.TlemProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.TlemProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -82,7 +83,8 @@ public class TlemProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/TlseProviderLiveTest.java b/test/de/schildbach/pte/live/TlseProviderLiveTest.java index cdff9ffa..98c94ba2 100644 --- a/test/de/schildbach/pte/live/TlseProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TlseProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.TlseProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.TlseProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -82,7 +83,8 @@ public class TlseProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/TlswProviderLiveTest.java b/test/de/schildbach/pte/live/TlswProviderLiveTest.java index 71b6da4a..83a1b470 100644 --- a/test/de/schildbach/pte/live/TlswProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TlswProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.TlswProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.TlswProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -82,7 +83,7 @@ public class TlswProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "70003023"), null, new Location( - LocationType.STATION, 0, null, "70003025"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + LocationType.STATION, 0, null, "70003025"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VagfrProviderLiveTest.java b/test/de/schildbach/pte/live/VagfrProviderLiveTest.java index f041edf0..aac17316 100644 --- a/test/de/schildbach/pte/live/VagfrProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VagfrProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.VagfrProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.VagfrProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -77,12 +78,12 @@ public class VagfrProviderLiveTest System.out.print(autocomplete.toDebugString() + " "); System.out.println(); } - + @Test public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VbbProviderLiveTest.java b/test/de/schildbach/pte/live/VbbProviderLiveTest.java index 07170d15..b4b93ee8 100644 --- a/test/de/schildbach/pte/live/VbbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VbbProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.VbbProvider; import de.schildbach.pte.dto.Location; @@ -82,7 +83,8 @@ public class VbbProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -93,7 +95,7 @@ public class VbbProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), new Location(LocationType.STATION, 9044202, "Berlin", "Bundesplatz"), new Location(LocationType.STATION, 9013103, "Berlin", - "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -103,7 +105,8 @@ public class VbbProviderLiveTest public void connectionBetweenCoordinates() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -114,7 +117,7 @@ public class VbbProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), new Location(LocationType.ADDRESS, 0, 52479868, 13324247, null, null), new Location(LocationType.ADDRESS, 0, 52513639, 13568648, - null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -125,7 +128,7 @@ public class VbbProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, "10715 Bln Charlb.-Wilm., Weimarische Str. 7"), null, new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), - new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); @@ -136,7 +139,8 @@ public class VbbProviderLiveTest { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, null, "10715 Bln Charlb.-Wilm., Weimarische Str. 7"), new Location(LocationType.ADDRESS, 0, null, "10115 Bln Mitte, Hannoversche Str. 20"), - new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VblProviderLiveTest.java b/test/de/schildbach/pte/live/VblProviderLiveTest.java index 1c7330d4..e6d3d038 100644 --- a/test/de/schildbach/pte/live/VblProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VblProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.VblProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.VblProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -82,7 +83,7 @@ public class VblProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VbnProviderLiveTest.java b/test/de/schildbach/pte/live/VbnProviderLiveTest.java index dd2ba9d0..4fcdf580 100644 --- a/test/de/schildbach/pte/live/VbnProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VbnProviderLiveTest.java @@ -24,6 +24,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.VbnProvider; import de.schildbach.pte.dto.Location; @@ -84,7 +85,8 @@ public class VbnProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); assertEquals(QueryConnectionsResult.Status.OK, result.status); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); @@ -95,7 +97,8 @@ public class VbnProviderLiveTest public void connectionDateOutsideTimetablePeriod() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); assertEquals(QueryConnectionsResult.Status.INVALID_DATE, result.status); } } diff --git a/test/de/schildbach/pte/live/VgsProviderLiveTest.java b/test/de/schildbach/pte/live/VgsProviderLiveTest.java index 71606853..edf3b3ff 100644 --- a/test/de/schildbach/pte/live/VgsProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VgsProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.VgsProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.VgsProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -82,7 +83,7 @@ public class VgsProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VmobilProviderLiveTest.java b/test/de/schildbach/pte/live/VmobilProviderLiveTest.java index 4d90efcb..49b8c435 100644 --- a/test/de/schildbach/pte/live/VmobilProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VmobilProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.VmobilProvider; import de.schildbach.pte.dto.Location; @@ -90,7 +91,7 @@ public class VmobilProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VmsProviderLiveTest.java b/test/de/schildbach/pte/live/VmsProviderLiveTest.java index 91362b7c..94de0ead 100644 --- a/test/de/schildbach/pte/live/VmsProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VmsProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.VmsProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.VmsProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -82,7 +83,7 @@ public class VmsProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VmvProviderLiveTest.java b/test/de/schildbach/pte/live/VmvProviderLiveTest.java index 1690316f..a4bc5589 100644 --- a/test/de/schildbach/pte/live/VmvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VmvProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.VmvProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.VmvProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -77,12 +78,12 @@ public class VmvProviderLiveTest System.out.print(autocomplete.toDebugString() + " "); System.out.println(); } - + @Test public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VorProviderLiveTest.java b/test/de/schildbach/pte/live/VorProviderLiveTest.java index 751b7583..c62d1c5a 100644 --- a/test/de/schildbach/pte/live/VorProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VorProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.VorProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.VorProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -90,7 +91,7 @@ public class VorProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/test/de/schildbach/pte/live/VrnProviderLiveTest.java index ed4dcc50..cf4d481d 100644 --- a/test/de/schildbach/pte/live/VrnProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrnProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.VrnProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.VrnProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -114,7 +115,7 @@ public class VrnProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/test/de/schildbach/pte/live/VrrProviderLiveTest.java index bafba78d..0a90e994 100644 --- a/test/de/schildbach/pte/live/VrrProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrrProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.VrrProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.VrrProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -101,12 +102,12 @@ public class VrrProviderLiveTest System.out.print(autocomplete.toDebugString() + " "); System.out.println(); } - + @Test public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VrtProviderLiveTest.java b/test/de/schildbach/pte/live/VrtProviderLiveTest.java index 73c2e15c..a79805f0 100644 --- a/test/de/schildbach/pte/live/VrtProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrtProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.VrtProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.VrtProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -82,7 +83,8 @@ public class VrtProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VvmProviderLiveTest.java b/test/de/schildbach/pte/live/VvmProviderLiveTest.java index b39d246c..6471c912 100644 --- a/test/de/schildbach/pte/live/VvmProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvmProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.VvmProvider; import de.schildbach.pte.dto.Location; @@ -90,7 +91,7 @@ public class VvmProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VvoProviderLiveTest.java b/test/de/schildbach/pte/live/VvoProviderLiveTest.java index a024eec3..c1b6d3ca 100644 --- a/test/de/schildbach/pte/live/VvoProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvoProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.VvoProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.VvoProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -77,12 +78,12 @@ public class VvoProviderLiveTest System.out.print(autocomplete.toDebugString() + " "); System.out.println(); } - + @Test public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VvsProviderLiveTest.java b/test/de/schildbach/pte/live/VvsProviderLiveTest.java index 3970f92a..e1725f78 100644 --- a/test/de/schildbach/pte/live/VvsProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvsProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.VvsProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.VvsProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -90,7 +91,7 @@ public class VvsProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VvtProviderLiveTest.java b/test/de/schildbach/pte/live/VvtProviderLiveTest.java index f1f2b64e..508d73e3 100644 --- a/test/de/schildbach/pte/live/VvtProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvtProviderLiveTest.java @@ -22,8 +22,9 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.VvtProvider; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.VvtProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -77,12 +78,12 @@ public class VvtProviderLiveTest System.out.print(autocomplete.toDebugString() + " "); System.out.println(); } - + @Test public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/ZvvProviderLiveTest.java b/test/de/schildbach/pte/live/ZvvProviderLiveTest.java index 5bafd143..000913c5 100644 --- a/test/de/schildbach/pte/live/ZvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/ZvvProviderLiveTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; +import de.schildbach.pte.NetworkProvider.Accessibility; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.ZvvProvider; import de.schildbach.pte.dto.Location; @@ -82,7 +83,8 @@ public class ZvvProviderLiveTest public void shortConnection() throws Exception { final QueryConnectionsResult result = provider.queryConnections(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); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult);