From b7cbeff9de37c7290f904dda53ec43726e292bc6 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 20 Mar 2012 18:35:49 +0100 Subject: [PATCH] AbstractProviderLiveTest holds reference to provider --- .../pte/live/AbstractProviderLiveTest.java | 15 ++++--- .../pte/live/AtcProviderLiveTest.java | 11 +++-- .../pte/live/AvvProviderLiveTest.java | 12 ++--- .../pte/live/BahnProviderLiveTest.java | 30 +++++++------ .../pte/live/BayernProviderLiveTest.java | 37 ++++++++------- .../pte/live/BsagProviderLiveTest.java | 11 +++-- .../pte/live/BsvagProviderLiveTest.java | 9 ++-- .../pte/live/BvbProviderLiveTest.java | 11 +++-- .../pte/live/BvgProviderLiveTest.java | 45 ++++++++++--------- .../pte/live/DingProviderLiveTest.java | 9 ++-- .../pte/live/DsbProviderLiveTest.java | 11 +++-- .../pte/live/DubProviderLiveTest.java | 13 +++--- .../pte/live/GvhProviderLiveTest.java | 28 +++++++----- .../pte/live/InvgProviderLiveTest.java | 9 ++-- .../pte/live/IvbProviderLiveTest.java | 12 ++--- .../pte/live/KvvProviderLiveTest.java | 9 ++-- .../pte/live/LinzProviderLiveTest.java | 21 +++++---- .../pte/live/LuProviderLiveTest.java | 15 ++++--- .../pte/live/MariborProviderLiveTest.java | 11 +++-- .../pte/live/MetProviderLiveTest.java | 11 +++-- .../pte/live/MvgProviderLiveTest.java | 9 ++-- .../pte/live/MvvProviderLiveTest.java | 42 ++++++++--------- .../pte/live/NaldoProviderLiveTest.java | 11 +++-- .../pte/live/NasaProviderLiveTest.java | 19 ++++---- .../pte/live/NphProviderLiveTest.java | 11 +++-- .../pte/live/NriProviderLiveTest.java | 9 ++-- .../pte/live/NsProviderLiveTest.java | 13 +++--- .../pte/live/NvbwProviderLiveTest.java | 12 ++--- .../pte/live/NvvProviderLiveTest.java | 13 +++--- .../pte/live/OebbProviderLiveTest.java | 30 +++++++------ .../pte/live/PlProviderLiveTest.java | 12 ++--- .../pte/live/RmvProviderLiveTest.java | 16 ++++--- .../pte/live/RtProviderLiveTest.java | 32 ++++++------- .../pte/live/SbbProviderLiveTest.java | 28 ++++++------ .../pte/live/SeProviderLiveTest.java | 9 ++-- .../pte/live/SeptaProviderLiveTest.java | 19 ++++---- .../pte/live/SfProviderLiveTest.java | 11 +++-- .../pte/live/ShProviderLiveTest.java | 9 ++-- .../pte/live/SncbProviderLiveTest.java | 21 +++++---- .../pte/live/StockholmProviderLiveTest.java | 11 +++-- .../pte/live/StvProviderLiveTest.java | 11 +++-- .../pte/live/SvvProviderLiveTest.java | 11 +++-- .../pte/live/SydneyProviderLiveTest.java | 11 +++-- .../pte/live/TflProviderLiveTest.java | 13 +++--- .../pte/live/TleaProviderLiveTest.java | 11 +++-- .../pte/live/TlemProviderLiveTest.java | 11 +++-- .../pte/live/TlseProviderLiveTest.java | 11 +++-- .../pte/live/TlswProviderLiveTest.java | 9 ++-- .../pte/live/VagfrProviderLiveTest.java | 11 +++-- .../pte/live/VbbProviderLiveTest.java | 37 ++++++++------- .../pte/live/VblProviderLiveTest.java | 11 +++-- .../pte/live/VbnProviderLiveTest.java | 16 ++++--- .../pte/live/VgnProviderLiveTest.java | 12 ++--- .../pte/live/VgsProviderLiveTest.java | 11 +++-- .../pte/live/VmobilProviderLiveTest.java | 11 +++-- .../pte/live/VmsProviderLiveTest.java | 11 +++-- .../pte/live/VmvProviderLiveTest.java | 11 +++-- .../pte/live/VorProviderLiveTest.java | 11 +++-- .../pte/live/VrnProviderLiveTest.java | 11 +++-- .../pte/live/VrrProviderLiveTest.java | 9 ++-- .../pte/live/VrtProviderLiveTest.java | 12 ++--- .../pte/live/VvmProviderLiveTest.java | 11 +++-- .../pte/live/VvoProviderLiveTest.java | 11 +++-- .../pte/live/VvsProviderLiveTest.java | 11 +++-- .../pte/live/VvtProviderLiveTest.java | 11 +++-- .../pte/live/VvvProviderLiveTest.java | 11 +++-- .../pte/live/ZvvProviderLiveTest.java | 12 ++--- 67 files changed, 593 insertions(+), 403 deletions(-) diff --git a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java index fd71411f..1d9ebbcf 100644 --- a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java @@ -37,6 +37,13 @@ public abstract class AbstractProviderLiveTest { protected static final String ALL_PRODUCTS = "IRSUTBFC"; + protected final NetworkProvider provider; + + public AbstractProviderLiveTest(final NetworkProvider provider) + { + this.provider = provider; + } + protected final void print(final NearbyStationsResult result) { System.out.println(result.status @@ -60,15 +67,13 @@ public abstract class AbstractProviderLiveTest System.out.println(); } - protected final QueryConnectionsResult queryConnections(final NetworkProvider provider, final Location from, final Location via, - final Location to, final Date date, final boolean dep, final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) - throws IOException + protected final QueryConnectionsResult queryConnections(final Location from, final Location via, final Location to, final Date date, + final boolean dep, final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException { return provider.queryConnections(from, via, to, date, dep, 4, products, walkSpeed, accessibility); } - protected final QueryConnectionsResult queryMoreConnections(final NetworkProvider provider, final QueryConnectionsContext context, - final boolean later) throws IOException + protected final QueryConnectionsResult queryMoreConnections(final QueryConnectionsContext context, final boolean later) throws IOException { return provider.queryMoreConnections(context, later, 4); } diff --git a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java index 7ed455d2..a02081ea 100644 --- a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class AtcProviderLiveTest extends AbstractProviderLiveTest { - private final AtcProvider provider = new AtcProvider(); + public AtcProviderLiveTest() + { + super(new AtcProvider()); + } @Test public void nearbyStations() throws Exception @@ -82,10 +85,10 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java index 3444daad..f458795d 100644 --- a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class AvvProviderLiveTest extends AbstractProviderLiveTest { - private final AvvProvider provider = new AvvProvider(); + public AvvProviderLiveTest() + { + super(new AvvProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,11 +84,10 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 101, null, "Königsplatz"), null, - new Location(LocationType.STATION, 100, null, "Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 101, null, "Königsplatz"), null, new Location( + LocationType.STATION, 100, null, "Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java index 3d11055b..446315e7 100644 --- a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java @@ -37,7 +37,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class BahnProviderLiveTest extends AbstractProviderLiveTest { - private BahnProvider provider = new BahnProvider(); + public BahnProviderLiveTest() + { + super(new BahnProvider()); + } @Test public void nearbyStations() throws Exception @@ -82,30 +85,29 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8011160, null, "Berlin Hbf"), null, - new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); for (final Connection connection : result.connections) provider.getConnectionDetails(connection.link); System.out.println(laterResult); - final QueryConnectionsResult later2Result = queryMoreConnections(provider, laterResult.context, true); + final QueryConnectionsResult later2Result = queryMoreConnections(laterResult.context, true); System.out.println(later2Result); - final QueryConnectionsResult earlierResult = queryMoreConnections(provider, later2Result.context, false); + final QueryConnectionsResult earlierResult = queryMoreConnections(later2Result.context, false); System.out.println(earlierResult); - final QueryConnectionsResult later3Result = queryMoreConnections(provider, earlierResult.context, true); + final QueryConnectionsResult later3Result = queryMoreConnections(earlierResult.context, true); System.out.println(later3Result); } @Test public void slowConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Marienburger Str., Berlin"), null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); for (final Connection connection : result.connections) provider.getConnectionDetails(connection.link); System.out.println(laterResult); @@ -114,12 +116,12 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest @Test public void connectionWithFootway() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, - "Berlin - Mitte, Unter den Linden 24"), null, new Location(LocationType.ADDRESS, 0, null, "Starnberg, Possenhofener Straße 13"), - new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); for (final Connection connection : result.connections) provider.getConnectionDetails(connection.link); System.out.println(laterResult); diff --git a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java index 67d1f2f6..8290315c 100644 --- a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class BayernProviderLiveTest extends AbstractProviderLiveTest { - private BayernProvider provider = new BayernProvider(); + public BayernProviderLiveTest() + { + super(new BayernProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,18 +84,18 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 80000793, "München", "Ostbahnhof"), null, + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void longConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1005530, "Starnberg", "Arbeitsamt"), null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); @@ -102,42 +105,42 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest @Test public void connectionBetweenCoordinates() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 48165238, 11577473), null, - new Location(LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.ADDRESS, 0, 48165238, 11577473), null, new Location( + LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenCoordinateAndStation() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 48238341, 11478230), null, - new Location(LocationType.ANY, 0, null, "Ostbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.ADDRESS, 0, 48238341, 11478230), null, new Location( + LocationType.ANY, 0, null, "Ostbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "München, Maximilianstr. 1"), - null, new Location(LocationType.ADDRESS, 0, null, "Starnberg, Jahnstraße 50"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenStationAndAddress() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1220, null, "Josephsburg"), null, - new Location(LocationType.ADDRESS, 0, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, ALL_PRODUCTS, - WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, + Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/BsagProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BsagProviderLiveTest.java index 16e17e33..a9f04098 100644 --- a/enabler/test/de/schildbach/pte/live/BsagProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BsagProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class BsagProviderLiveTest extends AbstractProviderLiveTest { - private final BsagProvider provider = new BsagProvider(); + public BsagProviderLiveTest() + { + super(new BsagProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,11 +84,11 @@ public class BsagProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 28000257, null, "Bremen, Hauptbahnhof"), - null, new Location(LocationType.STATION, 28000512, null, "Herdentor"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 28000257, null, "Bremen, Hauptbahnhof"), null, + new Location(LocationType.STATION, 28000512, null, "Herdentor"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java index 71d89a0b..9ea5cf96 100644 --- a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java @@ -35,7 +35,10 @@ import de.schildbach.pte.dto.QueryConnectionsResult; */ public class BsvagProviderLiveTest extends AbstractProviderLiveTest { - private final BsvagProvider provider = new BsvagProvider(); + public BsvagProviderLiveTest() + { + super(new BsvagProvider()); + } @Test public void nearbyStations() throws Exception @@ -72,11 +75,11 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 26000178, null, "Hauptbahnhof"), null, + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 26000178, null, "Hauptbahnhof"), null, new Location(LocationType.STATION, 26000322, null, "Packhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java index 00514edb..86263e93 100644 --- a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class BvbProviderLiveTest extends AbstractProviderLiveTest { - private final BvbProvider provider = new BvbProvider(); + public BvbProviderLiveTest() + { + super(new BvbProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,10 +84,10 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 10000, null, "Bahnhof"), null, - new Location(LocationType.STATION, 86, null, "Markthalle"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 10000, null, "Bahnhof"), null, new Location( + LocationType.STATION, 86, null, "Markthalle"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java index e9d70d4b..ba4a0d6e 100644 --- a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java @@ -38,7 +38,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class BvgProviderLiveTest extends AbstractProviderLiveTest { - private BvgProvider provider = new BvgProvider(null); + public BvgProviderLiveTest() + { + super(new BvgProvider(null)); + } @Test public void nearbyStations() throws Exception @@ -88,84 +91,84 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), - null, new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), null, + new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); - final QueryConnectionsResult later2Result = queryMoreConnections(provider, laterResult.context, true); + final QueryConnectionsResult later2Result = queryMoreConnections(laterResult.context, true); System.out.println(later2Result); - final QueryConnectionsResult earlierResult = queryMoreConnections(provider, later2Result.context, false); + final QueryConnectionsResult earlierResult = queryMoreConnections(later2Result.context, false); System.out.println(earlierResult); - final QueryConnectionsResult later3Result = queryMoreConnections(provider, earlierResult.context, true); + final QueryConnectionsResult later3Result = queryMoreConnections(earlierResult.context, true); System.out.println(later3Result); } @Test public void shortViaConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenCoordinates() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenCoordinatesAndAddresses() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 52536099, 13426309, null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void viaConnectionBetweenCoordinates() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), - new Location(LocationType.ADDRESS, 0, 52479868, 13324247, null, null), new Location(LocationType.ADDRESS, 0, 52513639, 13568648, - null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void viaConnectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java index 72711f9a..c5820786 100644 --- a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class DingProviderLiveTest extends AbstractProviderLiveTest { - private final DingProvider provider = new DingProvider(); + public DingProviderLiveTest() + { + super(new DingProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,10 +84,10 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 9001011, null, "Justizgebäude"), null, + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java index 1197c6ab..4948c883 100644 --- a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class DsbProviderLiveTest extends AbstractProviderLiveTest { - private final DsbProvider provider = new DsbProvider(); + public DsbProviderLiveTest() + { + super(new DsbProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,11 +76,11 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 900000011, null, "Copenhagen Airport"), - null, new Location(LocationType.STATION, 551922500, null, "Billund Airport"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java index 2313cd13..657adf40 100644 --- a/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java @@ -35,7 +35,10 @@ import de.schildbach.pte.dto.QueryConnectionsResult; */ public class DubProviderLiveTest extends AbstractProviderLiveTest { - private final DubProvider provider = new DubProvider(); + public DubProviderLiveTest() + { + super(new DubProvider()); + } @Test public void nearbyStations() throws Exception @@ -64,11 +67,11 @@ public class DubProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 3505565, null, - "Airport Terminal 1, Arrival"), null, new Location(LocationType.STATION, 3505445, null, "Airport Terminal 3"), new Date(), true, - ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, + Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java index d4738e9c..661a679b 100644 --- a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class GvhProviderLiveTest extends AbstractProviderLiveTest { - private final GvhProvider provider = new GvhProvider(null); + public GvhProviderLiveTest() + { + super(new GvhProvider(null)); + } @Test public void nearbyStations() throws Exception @@ -105,41 +108,42 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest @Test public void incompleteConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "hann"), null, new Location( - LocationType.ANY, 0, null, "laat"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.ANY, 0, null, "hann"), null, new Location(LocationType.ANY, + 0, null, "laat"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result); } @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 25000031, null, "Hannover Hauptbahnhof"), - null, new Location(LocationType.STATION, 25001141, null, "Hannover Bismarckstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenAnyAndAddress() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, 53069619, 8799202, null, - "bremen, neustadtswall 12"), null, new Location(LocationType.ADDRESS, 0, 53104124, 8788575, null, "Bremen Glücksburger Straße 37"), - new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, + Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 53622859, 10133545, null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java index 0356a766..61fb6939 100644 --- a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class InvgProviderLiveTest extends AbstractProviderLiveTest { - private final InvgProvider provider = new InvgProvider(); + public InvgProviderLiveTest() + { + super(new InvgProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,11 +76,11 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 80302, null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java index d486f0f9..b9313f39 100644 --- a/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class IvbProviderLiveTest extends AbstractProviderLiveTest { - private final IvbProvider provider = new IvbProvider(); + public IvbProviderLiveTest() + { + super(new IvbProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,11 +84,10 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 60466402, null, "Kochstraße"), null, - new Location(LocationType.STATION, 60461679, null, "Messe/Zeughaus"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java index 23faa66e..5555bc60 100644 --- a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class KvvProviderLiveTest extends AbstractProviderLiveTest { - private final KvvProvider provider = new KvvProvider(); + public KvvProviderLiveTest() + { + super(new KvvProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,11 +84,11 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest @Test public void connectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 48985089, 8402709, null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java index 82ef0ef8..e5da7840 100644 --- a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class LinzProviderLiveTest extends AbstractProviderLiveTest { - private LinzProvider provider = new LinzProvider(); + public LinzProviderLiveTest() + { + super(new LinzProvider()); + } @Test public void nearbyStations() throws Exception @@ -96,28 +99,28 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest @Test public void incompleteConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "linz"), null, new Location( - LocationType.ANY, 0, null, "gel"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.ANY, 0, null, "linz"), null, new Location(LocationType.ANY, + 0, null, "gel"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result); } @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Linz Hauptbahnhof"), null, - new Location(LocationType.STATION, 0, null, "Linz Auwiesen"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); - final QueryConnectionsResult earlierResult = queryMoreConnections(provider, laterResult.context, false); + final QueryConnectionsResult earlierResult = queryMoreConnections(laterResult.context, false); System.out.println(earlierResult); } @Test public void longConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Linz Auwiesen"), null, - new Location(LocationType.STATION, 0, null, "Linz Hafen"), new Date(), true, ALL_PRODUCTS, WalkSpeed.SLOW, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); // final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); // System.out.println(laterResult); diff --git a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java index 124794ef..bcfc13f9 100644 --- a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class LuProviderLiveTest extends AbstractProviderLiveTest { - private final LuProvider provider = new LuProvider(); + public LuProviderLiveTest() + { + super(new LuProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,22 +76,22 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 9409001, null, "Echternach, Bel Air"), - null, new Location(LocationType.STATION, 9440001, null, "Echternach, Gare"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void addressConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 49611610, 6130265, null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/MariborProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MariborProviderLiveTest.java index fdb5e7fb..2baea8d6 100644 --- a/enabler/test/de/schildbach/pte/live/MariborProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MariborProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class MariborProviderLiveTest extends AbstractProviderLiveTest { - private final MariborProvider provider = new MariborProvider(); + public MariborProviderLiveTest() + { + super(new MariborProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,11 +76,11 @@ public class MariborProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 63202999, null, "Graz Marburger Straße"), - null, new Location(LocationType.STATION, 63201746, null, "Flughafen Graz Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java index 85858495..297e7768 100644 --- a/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class MetProviderLiveTest extends AbstractProviderLiveTest { - private final MetProvider provider = new MetProvider(); + public MetProviderLiveTest() + { + super(new MetProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,10 +76,10 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java index 37ea1129..f39c32b0 100644 --- a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class MvgProviderLiveTest extends AbstractProviderLiveTest { - private final MvgProvider provider = new MvgProvider(); + public MvgProviderLiveTest() + { + super(new MvgProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,11 +84,11 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 24510104, null, "Schützenplatz"), null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java index 0487a099..647e7e43 100644 --- a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class MvvProviderLiveTest extends AbstractProviderLiveTest { - private MvvProvider provider = new MvvProvider(); + public MvvProviderLiveTest() + { + super(new MvvProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,21 +84,20 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Marienplatz"), null, new Location( + final QueryConnectionsResult result = queryConnections(new Location(LocationType.ANY, 0, null, "Marienplatz"), null, new Location( LocationType.ANY, 0, null, "Pasing"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); - final QueryConnectionsResult earlierResult = queryMoreConnections(provider, laterResult.context, false); + final QueryConnectionsResult earlierResult = queryMoreConnections(laterResult.context, false); System.out.println(earlierResult); } @Test public void longConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Starnberg, Arbeitsamt"), null, - new Location(LocationType.STATION, 0, null, "Ackermannstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); // seems like there are no more connections all the time } @@ -103,42 +105,42 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest @Test public void connectionBetweenCoordinates() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 48165238, 11577473), null, - new Location(LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.ADDRESS, 0, 48165238, 11577473), null, new Location( + LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenCoordinateAndStation() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 48238341, 11478230), null, - new Location(LocationType.ANY, 0, null, "Ostbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.ADDRESS, 0, 48238341, 11478230), null, new Location( + LocationType.ANY, 0, null, "Ostbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "München, Maximilianstr. 1"), - null, new Location(LocationType.ADDRESS, 0, null, "Starnberg, Jahnstraße 50"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenStationAndAddress() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1220, null, "Josephsburg"), null, - new Location(LocationType.ADDRESS, 0, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, ALL_PRODUCTS, - WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, + Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java index 7de1a6ee..1ff6cf92 100644 --- a/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class NaldoProviderLiveTest extends AbstractProviderLiveTest { - private final NaldoProvider provider = new NaldoProvider(); + public NaldoProviderLiveTest() + { + super(new NaldoProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,11 +84,11 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 3019697, null, "Amberg Kurfürstenbad"), - null, new Location(LocationType.STATION, 3019500, null, "Amberg Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java index 22a9c5ad..14d2da2b 100644 --- a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class NasaProviderLiveTest extends AbstractProviderLiveTest { - private final NasaProvider provider = new NasaProvider(); + public NasaProviderLiveTest() + { + super(new NasaProvider()); + } @Test public void nearbyStations() throws Exception @@ -65,22 +68,22 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 13002, null, "Leipzig, Augustusplatz"), - null, new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void addressConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 51334078, 12478331, - "04319 Leipzig-Engelsdorf", "August-Bebel-Platz"), null, new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"), - new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NphProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NphProviderLiveTest.java index 27ac567e..6b2cfa64 100644 --- a/enabler/test/de/schildbach/pte/live/NphProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NphProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class NphProviderLiveTest extends AbstractProviderLiveTest { - private final NphProvider provider = new NphProvider(); + public NphProviderLiveTest() + { + super(new NphProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,11 +84,11 @@ public class NphProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 23007000, "Paderborn", "Paderborn Hbf"), - null, new Location(LocationType.STATION, 23007700, "Höxter", "Bahnhof / Rathaus"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java index 219880a6..6490ce3b 100644 --- a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class NriProviderLiveTest extends AbstractProviderLiveTest { - private final NriProvider provider = new NriProvider(); + public NriProviderLiveTest() + { + super(new NriProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,10 +76,10 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8059, null, "Oslo"), null, new Location( + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 8059, null, "Oslo"), null, new Location( LocationType.STATION, 6642, null, "Bergen BGO"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java index f7ee1a91..bc3c308a 100644 --- a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class NsProviderLiveTest extends AbstractProviderLiveTest { - private final NsProvider provider = new NsProvider(); + public NsProviderLiveTest() + { + super(new NsProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,8 +76,8 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 100024), null, new Location( - LocationType.STATION, 100066), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 100024), null, new Location(LocationType.STATION, + 100066), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); } @@ -82,8 +85,8 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest @Test public void longConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 100024), null, new Location( - LocationType.STATION, 103624), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 100024), null, new Location(LocationType.STATION, + 103624), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); } diff --git a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java index cc61ec9e..61757d73 100644 --- a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class NvbwProviderLiveTest extends AbstractProviderLiveTest { - private final NvbwProvider provider = new NvbwProvider(); + public NvbwProviderLiveTest() + { + super(new NvbwProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,11 +84,10 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 17002402, null, "Bahnhof"), null, - new Location(LocationType.STATION, 17009001, null, "Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 17002402, null, "Bahnhof"), null, new Location( + LocationType.STATION, 17009001, null, "Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java index 4bd9f15e..f835caff 100644 --- a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class NvvProviderLiveTest extends AbstractProviderLiveTest { - private final NvvProvider provider = new NvvProvider(); + public NvvProviderLiveTest() + { + super(new NvvProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,11 +76,11 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 2200007, null, "Kassel Wilhelmshöhe"), - null, new Location(LocationType.STATION, 2200278, null, "Kassel Wilhelmshöher Weg"), new Date(), true, ALL_PRODUCTS, - WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java index c4ed5d3c..970504c5 100644 --- a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java @@ -39,7 +39,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class OebbProviderLiveTest extends AbstractProviderLiveTest { - private OebbProvider provider = new OebbProvider(); + public OebbProviderLiveTest() + { + super(new OebbProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,50 +84,49 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1140101, null, "Linz"), null, - new Location(LocationType.STATION, 1190100, null, "Wien"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 1140101, null, "Linz"), null, new Location( + LocationType.STATION, 1190100, null, "Wien"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); assertEquals(QueryConnectionsResult.Status.OK, result.status); assertTrue(result.connections.size() > 0); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void slowConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Ramsen Zoll!"), null, new Location( + final QueryConnectionsResult result = queryConnections(new Location(LocationType.ANY, 0, null, "Ramsen Zoll!"), null, new Location( LocationType.ANY, 0, null, "Azuga!"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); assertEquals(QueryConnectionsResult.Status.OK, result.status); assertTrue(result.connections.size() > 0); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionWithFootway() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Graz, Haselweg!"), null, - new Location(LocationType.ANY, 0, null, "Innsbruck, Gumppstraße 69!"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.ANY, 0, null, "Graz, Haselweg!"), null, new Location( + LocationType.ANY, 0, null, "Innsbruck, Gumppstraße 69!"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); assertEquals(QueryConnectionsResult.Status.OK, result.status); assertTrue(result.connections.size() > 0); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionWithFootway2() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Wien, Krottenbachstraße 110!"), - null, new Location(LocationType.ADDRESS, 0, null, "Wien, Meidlinger Hauptstraße 1!"), new Date(), true, ALL_PRODUCTS, - WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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); assertEquals(QueryConnectionsResult.Status.OK, result.status); assertTrue(result.connections.size() > 0); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java index f52cd421..6602697f 100644 --- a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class PlProviderLiveTest extends AbstractProviderLiveTest { - private final PlProvider provider = new PlProvider(); + public PlProviderLiveTest() + { + super(new PlProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,11 +76,10 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 5196001, null, "KRAKÓW"), null, - new Location(LocationType.STATION, 5196003, null, "WARSZAWA"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 5196001, null, "KRAKÓW"), null, new Location( + LocationType.STATION, 5196003, null, "WARSZAWA"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/RmvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/RmvProviderLiveTest.java index 989d7b10..3a76e27f 100644 --- a/enabler/test/de/schildbach/pte/live/RmvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/RmvProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class RmvProviderLiveTest extends AbstractProviderLiveTest { - private final RmvProvider provider = new RmvProvider(); + public RmvProviderLiveTest() + { + super(new RmvProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,19 +76,18 @@ public class RmvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 3000001, null, "Hauptwache"), null, - new Location(LocationType.STATION, 3000912, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void shortConnectionByName() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Frankfurt Bockenheimer Warte!"), - null, new Location(LocationType.ANY, 0, null, "Frankfurt Hauptbahnhof!"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java index 1caec7a1..121a43b9 100644 --- a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class RtProviderLiveTest extends AbstractProviderLiveTest { - private RtProvider provider = new RtProvider(); + public RtProviderLiveTest() + { + super(new RtProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,54 +84,53 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8503000, null, "Zürich HB"), null, - new Location(LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void slowConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionWithFootway() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "Spiez, Seestraße 62"), null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionFromAddress() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 51521886, -51447, null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void viaConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8400056, null, "Amsterdam RAI"), - new Location(LocationType.STATION, 8400058, null, "Amsterdam Centraal"), new Location(LocationType.STATION, 8000085, null, - "Düsseldorf Hbf"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 8400056, null, "Amsterdam RAI"), new Location( + LocationType.STATION, 8400058, null, "Amsterdam Centraal"), new Location(LocationType.STATION, 8000085, null, "Düsseldorf Hbf"), + new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java index 920c114a..82ff1f09 100644 --- a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class SbbProviderLiveTest extends AbstractProviderLiveTest { - private SbbProvider provider = new SbbProvider(Secrets.SBB_ACCESS_ID); + public SbbProviderLiveTest() + { + super(new SbbProvider(Secrets.SBB_ACCESS_ID)); + } @Test public void nearbyStations() throws Exception @@ -81,43 +84,42 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8503000, null, "Zürich HB"), null, - new Location(LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void slowConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionWithFootway() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, "Spiez, Seestraße 62"), null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionFromAddress() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, - "Dorfstrasse 10, Dällikon, Schweiz"), null, new Location(LocationType.STATION, 8500010, null, "Basel"), new Date(), true, - ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, + Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java index a81a3105..10f4782f 100644 --- a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class SeProviderLiveTest extends AbstractProviderLiveTest { - private final SeProvider provider = new SeProvider(); + public SeProviderLiveTest() + { + super(new SeProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,11 +76,11 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 7414867, null, "Luleå Airport"), null, + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 7414867, null, "Luleå Airport"), null, new Location(LocationType.STATION, 7498000, null, "STOCKHOLM"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java index d5a30a63..c1b38cd4 100644 --- a/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class SeptaProviderLiveTest extends AbstractProviderLiveTest { - private final SeptaProvider provider = new SeptaProvider(); + public SeptaProviderLiveTest() + { + super(new SeptaProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,22 +76,22 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 2090227, null, "Main Street"), null, - new Location(LocationType.STATION, 1015755, null, "Harbison Av + Unruh Av"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void addressConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 40015670, -75209400, - "Philadelphia 19127", "3601 Main St"), null, new Location(LocationType.STATION, 2090227, null, "Main Street"), new Date(), true, - ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java index 0d8996b2..195a67f7 100644 --- a/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class SfProviderLiveTest extends AbstractProviderLiveTest { - private final SfProvider provider = new SfProvider(); + public SfProviderLiveTest() + { + super(new SfProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,10 +76,10 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java index a0d921f9..426d1048 100644 --- a/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class ShProviderLiveTest extends AbstractProviderLiveTest { - private final ShProvider provider = new ShProvider(); + public ShProviderLiveTest() + { + super(new ShProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,11 +76,11 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8002547, null, "Flughafen Hamburg"), null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java index bf6ed463..595f407a 100644 --- a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class SncbProviderLiveTest extends AbstractProviderLiveTest { - private final SncbProvider provider = new SncbProvider(); + public SncbProviderLiveTest() + { + super(new SncbProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,13 +84,13 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8821006, "Antwerpen", "Centraal"), null, + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 8821006, "Antwerpen", "Centraal"), null, new Location(LocationType.STATION, 8813003, "Brussel", "Centraal"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); if (result.context != null) { - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult.status + " " + laterResult.connections); } } @@ -95,13 +98,13 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest @Test public void longConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 207280, "Brussel", "Wannecouter"), null, + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 207280, "Brussel", "Wannecouter"), null, new Location(LocationType.STATION, 207272, "Brussel", "Stadion"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); if (result.context != null) { - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult.status + " " + laterResult.connections); } } @@ -109,14 +112,14 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest @Test public void connectionFromAddress() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, - "Bruxelles - Haren, Rue Paul Janson 9"), null, new Location(LocationType.STATION, 8500010, null, "Basel"), new Date(), true, - ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, + Accessibility.NEUTRAL); System.out.println(result.status + " " + result.connections); if (result.context != null) { - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult.status + " " + laterResult.connections); } } diff --git a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java index 746d7577..375b75ad 100644 --- a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class StockholmProviderLiveTest extends AbstractProviderLiveTest { - private final StockholmProvider provider = new StockholmProvider(); + public StockholmProviderLiveTest() + { + super(new StockholmProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,11 +76,11 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 200101051, "Stockholm", "T-Centralen"), - null, new Location(LocationType.STATION, 200101221, "Stockholm", "Abrahamsberg"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 200101051, "Stockholm", "T-Centralen"), null, + new Location(LocationType.STATION, 200101221, "Stockholm", "Abrahamsberg"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java index 367eb5ee..f9b62b0b 100644 --- a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class StvProviderLiveTest extends AbstractProviderLiveTest { - private final StvProvider provider = new StvProvider(); + public StvProviderLiveTest() + { + super(new StvProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,10 +84,10 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java index 6f15ad74..9a534131 100644 --- a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class SvvProviderLiveTest extends AbstractProviderLiveTest { - private final SvvProvider provider = new SvvProvider(); + public SvvProviderLiveTest() + { + super(new SvvProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,10 +76,10 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java index 858070d3..32c4d57c 100644 --- a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class SydneyProviderLiveTest extends AbstractProviderLiveTest { - private final SydneyProvider provider = new SydneyProvider(); + public SydneyProviderLiveTest() + { + super(new SydneyProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,11 +76,11 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 10101100, "Sydney", "Central Station"), - null, new Location(LocationType.STATION, 0, "Sydney", "Capitol Square"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java index 75397592..43d1d350 100644 --- a/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class TflProviderLiveTest extends AbstractProviderLiveTest { - private final TflProvider provider = new TflProvider(); + public TflProviderLiveTest() + { + super(new TflProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,18 +76,18 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), - null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void postcodeConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ANY, 0, null, "sw19 8ta"), null, new Location( + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); diff --git a/enabler/test/de/schildbach/pte/live/TleaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TleaProviderLiveTest.java index eb5b251c..99e45170 100644 --- a/enabler/test/de/schildbach/pte/live/TleaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TleaProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class TleaProviderLiveTest extends AbstractProviderLiveTest { - private final TleaProvider provider = new TleaProvider(); + public TleaProviderLiveTest() + { + super(new TleaProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,11 +76,11 @@ public class TleaProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), - null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java index 645b3576..bf33f67d 100644 --- a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class TlemProviderLiveTest extends AbstractProviderLiveTest { - private final TlemProvider provider = new TlemProvider(); + public TlemProviderLiveTest() + { + super(new TlemProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,11 +76,11 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), - null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/TlseProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlseProviderLiveTest.java index b42ce2ed..f77d1bab 100644 --- a/enabler/test/de/schildbach/pte/live/TlseProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TlseProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class TlseProviderLiveTest extends AbstractProviderLiveTest { - private final TlseProvider provider = new TlseProvider(); + public TlseProviderLiveTest() + { + super(new TlseProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,11 +76,11 @@ public class TlseProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), - null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java index 3108386e..60013cac 100644 --- a/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class TlswProviderLiveTest extends AbstractProviderLiveTest { - private final TlswProvider provider = new TlswProvider(); + public TlswProviderLiveTest() + { + super(new TlswProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,10 +76,10 @@ public class TlswProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "70003023"), null, new Location( + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 0, null, "70003023"), null, new Location( LocationType.STATION, 0, null, "70003025"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java index 40824ac2..b3280013 100644 --- a/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VagfrProviderLiveTest extends AbstractProviderLiveTest { - private final VagfrProvider provider = new VagfrProvider(); + public VagfrProviderLiveTest() + { + super(new VagfrProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,10 +76,10 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java index 60bae8fd..d6f1eec3 100644 --- a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VbbProviderLiveTest extends AbstractProviderLiveTest { - private VbbProvider provider = new VbbProvider(); + public VbbProviderLiveTest() + { + super(new VbbProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,69 +76,69 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), - null, new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), null, + new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); - final QueryConnectionsResult earlierResult = queryMoreConnections(provider, laterResult.context, false); + final QueryConnectionsResult earlierResult = queryMoreConnections(laterResult.context, false); System.out.println(earlierResult); } @Test public void shortViaConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenCoordinates() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void viaConnectionBetweenCoordinates() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), - new Location(LocationType.ADDRESS, 0, 52479868, 13324247, null, null), new Location(LocationType.ADDRESS, 0, 52513639, 13568648, - null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void viaConnectionBetweenAddresses() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.ADDRESS, 0, null, + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java index 6cbf50a5..913c9fb3 100644 --- a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VblProviderLiveTest extends AbstractProviderLiveTest { - private final VblProvider provider = new VblProvider(); + public VblProviderLiveTest() + { + super(new VblProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,10 +84,10 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java index b2b0e523..6b1d3023 100644 --- a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java @@ -38,7 +38,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VbnProviderLiveTest extends AbstractProviderLiveTest { - private final VbnProvider provider = new VbnProvider(); + public VbnProviderLiveTest() + { + super(new VbnProvider()); + } @Test public void nearbyStations() throws Exception @@ -75,20 +78,19 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8096109, null, "Oldenburg"), null, - new Location(LocationType.STATION, 625398, null, "Bremerhaven"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 8096109, null, "Oldenburg"), null, new Location( + LocationType.STATION, 625398, null, "Bremerhaven"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); assertEquals(QueryConnectionsResult.Status.OK, result.status); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } @Test public void connectionDateOutsideTimetablePeriod() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8096109, null, "Oldenburg"), null, - new Location(LocationType.STATION, 625398, null, "Bremerhaven"), new Date(1155822689759l), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 8096109, null, "Oldenburg"), null, new Location( + LocationType.STATION, 625398, null, "Bremerhaven"), new Date(1155822689759l), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); assertEquals(QueryConnectionsResult.Status.INVALID_DATE, result.status); } diff --git a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java index f8b67f70..8d21b1c9 100644 --- a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VgnProviderLiveTest extends AbstractProviderLiveTest { - private final VgnProvider provider = new VgnProvider(Secrets.VGN_API_BASE); + public VgnProviderLiveTest() + { + super(new VgnProvider(Secrets.VGN_API_BASE)); + } @Test public void nearbyStations() throws Exception @@ -81,11 +84,10 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 451, "Nürnberg", "Ostring"), null, - new Location(LocationType.STATION, 510, "Nürnberg", "Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 451, "Nürnberg", "Ostring"), null, new Location( + LocationType.STATION, 510, "Nürnberg", "Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java index dbc38ebf..5c445967 100644 --- a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VgsProviderLiveTest extends AbstractProviderLiveTest { - private final VgsProvider provider = new VgsProvider(); + public VgsProviderLiveTest() + { + super(new VgsProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,10 +76,10 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java index c653ffaa..a3d2c177 100644 --- a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VmobilProviderLiveTest extends AbstractProviderLiveTest { - private final VmobilProvider provider = new VmobilProvider(); + public VmobilProviderLiveTest() + { + super(new VmobilProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,10 +84,10 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java index 61abbd8b..c153a5e2 100644 --- a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VmsProviderLiveTest extends AbstractProviderLiveTest { - private final VmsProvider provider = new VmsProvider(); + public VmsProviderLiveTest() + { + super(new VmsProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,10 +76,10 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java index 9e688978..914157a9 100644 --- a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VmvProviderLiveTest extends AbstractProviderLiveTest { - private final VmvProvider provider = new VmvProvider(); + public VmvProviderLiveTest() + { + super(new VmvProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,10 +76,10 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java index 54e7b2bd..4e67900d 100644 --- a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VorProviderLiveTest extends AbstractProviderLiveTest { - private final VorProvider provider = new VorProvider(); + public VorProviderLiveTest() + { + super(new VorProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,10 +84,10 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java index f0f6dea8..4e1c013f 100644 --- a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VrnProviderLiveTest extends AbstractProviderLiveTest { - private final VrnProvider provider = new VrnProvider(); + public VrnProviderLiveTest() + { + super(new VrnProvider()); + } @Test public void nearbyStations() throws Exception @@ -105,10 +108,10 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java index edbf9534..5153bd13 100644 --- a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VrrProviderLiveTest extends AbstractProviderLiveTest { - private final VrrProvider provider = new VrrProvider(); + public VrrProviderLiveTest() + { + super(new VrrProvider()); + } @Test public void nearbyStations() throws Exception @@ -97,11 +100,11 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 20009289, "Essen", "Hauptbahnhof"), null, + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 20009289, "Essen", "Hauptbahnhof"), null, new Location(LocationType.STATION, 20009161, "Essen", "Bismarckplatz"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java index 40edceaa..0cc85455 100644 --- a/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VrtProviderLiveTest extends AbstractProviderLiveTest { - private final VrtProvider provider = new VrtProvider(); + public VrtProviderLiveTest() + { + super(new VrtProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,11 +76,10 @@ public class VrtProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 17002402, null, "Bahnhof"), null, - new Location(LocationType.STATION, 17009001, null, "Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 17002402, null, "Bahnhof"), null, new Location( + LocationType.STATION, 17009001, null, "Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java index 321c0a9e..fe7dccee 100644 --- a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VvmProviderLiveTest extends AbstractProviderLiveTest { - private final VvmProvider provider = new VvmProvider(); + public VvmProviderLiveTest() + { + super(new VvmProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,10 +84,10 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java index 85399414..3da66675 100644 --- a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VvoProviderLiveTest extends AbstractProviderLiveTest { - private final VvoProvider provider = new VvoProvider(); + public VvoProviderLiveTest() + { + super(new VvoProvider()); + } @Test public void nearbyStations() throws Exception @@ -73,10 +76,10 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java index a7fd8758..d45a0fd4 100644 --- a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VvsProviderLiveTest extends AbstractProviderLiveTest { - private final VvsProvider provider = new VvsProvider(); + public VvsProviderLiveTest() + { + super(new VvsProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,10 +84,10 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java index 2a43983b..0940957a 100644 --- a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VvtProviderLiveTest extends AbstractProviderLiveTest { - private final VvtProvider provider = new VvtProvider(); + public VvtProviderLiveTest() + { + super(new VvtProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,10 +84,10 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java index 5fdaafd9..c02918dc 100644 --- a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class VvvProviderLiveTest extends AbstractProviderLiveTest { - private final VvvProvider provider = new VvvProvider(); + public VvvProviderLiveTest() + { + super(new VvvProvider()); + } @Test public void nearbyStations() throws Exception @@ -81,10 +84,10 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 0, null, "Hauptwache"), null, - new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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 laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java index 005a7c48..ace12637 100644 --- a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java @@ -36,7 +36,10 @@ import de.schildbach.pte.dto.QueryDeparturesResult; */ public class ZvvProviderLiveTest extends AbstractProviderLiveTest { - private final ZvvProvider provider = new ZvvProvider(); + public ZvvProviderLiveTest() + { + super(new ZvvProvider()); + } @Test public void nearbyStationsByStation() throws Exception @@ -73,11 +76,10 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(provider, new Location(LocationType.STATION, 8503000, null, "Zürich HB"), null, - new Location(LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryConnectionsResult result = 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, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true); + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult); } }