mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-20 01:10:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate location IDs from int to String.

Browse source
This commit is contained in:
Andreas Schildbach 2014-04-16 16:31:04 +02:00
parent 069686c746
commit d8f3dcaf6c
111 changed files with 678 additions and 677 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,7 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 740), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "740"), 0, 0);
print(result);
}
@ -62,7 +62,7 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(740, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("740", 0, false);
print(result);
}
@ -86,8 +86,8 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(
LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Hauptwache"), null, new Location(
LocationType.STATION, null, null, "Südbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -48,7 +48,7 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 100), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "100"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(100, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("100", 0, false);
print(result);
}
@ -88,8 +88,8 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 101, null, "Königsplatz"), null, new Location(
LocationType.STATION, 100, null, "Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "101", null, "Königsplatz"), null, new Location(
LocationType.STATION, "100", null, "Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -47,7 +47,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 692991), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "692991"), 0, 0);
print(result);
}
@ -63,7 +63,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(692991, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("692991", 0, false);
print(result);
}
@ -99,8 +99,8 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8011160, null, "Berlin Hbf"), null, new Location(
LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8011160", null, "Berlin Hbf"), null, new Location(
LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -115,9 +115,10 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void slowTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 732655, 52535576, 13422171, null, "Marienburger Str., Berlin"),
null, new Location(LocationType.STATION, 623234, 48000221, 11342490, null, "Tutzinger-Hof-Platz, Starnberg"), new Date(), true,
Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(
new Location(LocationType.STATION, "732655", 52535576, 13422171, null, "Marienburger Str., Berlin"), null, new Location(
LocationType.STATION, "623234", 48000221, 11342490, null, "Tutzinger-Hof-Platz, Starnberg"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
if (!result.context.canQueryLater())
@ -130,8 +131,8 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void noTrips() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 513729, null, "Schillerplatz, Kaiserslautern"), null,
new Location(LocationType.STATION, 403631, null, "Trippstadt Grundschule"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "513729", null, "Schillerplatz, Kaiserslautern"), null,
new Location(LocationType.STATION, "403631", null, "Trippstadt Grundschule"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
}
@ -139,8 +140,8 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripWithFootway() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 52517139, 13388749, null,
"Berlin - Mitte, Unter den Linden 24"), null, new Location(LocationType.ADDRESS, 0, 47994243, 11338543, null,
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52517139, 13388749, null,
"Berlin - Mitte, Unter den Linden 24"), null, new Location(LocationType.ADDRESS, null, 47994243, 11338543, null,
"Starnberg, Possenhofener Straße 13"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
@ -154,8 +155,8 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripsTooClose() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"), null, new Location(
LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8010205", null, "Leipzig Hbf"), null, new Location(
LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.TOO_CLOSE, result.status);
@ -164,8 +165,8 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripsInvalidDate() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8011160, null, "Berlin Hbf"), null, new Location(
LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(0), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8011160", null, "Berlin Hbf"), null, new Location(
LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(0), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.INVALID_DATE, result.status);

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

@ -47,7 +47,7 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 3001459), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "3001459"), 0, 0);
print(result);
}
@ -63,13 +63,13 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult munichOstbahnhof = provider.queryDepartures(80000793, 0, false);
final QueryDeparturesResult munichOstbahnhof = provider.queryDepartures("80000793", 0, false);
print(munichOstbahnhof);
final QueryDeparturesResult munichHauptbahnhof = provider.queryDepartures(80000689, 0, false);
final QueryDeparturesResult munichHauptbahnhof = provider.queryDepartures("80000689", 0, false);
print(munichHauptbahnhof);
final QueryDeparturesResult nurembergHauptbahnhof = provider.queryDepartures(80001020, 0, false);
final QueryDeparturesResult nurembergHauptbahnhof = provider.queryDepartures("80001020", 0, false);
print(nurembergHauptbahnhof);
}
@ -101,20 +101,20 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest
public void autocompleteLocal() throws Exception
{
final List<Location> autocompleteRegensburg = provider.autocompleteStations("Regensburg");
assertEquals(80001083, autocompleteRegensburg.iterator().next().id);
assertEquals("80001083", autocompleteRegensburg.iterator().next().id);
final List<Location> autocompleteMunich = provider.autocompleteStations("München");
assertEquals(80000689, autocompleteMunich.iterator().next().id);
assertEquals("80000689", autocompleteMunich.iterator().next().id);
final List<Location> autocompleteNuremberg = provider.autocompleteStations("Nürnberg");
assertEquals(80001020, autocompleteNuremberg.iterator().next().id);
assertEquals("80001020", autocompleteNuremberg.iterator().next().id);
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 80000793, "München", "Ostbahnhof"), null, new Location(
LocationType.STATION, 80000799, "München", "Pasing"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "80000793", "München", "Ostbahnhof"), null, new Location(
LocationType.STATION, "80000799", "München", "Pasing"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -123,8 +123,9 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest
@Test
public void longTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 1005530, "Starnberg", "Arbeitsamt"), null, new Location(
LocationType.STATION, 3001459, "Nürnberg", "Fallrohrstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1005530", "Starnberg", "Arbeitsamt"), null, new Location(
LocationType.STATION, "3001459", "Nürnberg", "Fallrohrstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
// seems like there are no more trips all the time
}
@ -132,8 +133,8 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenCoordinates() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 48165238, 11577473), null, new Location(
LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48165238, 11577473), null, new Location(
LocationType.ADDRESS, null, 47987199, 11326532), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -142,8 +143,8 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenCoordinateAndStation() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 48238341, 11478230), null, new Location(
LocationType.STATION, 80000793, "München", "Ostbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48238341, 11478230), null, new Location(
LocationType.STATION, "80000793", "München", "Ostbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -152,8 +153,8 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenAddresses() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, null, "München, Maximilianstr. 1"), null, new Location(
LocationType.ADDRESS, 0, null, "Starnberg, Jahnstraße 50"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, null, "München, Maximilianstr. 1"), null, new Location(
LocationType.ADDRESS, null, null, "Starnberg, Jahnstraße 50"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -162,9 +163,9 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenStationAndAddress() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 1001220, null, "Josephsburg"), null, new Location(
LocationType.ADDRESS, 0, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1001220", null, "Josephsburg"), null, new Location(
LocationType.ADDRESS, null, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -48,7 +48,7 @@ public class BsagProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 28000257), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "28000257"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class BsagProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(28003375, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("28003375", 0, false);
print(result);
}
@ -88,8 +88,8 @@ public class BsagProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 28000257, null, "Bremen, Hauptbahnhof"), null, new Location(
LocationType.STATION, 28000512, null, "Herdentor"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "28000257", null, "Bremen, Hauptbahnhof"), null, new Location(
LocationType.STATION, "28000512", null, "Herdentor"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -50,7 +50,7 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 26000178), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "26000178"), 0, 0);
print(result);
}
@ -66,7 +66,7 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(26000256, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("26000256", 0, false);
print(result);
}
@ -92,14 +92,14 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest
{
final List<Location> braunschweigAutocompletes = provider.autocompleteStations("Braunschweig Rhönweg");
print(braunschweigAutocompletes);
assertThat(braunschweigAutocompletes, hasItem(new Location(LocationType.STATION, 26000351)));
assertThat(braunschweigAutocompletes, hasItem(new Location(LocationType.STATION, "26000351")));
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 26000178, null, "Hauptbahnhof"), null, new Location(
LocationType.STATION, 26000322, null, "Packhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "26000178", null, "Hauptbahnhof"), null, new Location(
LocationType.STATION, "26000322", null, "Packhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -48,7 +48,7 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 10000), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "10000"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(10000, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("10000", 0, false);
print(result);
}
@ -88,8 +88,8 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 10000, null, "Bahnhof"), null, new Location(
LocationType.STATION, 86, null, "Markthalle"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "10000", null, "Bahnhof"), null, new Location(
LocationType.STATION, "86", null, "Markthalle"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -48,7 +48,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 9220302), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "9220302"), 0, 0);
assertEquals(NearbyStationsResult.Status.OK, result.status);
print(result);
}
@ -64,18 +64,18 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStationsInvalidStation() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 2449475), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "2449475"), 0, 0);
assertEquals(NearbyStationsResult.Status.INVALID_STATION, result.status);
}
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult resultLive = provider.queryDepartures(309557, 0, false);
final QueryDeparturesResult resultLive = provider.queryDepartures("309557", 0, false);
assertEquals(QueryDeparturesResult.Status.OK, resultLive.status);
System.out.println(resultLive.stationDepartures);
final QueryDeparturesResult resultPlan = provider.queryDepartures(9100003, 0, false);
final QueryDeparturesResult resultPlan = provider.queryDepartures("9100003", 0, false);
assertEquals(QueryDeparturesResult.Status.OK, resultPlan.status);
System.out.println(resultPlan.stationDepartures);
}
@ -83,10 +83,10 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDeparturesInvalidStation() throws Exception
{
final QueryDeparturesResult resultLive = provider.queryDepartures(111111, 0, false);
final QueryDeparturesResult resultLive = provider.queryDepartures("111111", 0, false);
assertEquals(QueryDeparturesResult.Status.INVALID_STATION, resultLive.status);
final QueryDeparturesResult resultPlan = provider.queryDepartures(2449475, 0, false);
final QueryDeparturesResult resultPlan = provider.queryDepartures("2449475", 0, false);
assertEquals(QueryDeparturesResult.Status.INVALID_STATION, resultPlan.status);
}
@ -121,8 +121,8 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), null, new Location(
LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "9056102", "Berlin", "Nollendorfplatz"), null, new Location(
LocationType.STATION, "9013103", "Berlin", "Prinzenstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -137,8 +137,8 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortViaTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), new Location(
LocationType.STATION, 9044202, "Berlin", "Bundesplatz"), new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"),
final QueryTripsResult result = queryTrips(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, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
@ -148,8 +148,8 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenCoordinates() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), null, new Location(
LocationType.ADDRESS, 0, 52513639, 13568648, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52501507, 13357026, null, null), null, new Location(
LocationType.ADDRESS, null, 52513639, 13568648, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -158,8 +158,8 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenCoordinatesAndAddresses() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 52536099, 13426309, null,
"Christburger Straße 1, 10405 Berlin, Deutschland"), null, new Location(LocationType.ADDRESS, 0, 52486400, 13350744, null,
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52536099, 13426309, null,
"Christburger Straße 1, 10405 Berlin, Deutschland"), null, new Location(LocationType.ADDRESS, null, 52486400, 13350744, null,
"Eisenacher Straße 70, 10823 Berlin, Deutschland"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
@ -169,9 +169,10 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void viaTripBetweenCoordinates() throws Exception
{
final QueryTripsResult result = queryTrips(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, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52501507, 13357026, null, null), new Location(
LocationType.ADDRESS, null, 52479868, 13324247, null, null),
new Location(LocationType.ADDRESS, null, 52513639, 13568648, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -180,8 +181,8 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenAddresses() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 52479663, 13324278, "10715 Berlin-Wilmersdorf",
"Weimarische Str. 7"), null, new Location(LocationType.ADDRESS, 0, 52541536, 13421290, "10437 Berlin-Prenzlauer Berg",
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52479663, 13324278, "10715 Berlin-Wilmersdorf",
"Weimarische Str. 7"), null, new Location(LocationType.ADDRESS, null, 52541536, 13421290, "10437 Berlin-Prenzlauer Berg",
"Göhrener Str. 5"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
@ -191,9 +192,9 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void viaTripBetweenAddresses() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 52479663, 13324278, "10715 Berlin-Wilmersdorf",
"Weimarische Str. 7"), new Location(LocationType.ADDRESS, 0, 52527872, 13381657, "10115 Berlin-Mitte", "Hannoversche Str. 20"),
new Location(LocationType.ADDRESS, 0, 52526029, 13399878, "10178 Berlin-Mitte", "Sophienstr. 24"), new Date(), true, Product.ALL,
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52479663, 13324278, "10715 Berlin-Wilmersdorf",
"Weimarische Str. 7"), new Location(LocationType.ADDRESS, null, 52527872, 13381657, "10115 Berlin-Mitte", "Hannoversche Str. 20"),
new Location(LocationType.ADDRESS, null, 52526029, 13399878, "10178 Berlin-Mitte", "Sophienstr. 24"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
@ -203,12 +204,12 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void testStationIdReverse() throws Exception
{
Assert.assertEquals(BvgProvider.migrateStationIdReverse(101000316), 100316);
Assert.assertEquals(BvgProvider.migrateStationIdReverse(301000316), 300316);
Assert.assertEquals(BvgProvider.migrateStationIdReverse("101000316"), "100316");
Assert.assertEquals(BvgProvider.migrateStationIdReverse("301000316"), "300316");
// no conversions
Assert.assertEquals(BvgProvider.migrateStationIdReverse(102000316), 102000316);
Assert.assertEquals(BvgProvider.migrateStationIdReverse(1101000316), 1101000316);
Assert.assertEquals(BvgProvider.migrateStationIdReverse(11000316), 11000316);
Assert.assertEquals(BvgProvider.migrateStationIdReverse("102000316"), "102000316");
Assert.assertEquals(BvgProvider.migrateStationIdReverse("1101000316"), "1101000316");
Assert.assertEquals(BvgProvider.migrateStationIdReverse("11000316"), "11000316");
}
}

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

@ -48,7 +48,7 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 90001611), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "90001611"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(90001611, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("90001611", 0, false);
print(result);
}
@ -88,8 +88,8 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 9001011, null, "Justizgebäude"), null, new Location(
LocationType.STATION, 2504524, null, "Theater"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "9001011", null, "Justizgebäude"), null, new Location(
LocationType.STATION, "2504524", null, "Theater"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -45,7 +45,7 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 8600858), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8600858"), 0, 0);
print(result);
}
@ -61,7 +61,7 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(8600858, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("8600858", 0, false);
print(result);
}
@ -77,8 +77,8 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 900000011, null, "Copenhagen Airport"), null, new Location(
LocationType.STATION, 551922500, null, "Billund Airport"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "900000011", null, "Copenhagen Airport"), null, new Location(
LocationType.STATION, "551922500", null, "Billund Airport"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -47,7 +47,7 @@ public class DubProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 3500131), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "3500131"), 0, 0);
print(result);
}
@ -71,8 +71,8 @@ public class DubProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 3505565, null, "Airport Terminal 1, Arrival"), null,
new Location(LocationType.STATION, 3505445, null, "Airport Terminal 3"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3505565", null, "Airport Terminal 1, Arrival"), null,
new Location(LocationType.STATION, "3505445", null, "Airport Terminal 3"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -45,7 +45,7 @@ public class EireannProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 8013500), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8013500"), 0, 0);
System.out.println(result.status + " " + result.stations.size() + " " + result.stations);
}
@ -61,7 +61,7 @@ public class EireannProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(8013500, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("8013500", 0, false);
print(result);
}
@ -93,8 +93,8 @@ public class EireannProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8052281, null, "Dublin Rd (GMIT)"), null, new Location(
LocationType.STATION, 8013100, null, "Dublin Airport (Atrium Road)"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8052281", null, "Dublin Rd (GMIT)"), null, new Location(
LocationType.STATION, "8013100", null, "Dublin Airport (Atrium Road)"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);

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

@ -48,7 +48,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 25000031), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "25000031"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(25000031, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("25000031", 0, false);
print(result);
}
@ -112,16 +112,16 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest
@Test
public void incompleteTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, 0, null, "hann"), null, new Location(LocationType.ANY, 0, null,
"laat"), new Date(), true, Product.ALL, WalkSpeed.FAST, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "hann"), null, new Location(LocationType.ANY, null,
null, "laat"), new Date(), true, Product.ALL, WalkSpeed.FAST, Accessibility.NEUTRAL);
System.out.println(result);
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 25000031, null, "Hannover Hauptbahnhof"), null, new Location(
LocationType.STATION, 25001141, null, "Hannover Bismarckstraße"), new Date(), true, Product.ALL, WalkSpeed.FAST,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "25000031", null, "Hannover Hauptbahnhof"), null, new Location(
LocationType.STATION, "25001141", null, "Hannover Bismarckstraße"), new Date(), true, Product.ALL, WalkSpeed.FAST,
Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
@ -149,8 +149,8 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenAnyAndAddress() throws Exception
{
final QueryTripsResult result = queryTrips(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, Product.ALL,
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, 53069619, 8799202, null, "bremen, neustadtswall 12"), null,
new Location(LocationType.ADDRESS, null, 53104124, 8788575, null, "Bremen Glücksburger Straße 37"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
@ -160,8 +160,8 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenAddresses() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 53622859, 10133545, null,
"Zamenhofweg 14, 22159 Hamburg, Deutschland"), null, new Location(LocationType.ADDRESS, 0, 53734260, 9674990, null,
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 53622859, 10133545, null,
"Zamenhofweg 14, 22159 Hamburg, Deutschland"), null, new Location(LocationType.ADDRESS, null, 53734260, 9674990, null,
"Lehmkuhlen 5, 25337 Elmshorn, Deutschland"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);

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

@ -45,7 +45,7 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 80301), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "80301"), 0, 0);
print(result);
}
@ -61,7 +61,7 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(80301, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("80301", 0, false);
print(result);
}
@ -77,8 +77,8 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 80302, null, "Ingolstadt, Hauptbahnhof Stadteinwärts"), null,
new Location(LocationType.STATION, 181102, null, "Elisabethstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "80302", null, "Ingolstadt, Hauptbahnhof Stadteinwärts"), null,
new Location(LocationType.STATION, "181102", null, "Elisabethstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);

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

@ -48,7 +48,7 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 60401187), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "60401187"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(60401187, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("60401187", 0, false);
print(result);
}
@ -88,8 +88,8 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 60466402, null, "Kochstraße"), null, new Location(
LocationType.STATION, 60461679, null, "Messe/Zeughaus"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60466402", null, "Kochstraße"), null, new Location(
LocationType.STATION, "60461679", null, "Messe/Zeughaus"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -45,7 +45,7 @@ public class JetProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 1055), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "1055"), 0, 0);
System.out.println(result.status + " " + result.stations.size() + " " + result.stations);
}
@ -61,13 +61,13 @@ public class JetProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result1 = provider.queryDepartures(568, 0, false);
final QueryDeparturesResult result1 = provider.queryDepartures("568", 0, false);
print(result1);
final QueryDeparturesResult result2 = provider.queryDepartures(1055, 0, false);
final QueryDeparturesResult result2 = provider.queryDepartures("1055", 0, false);
print(result2);
final QueryDeparturesResult result3 = provider.queryDepartures(90010, 0, false);
final QueryDeparturesResult result3 = provider.queryDepartures("90010", 0, false);
print(result3);
}
@ -82,8 +82,8 @@ public class JetProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortConnection() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 1055, null, null), null, new Location(
LocationType.STATION, 90010, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1055", null, null), null, new Location(LocationType.STATION,
"90010", null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -48,7 +48,7 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 7000090), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "7000090"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(7000090, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("7000090", 0, false);
print(result);
}
@ -88,8 +88,8 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 7000070, 49009208, 8404126, "Karlsruhe",
"Marktplatz (Pyramide)"), null, new Location(LocationType.STATION, 7000002, 49009392, 8409086, "Karlsruhe",
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "7000070", 49009208, 8404126, "Karlsruhe",
"Marktplatz (Pyramide)"), null, new Location(LocationType.STATION, "7000002", 49009392, 8409086, "Karlsruhe",
"Kronenplatz (Kaiserstr.)"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
@ -117,8 +117,8 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenAddresses() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 48985089, 8402709, null,
"Konstanzer Straße 17, 76199 Karlsruhe, Deutschland"), null, new Location(LocationType.ADDRESS, 0, 49007706, 8356358, null,
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48985089, 8402709, null,
"Konstanzer Straße 17, 76199 Karlsruhe, Deutschland"), null, new Location(LocationType.ADDRESS, null, 49007706, 8356358, null,
"Durmersheimer Straße 6, 76185 Karlsruhe, Deutschland"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);

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

@ -48,7 +48,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 60500090), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "60500090"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(60501720, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("60501720", 0, false);
System.out.println(result);
}
@ -103,16 +103,16 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest
@Test
public void incompleteTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, 0, null, "linz"), null, new Location(LocationType.ANY, 0, null,
"gel"), new Date(), true, Product.ALL, WalkSpeed.FAST, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "linz"), null, new Location(LocationType.ANY, null,
null, "gel"), new Date(), true, Product.ALL, WalkSpeed.FAST, Accessibility.NEUTRAL);
System.out.println(result);
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 0, null, "Linz Hauptbahnhof"), null, new Location(
LocationType.STATION, 0, null, "Linz Auwiesen"), new Date(), true, Product.ALL, WalkSpeed.FAST, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Linz Hauptbahnhof"), null, new Location(
LocationType.STATION, null, null, "Linz Auwiesen"), new Date(), true, Product.ALL, WalkSpeed.FAST, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);
@ -139,8 +139,8 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest
@Test
public void longTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 0, null, "Linz Auwiesen"), null, new Location(
LocationType.STATION, 0, null, "Linz Hafen"), new Date(), true, Product.ALL, WalkSpeed.SLOW, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Linz Auwiesen"), null, new Location(
LocationType.STATION, null, null, "Linz Hafen"), new Date(), true, Product.ALL, WalkSpeed.SLOW, Accessibility.NEUTRAL);
System.out.println(result);
// final QueryTripsResult laterResult = queryMoreTrips(provider, result.context, true);
// System.out.println(laterResult);

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

@ -45,7 +45,7 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 120405001), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "120405001"), 0, 0);
print(result);
}
@ -61,7 +61,7 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(120405001, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("120405001", 0, false);
print(result);
}
@ -77,8 +77,8 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 200416001, null, "Cité Aéroport"), null, new Location(
LocationType.STATION, 200405035, "Luxembourg", "Gare Centrale"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "200416001", null, "Cité Aéroport"), null, new Location(
LocationType.STATION, "200405035", "Luxembourg", "Gare Centrale"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
@ -88,9 +88,9 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest
@Test
public void addressTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 49611610, 6130265, null, "Luxembourg, Rue Génistre 2"),
null, new Location(LocationType.STATION, 200405035, "Luxembourg", "Gare Centrale"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 49611610, 6130265, null, "Luxembourg, Rue Génistre 2"),
null, new Location(LocationType.STATION, "200405035", "Luxembourg", "Gare Centrale"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -48,7 +48,7 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 10001167), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "10001167"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(10001167, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("10001167", 0, false);
print(result);
}
@ -80,8 +80,8 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 10002717, "Melbourne City", "6-Franklin St/Elizabeth St"),
null, new Location(LocationType.STATION, 10002722, "Melbourne City", "1-Flinders Street Railway Station/Elizabeth St"), new Date(),
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "10002717", "Melbourne City", "6-Franklin St/Elizabeth St"),
null, new Location(LocationType.STATION, "10002722", "Melbourne City", "1-Flinders Street Railway Station/Elizabeth St"), new Date(),
true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -50,7 +50,7 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 24200006), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "24200006"), 0, 0);
print(result);
}
@ -66,7 +66,7 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(3, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("3", 0, false);
print(result);
}
@ -92,26 +92,27 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest
{
final List<Location> luedenscheidAutocompletes = provider.autocompleteStations("Lüdenscheid Freibad");
print(luedenscheidAutocompletes);
assertThat(luedenscheidAutocompletes, hasItem(new Location(LocationType.STATION, 24200153)));
assertThat(luedenscheidAutocompletes, hasItem(new Location(LocationType.STATION, "24200153")));
final List<Location> iserlohnAutocompletes = provider.autocompleteStations("Iserlohn Rathaus");
print(iserlohnAutocompletes);
assertThat(iserlohnAutocompletes, hasItem(new Location(LocationType.STATION, 24200764)));
assertThat(iserlohnAutocompletes, hasItem(new Location(LocationType.STATION, "24200764")));
final List<Location> plettenbergAutocompletes = provider.autocompleteStations("Plettenberg Friedhof");
print(plettenbergAutocompletes);
assertThat(plettenbergAutocompletes, hasItem(new Location(LocationType.STATION, 24202864)));
assertThat(plettenbergAutocompletes, hasItem(new Location(LocationType.STATION, "24202864")));
final List<Location> mendenAutocompletes = provider.autocompleteStations("Menden Am Gillfeld");
print(mendenAutocompletes);
assertThat(mendenAutocompletes, hasItem(new Location(LocationType.STATION, 24202193)));
assertThat(mendenAutocompletes, hasItem(new Location(LocationType.STATION, "24202193")));
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 24200200, null, "Lüd., Christuskirche"), null, new Location(
LocationType.STATION, 24200032, null, "Lüd., Friedrichstr."), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "24200200", null, "Lüd., Christuskirche"), null, new Location(
LocationType.STATION, "24200032", null, "Lüd., Friedrichstr."), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -49,7 +49,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 350), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "350"), 0, 0);
print(result);
}
@ -65,7 +65,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(2, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("2", 0, false);
assertEquals(QueryDeparturesResult.Status.OK, result.status);
print(result);
@ -74,7 +74,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDeparturesInvalidStation() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(999999, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
}
@ -99,7 +99,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
public void autocompleteLocal() throws Exception
{
final List<Location> autocompletesFraunhoferStr = provider.autocompleteStations("fraunhofer");
assertThat(autocompletesFraunhoferStr, hasItem(new Location(LocationType.STATION, 1000150)));
assertThat(autocompletesFraunhoferStr, hasItem(new Location(LocationType.STATION, "1000150")));
final List<Location> autocompletesHirschgarten = provider.autocompleteStations("Hirschgarten");
assertEquals("München", autocompletesHirschgarten.get(0).place);
@ -114,8 +114,8 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 2, "München", "Marienplatz"), null, new Location(
LocationType.STATION, 10, "München", "Pasing"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "2", "München", "Marienplatz"), null, new Location(
LocationType.STATION, "10", "München", "Pasing"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -126,8 +126,8 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void longTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, 0, null, "Starnberg, Arbeitsamt"), null, new Location(
LocationType.STATION, 0, null, "Ackermannstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Starnberg, Arbeitsamt"), null, new Location(
LocationType.STATION, null, null, "Ackermannstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
// seems like there are no more trips all the time
}
@ -135,8 +135,8 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenCoordinates() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 48165238, 11577473), null, new Location(
LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48165238, 11577473), null, new Location(
LocationType.ADDRESS, null, 47987199, 11326532), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -145,8 +145,8 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenCoordinateAndStation() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 48238341, 11478230), null, new Location(LocationType.ANY, 0,
null, "Ostbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48238341, 11478230), null, new Location(LocationType.ANY,
null, null, "Ostbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -155,8 +155,8 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenAddresses() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, null, "München, Maximilianstr. 1"), null, new Location(
LocationType.ADDRESS, 0, null, "Starnberg, Jahnstraße 50"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, null, "München, Maximilianstr. 1"), null, new Location(
LocationType.ADDRESS, null, null, "Starnberg, Jahnstraße 50"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -165,9 +165,9 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenStationAndAddress() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 1220, null, "Josephsburg"), null, new Location(
LocationType.ADDRESS, 0, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1220", null, "Josephsburg"), null, new Location(
LocationType.ADDRESS, null, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -176,13 +176,13 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryTripInvalidStation() throws Exception
{
final QueryTripsResult result1 = queryTrips(new Location(LocationType.STATION, 2, "München", "Marienplatz"), null, new Location(
LocationType.STATION, 99999, 0, 0, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result1 = queryTrips(new Location(LocationType.STATION, "2", "München", "Marienplatz"), null, new Location(
LocationType.STATION, "99999", 0, 0, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
assertEquals(QueryTripsResult.Status.UNKNOWN_TO, result1.status);
final QueryTripsResult result2 = queryTrips(new Location(LocationType.STATION, 99999, 0, 0, null, null), null, new Location(
LocationType.STATION, 2, "München", "Marienplatz"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result2 = queryTrips(new Location(LocationType.STATION, "99999", 0, 0, null, null), null, new Location(
LocationType.STATION, "2", "München", "Marienplatz"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
assertEquals(QueryTripsResult.Status.UNKNOWN_FROM, result2.status);
}

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

@ -48,7 +48,7 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 53019174), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "53019174"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(53019174, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("53019174", 0, false);
print(result);
}
@ -88,8 +88,8 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 3019697, null, "Amberg Kurfürstenbad"), null, new Location(
LocationType.STATION, 3019500, null, "Amberg Bahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3019697", null, "Amberg Kurfürstenbad"), null, new Location(
LocationType.STATION, "3019500", null, "Amberg Bahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -48,7 +48,7 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 13000), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "13000"), 0, 0);
print(result);
}
@ -66,7 +66,7 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(13000, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("13000", 0, false);
print(result);
}
@ -90,8 +90,8 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 11063, null, "Leipzig, Johannisplatz"), null, new Location(
LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "11063", null, "Leipzig, Johannisplatz"), null, new Location(
LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
if (!result.context.canQueryLater())
@ -103,8 +103,8 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void anotherShortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8010205, 51346546, 12383333, null, "Leipzig Hbf"), null,
new Location(LocationType.STATION, 8012183, 51423340, 12223423, null, "Leipzig/Halle Flughafen"), new Date(), true, Product.ALL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8010205", 51346546, 12383333, null, "Leipzig Hbf"), null,
new Location(LocationType.STATION, "8012183", 51423340, 12223423, null, "Leipzig/Halle Flughafen"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
@ -117,8 +117,9 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void outdatedTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 13002, null, "Leipzig, Augustusplatz"), null, new Location(
LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(2011, 1, 1), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "13002", null, "Leipzig, Augustusplatz"), null, new Location(
LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(2011, 1, 1), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
if (!result.context.canQueryLater())
@ -130,8 +131,8 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void ambiguousTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, 0, null, "Platz"), null, new Location(LocationType.STATION,
8010205, null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Platz"), null, new Location(LocationType.STATION,
"8010205", null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
if (!result.context.canQueryLater())
@ -143,8 +144,8 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void sameStationTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"), null, new Location(
LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8010205", null, "Leipzig Hbf"), null, new Location(
LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
if (!result.context.canQueryLater())
@ -156,8 +157,8 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void addressTrip() throws Exception
{
final QueryTripsResult result = queryTrips(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, Product.ALL,
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 51334078, 12478331, "04319 Leipzig-Engelsdorf",
"August-Bebel-Platz"), null, new Location(LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);

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

@ -45,7 +45,7 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 112270), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "112270"), 0, 0);
print(result);
}
@ -61,7 +61,7 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(6735, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("6735", 0, false);
print(result);
}
@ -85,8 +85,8 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8059, null, "Oslo"), null, new Location(LocationType.STATION,
6642, null, "Bergen BGO"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8059", null, "Oslo"), null, new Location(LocationType.STATION,
"6642", null, "Bergen BGO"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -44,7 +44,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 8400058), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8400058"), 0, 0);
print(result);
}
@ -60,7 +60,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(8400058, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("8400058", 0, false);
print(result);
}
@ -84,8 +84,8 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8400058, null, "Amsterdam Centraal"), null, new Location(
LocationType.STATION, 8400061, null, "Amsterdam Zuid"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8400058", null, "Amsterdam Centraal"), null, new Location(
LocationType.STATION, "8400061", null, "Amsterdam Zuid"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL);
System.out.println(result.status + " " + result.trips);
}
@ -93,7 +93,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest
@Test
public void longTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 100024), null, new Location(LocationType.STATION, 103624),
final QueryTripsResult result = queryTrips(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.trips);

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

@ -50,7 +50,7 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 6900001), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "6900001"), 0, 0);
print(result);
}
@ -66,7 +66,7 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(6900001, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("6900001", 0, false);
print(result);
}
@ -92,22 +92,22 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest
{
final List<Location> freiburgAutocompletes = provider.autocompleteStations("Freiburg Hauptbahnhof");
print(freiburgAutocompletes);
assertThat(freiburgAutocompletes, hasItem(new Location(LocationType.STATION, 6906508)));
assertThat(freiburgAutocompletes, hasItem(new Location(LocationType.STATION, "6906508")));
final List<Location> baselAutocompletes = provider.autocompleteStations("Basel");
print(baselAutocompletes);
assertThat(baselAutocompletes, hasItem(new Location(LocationType.STATION, 51000007)));
assertThat(baselAutocompletes, hasItem(new Location(LocationType.STATION, "51000007")));
final List<Location> constanceAutocompletes = provider.autocompleteStations("Konstanz");
print(constanceAutocompletes);
assertThat(constanceAutocompletes, hasItem(new Location(LocationType.STATION, 8706554)));
assertThat(constanceAutocompletes, hasItem(new Location(LocationType.STATION, "8706554")));
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 17002402, null, "Bahnhof"), null, new Location(
LocationType.STATION, 17009001, null, "Bahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "17002402", null, "Bahnhof"), null, new Location(
LocationType.STATION, "17009001", null, "Bahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -49,7 +49,7 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 3000001), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "3000001"), 0, 0);
print(result);
}
@ -73,16 +73,16 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(3000408, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("3000408", 0, false);
print(result);
final QueryDeparturesResult result2 = provider.queryDepartures(3000010, 0, false);
final QueryDeparturesResult result2 = provider.queryDepartures("3000010", 0, false);
print(result2);
final QueryDeparturesResult result3 = provider.queryDepartures(3015989, 0, false);
final QueryDeparturesResult result3 = provider.queryDepartures("3015989", 0, false);
print(result3);
final QueryDeparturesResult result4 = provider.queryDepartures(3000139, 0, false);
final QueryDeparturesResult result4 = provider.queryDepartures("3000139", 0, false);
print(result4);
}
@ -113,8 +113,8 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 3000001, null, "Hauptwache"), null, new Location(
LocationType.STATION, 3000912, null, "Südbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3000001", null, "Hauptwache"), null, new Location(
LocationType.STATION, "3000912", null, "Südbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);
@ -183,8 +183,8 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTripKassel() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 2200007, null, "Kassel Wilhelmshöhe"), null, new Location(
LocationType.STATION, 2200278, null, "Kassel Wilhelmshöher Weg"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "2200007", null, "Kassel Wilhelmshöhe"), null, new Location(
LocationType.STATION, "2200278", null, "Kassel Wilhelmshöher Weg"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
@ -194,8 +194,8 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void slowTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 3029079, 50017679, 8229480, "Mainz", "An den Dünen"), null,
new Location(LocationType.STATION, 3013508, 50142890, 8895203, "Hanau", "Beethovenplatz"), new Date(), true, Product.ALL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3029079", 50017679, 8229480, "Mainz", "An den Dünen"), null,
new Location(LocationType.STATION, "3013508", 50142890, 8895203, "Hanau", "Beethovenplatz"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.BARRIER_FREE);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
@ -211,16 +211,16 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTripByName() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, 0, null, "Frankfurt Bockenheimer Warte!"), null, new Location(
LocationType.ANY, 0, null, "Frankfurt Hauptbahnhof!"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Frankfurt Bockenheimer Warte!"), null, new Location(
LocationType.ANY, null, null, "Frankfurt Hauptbahnhof!"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
}
@Test
public void tripUsingMuchBuffer() throws IOException
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 50119563, 8697044, null,
"Hegelstrasse, 60316 Frankfurt am Main"), null, new Location(LocationType.ADDRESS, 0, 50100364, 8615193, null,
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 50119563, 8697044, null,
"Hegelstrasse, 60316 Frankfurt am Main"), null, new Location(LocationType.ADDRESS, null, 50100364, 8615193, null,
"Mainzer Landstrasse, Frankfurt"), new Date(1378368840000l), true, Product.ALL, null, null);
System.out.println(result);
@ -234,8 +234,8 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripUsingEvenMoreBuffer() throws IOException
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 3000909, 50094052, 8690923, null, "F Brauerei"), null,
new Location(LocationType.STATION, 3001201, 50119950, 8653924, null, "F Bockenheimer Warte"), new Date(1378368840000l), true,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3000909", 50094052, 8690923, null, "F Brauerei"), null,
new Location(LocationType.STATION, "3001201", 50119950, 8653924, null, "F Bockenheimer Warte"), new Date(1378368840000l), true,
Product.ALL, null, null);
System.out.println(result);

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

@ -48,7 +48,7 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 902006), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "902006"), 0, 0);
print(result);
}
@ -66,7 +66,7 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(902006, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("902006", 0, false);
print(result);
assertEquals(QueryDeparturesResult.Status.OK, result.status);
@ -93,8 +93,8 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 1140101, null, "Linz"), null, new Location(
LocationType.STATION, 1190100, null, "Wien"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1140101", null, "Linz"), null, new Location(
LocationType.STATION, "1190100", null, "Wien"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);
@ -105,8 +105,8 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void slowTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, 0, null, "Ramsen Zoll!"), null, new Location(LocationType.ANY, 0,
null, "Azuga!"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Ramsen Zoll!"), null, new Location(LocationType.ANY,
null, null, "Azuga!"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);
@ -117,8 +117,8 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripWithFootway() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, 0, null, "Graz, Haselweg!"), null, new Location(LocationType.ANY,
0, null, "Innsbruck, Gumppstraße 69!"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Graz, Haselweg!"), null, new Location(
LocationType.ANY, null, null, "Innsbruck, Gumppstraße 69!"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);
@ -129,8 +129,8 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripWithFootway2() throws Exception
{
final QueryTripsResult result = queryTrips(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, Product.ALL, WalkSpeed.NORMAL,
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Wien, Krottenbachstraße 110!"), null, new Location(
LocationType.ADDRESS, null, null, "Wien, Meidlinger Hauptstraße 1!"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -70,8 +70,8 @@ public class PacaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 61088, null, "Eganaude"), null, new Location(
LocationType.STATION, 58617, null, "Place de Gaulle"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "61088", null, "Eganaude"), null, new Location(
LocationType.STATION, "58617", null, "Place de Gaulle"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);
@ -140,8 +140,8 @@ public class PacaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void slowTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 68629, 43441167, 5223055, "MARSEILLE", "Aeroport Hall 3 4"),
null, new Location(LocationType.STATION, 61088, 43623140, 7057545, "BIOT", "Eganaude"), new Date(), true, Product.ALL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "68629", 43441167, 5223055, "MARSEILLE", "Aeroport Hall 3 4"),
null, new Location(LocationType.STATION, "61088", 43623140, 7057545, "BIOT", "Eganaude"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.BARRIER_FREE);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
@ -157,16 +157,16 @@ public class PacaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTripByName() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, 0, null, "Biot, Templiers!"), null, new Location(LocationType.ANY,
0, null, "Eganaude!"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Biot, Templiers!"), null, new Location(
LocationType.ANY, null, null, "Eganaude!"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
}
@Test
public void slowTripPoi() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.POI, 30455, 0, 0, "CANNES", "Cannes"), null, new Location(
LocationType.POI, 30514, 0, 0, "NICE", "Nice"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.POI, "30455", 0, 0, "CANNES", "Cannes"), null, new Location(
LocationType.POI, "30514", 0, 0, "NICE", "Nice"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -45,7 +45,7 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 5100065), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "5100065"), 0, 0);
print(result);
}
@ -61,7 +61,7 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(5100065, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("5100065", 0, false);
print(result);
}
@ -85,8 +85,8 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 5196001, null, "KRAKÓW"), null, new Location(
LocationType.STATION, 5196003, null, "WARSZAWA"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "5196001", null, "KRAKÓW"), null, new Location(
LocationType.STATION, "5196003", null, "WARSZAWA"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -47,7 +47,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 8500010), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8500010"), 0, 0);
System.out.println(result.status + " " + result.stations.size() + " " + result.stations);
}
@ -63,7 +63,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(8588344, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("8588344", 0, false);
print(result);
}
@ -95,8 +95,8 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8503000, null, "Zürich HB"), null, new Location(
LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8503000", null, "Zürich HB"), null, new Location(
LocationType.STATION, "8507785", null, "Bern, Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -105,8 +105,8 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest
@Test
public void slowTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, new Location(
LocationType.ANY, 0, null, "Laconnex, Mollach"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Schocherswil, Alte Post!"), null, new Location(
LocationType.ANY, null, null, "Laconnex, Mollach"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -115,8 +115,9 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripWithFootway() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, null, "Spiez, Seestraße 62"), null, new Location(
LocationType.ADDRESS, 0, null, "Einsiedeln, Erlenmoosweg 24"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, null, "Spiez, Seestraße 62"), null, new Location(
LocationType.ADDRESS, null, null, "Einsiedeln, Erlenmoosweg 24"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -125,9 +126,9 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripFromAddress() throws Exception
{
final QueryTripsResult result = queryTrips(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, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 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, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -136,8 +137,8 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest
@Test
public void viaTrip() throws Exception
{
final QueryTripsResult result = queryTrips(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"),
final QueryTripsResult result = queryTrips(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, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
@ -147,8 +148,8 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest
@Test
public void crossStateTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8000207, null, "Köln Hbf"), null, new Location(
LocationType.STATION, 6096001, null, "DUBLIN"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8000207", null, "Köln Hbf"), null, new Location(
LocationType.STATION, "6096001", null, "DUBLIN"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

40
enabler/test/de/schildbach/pte/live/SadProviderLiveTest.java
View file

@ -82,8 +82,8 @@ public class SadProviderLiveTest extends AbstractProviderLiveTest {
@Test
public void tripWithFootway() throws Exception {
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 0, null, "Bozen Bhf."), null,
new Location(LocationType.STATION, 0, null, "Bundschen"), dateTimeFormat.parse("2012-04-01 12:30:00"), true, null, null,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Bozen Bhf."), null,
new Location(LocationType.STATION, null, null, "Bundschen"), dateTimeFormat.parse("2012-04-01 12:30:00"), true, null, null,
null);
System.out.println(result);
@ -97,8 +97,8 @@ public class SadProviderLiveTest extends AbstractProviderLiveTest {
@Test
public void noTrips() throws Exception {
QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 0, null, "Bozen Bhf."), null,
new Location(LocationType.STATION, 0, null, "Welschnofen"), dateTimeFormat.parse("2012-04-01 22:30:00"), true, null, null,
QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Bozen Bhf."), null,
new Location(LocationType.STATION, null, null, "Welschnofen"), dateTimeFormat.parse("2012-04-01 22:30:00"), true, null, null,
null);
System.out.println(result);
@ -112,8 +112,8 @@ public class SadProviderLiveTest extends AbstractProviderLiveTest {
@Test
public void queryMoreTrips() throws Exception {
// Trips between 05:30 and 10:30
QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 0, null, "Bozen Bhf."), null,
new Location(LocationType.STATION, 0, null, "Welschnofen"), dateTimeFormat.parse("2012-04-01 05:30:00"), true, null, null,
QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Bozen Bhf."), null,
new Location(LocationType.STATION, null, null, "Welschnofen"), dateTimeFormat.parse("2012-04-01 05:30:00"), true, null, null,
null);
System.out.println(result);
@ -146,8 +146,8 @@ public class SadProviderLiveTest extends AbstractProviderLiveTest {
@Test
public void queryAmbiguous() throws Exception {
// No ambiguities
QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 0, null, "Welschn"), null,
new Location(LocationType.STATION, 0, null, "ozen Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null,
QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Welschn"), null,
new Location(LocationType.STATION, null, null, "ozen Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null,
null);
System.out.println(result);
@ -157,8 +157,8 @@ public class SadProviderLiveTest extends AbstractProviderLiveTest {
assertFalse(result.trips.isEmpty());
// Ambiguous departure
result = queryTrips(new Location(LocationType.STATION, 0, null, "Welsch"), null, new Location(LocationType.STATION,
0, null, "ozen Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
result = queryTrips(new Location(LocationType.STATION, null, null, "Welsch"), null, new Location(LocationType.STATION,
null, null, "ozen Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
System.out.println(result);
@ -173,8 +173,8 @@ public class SadProviderLiveTest extends AbstractProviderLiveTest {
assertFalse(result.ambiguousTo.size() > 1);
// Ambiguous arrival
result = queryTrips(new Location(LocationType.STATION, 0, null, "Welschn"), null, new Location(LocationType.STATION,
0, null, "oze"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
result = queryTrips(new Location(LocationType.STATION, null, null, "Welschn"), null, new Location(LocationType.STATION,
null, null, "oze"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
System.out.println(result);
@ -189,8 +189,8 @@ public class SadProviderLiveTest extends AbstractProviderLiveTest {
assertTrue(result.ambiguousTo.size() > 1);
// Ambiguous departure and arrival
result = queryTrips(new Location(LocationType.STATION, 0, null, "Welsch"), null, new Location(LocationType.STATION,
0, null, "oze"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
result = queryTrips(new Location(LocationType.STATION, null, null, "Welsch"), null, new Location(LocationType.STATION,
null, null, "oze"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
System.out.println(result);
@ -208,8 +208,8 @@ public class SadProviderLiveTest extends AbstractProviderLiveTest {
@Test
public void queryUnkown() throws Exception {
// Unknown from
QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 0, null, "Welschnoffen"), null,
new Location(LocationType.STATION, 0, null, "ozen Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null,
QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Welschnoffen"), null,
new Location(LocationType.STATION, null, null, "ozen Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null,
null);
System.out.println(result);
@ -219,8 +219,8 @@ public class SadProviderLiveTest extends AbstractProviderLiveTest {
assertNull(result.trips);
// Unknown to
result = queryTrips(new Location(LocationType.STATION, 0, null, "Welsch"), null, new Location(LocationType.STATION,
0, null, "ozenn Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
result = queryTrips(new Location(LocationType.STATION, null, null, "Welsch"), null, new Location(LocationType.STATION,
null, null, "ozenn Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
System.out.println(result);
@ -229,8 +229,8 @@ public class SadProviderLiveTest extends AbstractProviderLiveTest {
assertNull(result.trips);
// Unknown from and to
result = queryTrips(new Location(LocationType.STATION, 0, null, "Welschnoffen"), null, new Location(
LocationType.STATION, 0, null, "ozenn Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
result = queryTrips(new Location(LocationType.STATION, null, null, "Welschnoffen"), null, new Location(
LocationType.STATION, null, null, "ozenn Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
System.out.println(result);

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

@ -45,7 +45,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 8500010), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8500010"), 0, 0);
System.out.println(result.status + " " + result.stations.size() + " " + result.stations);
}
@ -61,7 +61,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(8500010, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("8500010", 0, false);
print(result);
}
@ -93,8 +93,8 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8503000, null, "Zürich HB"), null, new Location(
LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8503000", null, "Zürich HB"), null, new Location(
LocationType.STATION, "8507785", null, "Bern, Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -103,8 +103,8 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void slowTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, new Location(
LocationType.ANY, 0, null, "Laconnex, Mollach"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Schocherswil, Alte Post!"), null, new Location(
LocationType.ANY, null, null, "Laconnex, Mollach"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -113,8 +113,9 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripWithFootway() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, null, "Spiez, Seestraße 62"), null, new Location(
LocationType.ADDRESS, 0, null, "Einsiedeln, Erlenmoosweg 24"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, null, "Spiez, Seestraße 62"), null, new Location(
LocationType.ADDRESS, null, null, "Einsiedeln, Erlenmoosweg 24"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -123,8 +124,8 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripFromAddress() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, null, "Dorfstrasse 10, Dällikon, Schweiz"), null,
new Location(LocationType.STATION, 8500010, null, "Basel"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, null, "Dorfstrasse 10, Dällikon, Schweiz"), null,
new Location(LocationType.STATION, "8500010", null, "Basel"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -45,7 +45,7 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 7414867), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "7414867"), 0, 0);
print(result);
}
@ -61,7 +61,7 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(7414867, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("7414867", 0, false);
print(result);
}
@ -85,8 +85,8 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 7414867, null, "Luleå Airport"), null, new Location(
LocationType.STATION, 7498000, null, "STOCKHOLM"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "7414867", null, "Luleå Airport"), null, new Location(
LocationType.STATION, "7498000", null, "STOCKHOLM"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -45,7 +45,7 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 2090227), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "2090227"), 0, 0);
print(result);
}
@ -61,7 +61,7 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(2090227, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("2090227", 0, false);
print(result);
}
@ -77,8 +77,8 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 1021532, null, "30th St Station"), null, new Location(
LocationType.STATION, 1001392, null, "15th St Station"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1021532", null, "30th St Station"), null, new Location(
LocationType.STATION, "1001392", null, "15th St Station"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -87,9 +87,9 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest
@Test
public void addressTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 40015670, -75209400, "Philadelphia 19127", "3601 Main St"),
null, new Location(LocationType.STATION, 2090227, null, "Main Street"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(
new Location(LocationType.ADDRESS, null, 40015670, -75209400, "Philadelphia 19127", "3601 Main St"), null, new Location(
LocationType.STATION, "2090227", null, "Main Street"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -48,7 +48,7 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 10001017), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "10001017"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(10001017, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("10001017", 0, false);
print(result);
}
@ -80,10 +80,9 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(
new Location(LocationType.STATION, 10001032, 37784976, -122406784, "San Francisco", "BART Powell"), null, new Location(
LocationType.STATION, 10001026, 37789376, -122401320, "San Francisco", "BART Montgomery"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "10001032", 37784976, -122406784, "San Francisco",
"BART Powell"), null, new Location(LocationType.STATION, "10001026", 37789376, -122401320, "San Francisco", "BART Montgomery"),
new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -45,7 +45,7 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 715210), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "715210"), 0, 0);
print(result);
}
@ -61,7 +61,7 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(715210, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("715210", 0, false);
print(result);
}
@ -93,8 +93,8 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8002547, null, "Flughafen Hamburg"), null, new Location(
LocationType.STATION, 715210, null, "Flughafen, Lübeck"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8002547", null, "Flughafen Hamburg"), null, new Location(
LocationType.STATION, "715210", null, "Flughafen, Lübeck"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -45,7 +45,7 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 8813003), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8813003"), 0, 0);
print(result);
}
@ -61,7 +61,7 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(8813003, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("8813003", 0, false);
print(result);
}
@ -93,8 +93,8 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8821006, "Antwerpen", "Centraal"), null, new Location(
LocationType.STATION, 8813003, "Brussel", "Centraal"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(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.trips);
if (result.context != null)
@ -107,8 +107,8 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void longTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 207280, "Brussel", "Wannecouter"), null, new Location(
LocationType.STATION, 207272, "Brussel", "Stadion"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(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.trips);
if (result.context != null)
@ -121,8 +121,8 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripFromAddress() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, null, "Bruxelles - Haren, Rue Paul Janson 9"), null,
new Location(LocationType.STATION, 8500010, null, "Basel"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, null, "Bruxelles - Haren, Rue Paul Janson 9"), null,
new Location(LocationType.STATION, "8500010", null, "Basel"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result.status + " " + result.trips);
if (result.context != null)

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

@ -45,7 +45,7 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 301109600), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "301109600"), 0, 0);
print(result);
}
@ -61,7 +61,7 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(301109600, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("301109600", 0, false);
print(result);
}
@ -85,8 +85,9 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 200101051, "Stockholm", "T-Centralen"), null, new Location(
LocationType.STATION, 200101221, "Stockholm", "Abrahamsberg"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "200101051", "Stockholm", "T-Centralen"), null, new Location(
LocationType.STATION, "200101221", "Stockholm", "Abrahamsberg"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -95,8 +96,8 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest
@Test
public void addressToStationTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 59360519, 17989266, null, "Sommarvägen 1, Solna"), null,
new Location(LocationType.STATION, 300109205, 59340518, 18081532, "Stockholm", "Stadion"), new Date(), true, Product.ALL,
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 59360519, 17989266, null, "Sommarvägen 1, Solna"), null,
new Location(LocationType.STATION, "300109205", 59340518, 18081532, "Stockholm", "Stadion"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);

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

@ -50,7 +50,7 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 63203040), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "63203040"), 0, 0);
print(result);
}
@ -66,7 +66,7 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(63203040, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("63203040", 0, false);
print(result);
}
@ -92,30 +92,30 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest
{
final List<Location> grazAutocompletes = provider.autocompleteStations("Graz Brauhaus");
print(grazAutocompletes);
assertThat(grazAutocompletes, hasItem(new Location(LocationType.STATION, 63203044)));
assertThat(grazAutocompletes, hasItem(new Location(LocationType.STATION, "63203044")));
final List<Location> leobenAutocompletes = provider.autocompleteStations("Leoben Blockhäuser");
print(leobenAutocompletes);
assertThat(leobenAutocompletes, hasItem(new Location(LocationType.STATION, 63206224)));
assertThat(leobenAutocompletes, hasItem(new Location(LocationType.STATION, "63206224")));
final List<Location> bruckAutocompletes = provider.autocompleteStations("Bruck Hauptplatz");
print(bruckAutocompletes);
assertThat(bruckAutocompletes, hasItem(new Location(LocationType.STATION, 63202063)));
assertThat(bruckAutocompletes, hasItem(new Location(LocationType.STATION, "63202063")));
final List<Location> kindbergAutocompletes = provider.autocompleteStations("Kindberg Friedhof");
print(kindbergAutocompletes);
assertThat(kindbergAutocompletes, hasItem(new Location(LocationType.STATION, 63208877)));
assertThat(kindbergAutocompletes, hasItem(new Location(LocationType.STATION, "63208877")));
final List<Location> mariborAutocompletes = provider.autocompleteStations("Maribor Dravograjska Sokolska");
print(mariborAutocompletes);
assertThat(mariborAutocompletes, hasItem(new Location(LocationType.STATION, 63300136)));
assertThat(mariborAutocompletes, hasItem(new Location(LocationType.STATION, "63300136")));
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 63203040, null, "Graz Hauptbahnhof"), null, new Location(
LocationType.STATION, 63203149, null, "Graz Babenbergerstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "63203040", null, "Graz Hauptbahnhof"), null, new Location(
LocationType.STATION, "63203149", null, "Graz Babenbergerstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -50,7 +50,7 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 60650002), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "60650002"), 0, 0);
print(result);
}
@ -66,7 +66,7 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(60650002, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("60650002", 0, false);
print(result);
}
@ -84,27 +84,27 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest
{
final List<Location> salzburgAutocompletes = provider.autocompleteStations("Salzburg Süd");
print(salzburgAutocompletes);
assertThat(salzburgAutocompletes, hasItem(new Location(LocationType.STATION, 60650458)));
assertThat(salzburgAutocompletes, hasItem(new Location(LocationType.STATION, "60650458")));
final List<Location> strasswalchenAutocompletes = provider.autocompleteStations("Straßwalchen West");
print(strasswalchenAutocompletes);
assertThat(strasswalchenAutocompletes, hasItem(new Location(LocationType.STATION, 60656483)));
assertThat(strasswalchenAutocompletes, hasItem(new Location(LocationType.STATION, "60656483")));
final List<Location> schwarzachAutocompletes = provider.autocompleteStations("Schwarzach Abtsdorf");
print(schwarzachAutocompletes);
assertThat(schwarzachAutocompletes, hasItem(new Location(LocationType.STATION, 60656614)));
assertThat(schwarzachAutocompletes, hasItem(new Location(LocationType.STATION, "60656614")));
final List<Location> trimmelkamAutocompletes = provider.autocompleteStations("Trimmelkam");
print(trimmelkamAutocompletes);
assertThat(trimmelkamAutocompletes, hasItem(new Location(LocationType.STATION, 60640776)));
assertThat(trimmelkamAutocompletes, hasItem(new Location(LocationType.STATION, "60640776")));
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 60650021, 47797036, 13053608, "Salzburg", "Justizgebäude"),
null, new Location(LocationType.STATION, 60650022, 47793760, 13059338, "Salzburg", "Akademiestraße"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60650021", 47797036, 13053608, "Salzburg", "Justizgebäude"),
null, new Location(LocationType.STATION, "60650022", 47793760, 13059338, "Salzburg", "Akademiestraße"), new Date(), true,
Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -48,7 +48,7 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 10101101), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "10101101"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(10101101, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("10101101", 0, false);
print(result);
}
@ -88,8 +88,8 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 10101100, "Sydney", "Central Station"), null, new Location(
LocationType.STATION, 0, "Sydney", "Capitol Square"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "10101100", "Sydney", "Central Station"), null, new Location(
LocationType.STATION, null, "Sydney", "Capitol Square"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -48,7 +48,7 @@ public class TfiProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 51013670), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "51013670"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class TfiProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(51013670, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("51013670", 0, false);
print(result);
}
@ -80,8 +80,8 @@ public class TfiProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 51013670, "Dublin City South",
"O'Connell Bridge (on Lower O'Connell Street)"), null, new Location(LocationType.STATION, 52003679, "Dublin City South",
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "51013670", "Dublin City South",
"O'Connell Bridge (on Lower O'Connell Street)"), null, new Location(LocationType.STATION, "52003679", "Dublin City South",
"Dublin (Baggot Street)"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -48,7 +48,7 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 1000086), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "1000086"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(1000086, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("1000086", 0, false);
print(result);
}
@ -80,8 +80,8 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), null, new Location(
LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1008730", null, "King & Queen Wharf"), null, new Location(
LocationType.STATION, "1006433", null, "Edinburgh Court"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);
@ -108,8 +108,8 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest
@Test
public void postcodeTrip() throws Exception
{
final QueryTripsResult result = queryTrips(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, Product.ALL, WalkSpeed.NORMAL,
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "sw19 8ta"), null, new Location(LocationType.STATION,
"1016019", 51655903, -397249, null, "Watford (Herts), Watford Town Centre"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
}
@ -117,10 +117,9 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripItdMessageList() throws Exception
{
final QueryTripsResult result = queryTrips(
new Location(LocationType.ADDRESS, 0, 51446072, -239417, "Wandsworth", "Timsbury Walk, Wandsworth"), null, new Location(
LocationType.STATION, 90046985, 53225140, -1472433, "Chesterfield (Derbys)",
"Walton (Chesterfield), Netherfield Road (on Somersall Lane)"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 51446072, -239417, "Wandsworth",
"Timsbury Walk, Wandsworth"), null, new Location(LocationType.STATION, "90046985", 53225140, -1472433, "Chesterfield (Derbys)",
"Walton (Chesterfield), Netherfield Road (on Somersall Lane)"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);

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

@ -48,7 +48,7 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 1001003), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "1001003"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(1001003, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("1001003", 0, false);
print(result);
}
@ -80,8 +80,8 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), null, new Location(
LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1008730", null, "King & Queen Wharf"), null, new Location(
LocationType.STATION, "1006433", null, "Edinburgh Court"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -48,7 +48,7 @@ public class TlswProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 247616), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "247616"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class TlswProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(247616, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("247616", 0, false);
print(result);
}
@ -80,8 +80,8 @@ public class TlswProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 60011202, 51850168, -1094302, "Upper Arncott",
"Bullingdon Prison"), null, new Location(LocationType.STATION, 60006576, 51856352, -1113127, "Lower Arncott", "The Plough"),
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60011202", 51850168, -1094302, "Upper Arncott",
"Bullingdon Prison"), null, new Location(LocationType.STATION, "60006576", 51856352, -1113127, "Lower Arncott", "The Plough"),
new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -48,7 +48,7 @@ public class TlwmProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 1001003), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "1001003"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class TlwmProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(1001003, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("1001003", 0, false);
print(result);
}
@ -80,8 +80,8 @@ public class TlwmProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 2099014, 52478184, -1898364, "Birmingham",
"Birmingham New Street Rail Station"), null, new Location(LocationType.STATION, 2099150, 52585468, -2122962, "Wolverhampton",
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "2099014", 52478184, -1898364, "Birmingham",
"Birmingham New Street Rail Station"), null, new Location(LocationType.STATION, "2099150", 52585468, -2122962, "Wolverhampton",
"Wolverhampton Rail Station"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -50,7 +50,7 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 6930112), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "6930112"), 0, 0);
print(result);
}
@ -66,7 +66,7 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(6930112, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("6930112", 0, false);
print(result);
}
@ -84,14 +84,14 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest
{
final List<Location> freiburgAutocompletes = provider.autocompleteStations("Betzenhauser Torplatz");
print(freiburgAutocompletes);
assertThat(freiburgAutocompletes, hasItem(new Location(LocationType.STATION, 6930503)));
assertThat(freiburgAutocompletes, hasItem(new Location(LocationType.STATION, "6930503")));
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 6930100, null, "Freiburg Bertoldsbrunnen"), null, new Location(
LocationType.STATION, 6930101, null, "Freiburg Siegesdenkmal"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "6930100", null, "Freiburg Bertoldsbrunnen"), null,
new Location(LocationType.STATION, "6930101", null, "Freiburg Siegesdenkmal"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -48,7 +48,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 9007102), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "9007102"), 0, 0);
print(result);
}
@ -56,7 +56,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStationsInvalidStation() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 2449475), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "2449475"), 0, 0);
assertEquals(NearbyStationsResult.Status.INVALID_STATION, result.status);
}
@ -71,7 +71,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(9007102, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("9007102", 0, false);
print(result);
}
@ -79,10 +79,10 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDeparturesInvalidStation() throws Exception
{
final QueryDeparturesResult resultLive = provider.queryDepartures(111111, 0, false);
final QueryDeparturesResult resultLive = provider.queryDepartures("111111", 0, false);
assertEquals(QueryDeparturesResult.Status.INVALID_STATION, resultLive.status);
final QueryDeparturesResult resultPlan = provider.queryDepartures(2449475, 0, false);
final QueryDeparturesResult resultPlan = provider.queryDepartures("2449475", 0, false);
assertEquals(QueryDeparturesResult.Status.INVALID_STATION, resultPlan.status);
}
@ -117,8 +117,8 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), null, new Location(
LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "9056102", "Berlin", "Nollendorfplatz"), null, new Location(
LocationType.STATION, "9013103", "Berlin", "Prinzenstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -129,8 +129,8 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortViaTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 9056102, "Berlin", "Nollendorfplatz"), new Location(
LocationType.STATION, 9044202, "Berlin", "Bundesplatz"), new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"),
final QueryTripsResult result = queryTrips(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, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
@ -140,8 +140,8 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenCoordinates() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 52501507, 13357026, null, null), null, new Location(
LocationType.ADDRESS, 0, 52513639, 13568648, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52501507, 13357026, null, null), null, new Location(
LocationType.ADDRESS, null, 52513639, 13568648, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -150,9 +150,10 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void viaTripBetweenCoordinates() throws Exception
{
final QueryTripsResult result = queryTrips(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, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52501507, 13357026, null, null), new Location(
LocationType.ADDRESS, null, 52479868, 13324247, null, null),
new Location(LocationType.ADDRESS, null, 52513639, 13568648, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
@ -161,8 +162,8 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenAddresses() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 52479663, 13324278, "10715 Berlin-Wilmersdorf",
"Weimarische Str. 7"), null, new Location(LocationType.ADDRESS, 0, 52541536, 13421290, "10437 Berlin-Prenzlauer Berg",
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52479663, 13324278, "10715 Berlin-Wilmersdorf",
"Weimarische Str. 7"), null, new Location(LocationType.ADDRESS, null, 52541536, 13421290, "10437 Berlin-Prenzlauer Berg",
"Göhrener Str. 5"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
@ -172,9 +173,9 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void viaTripBetweenAddresses() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 52479663, 13324278, "10715 Berlin-Wilmersdorf",
"Weimarische Str. 7"), new Location(LocationType.ADDRESS, 0, 52527872, 13381657, "10115 Berlin-Mitte", "Hannoversche Str. 20"),
new Location(LocationType.ADDRESS, 0, 52526029, 13399878, "10178 Berlin-Mitte", "Sophienstr. 24"), new Date(), true, Product.ALL,
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52479663, 13324278, "10715 Berlin-Wilmersdorf",
"Weimarische Str. 7"), new Location(LocationType.ADDRESS, null, 52527872, 13381657, "10115 Berlin-Mitte", "Hannoversche Str. 20"),
new Location(LocationType.ADDRESS, null, 52526029, 13399878, "10178 Berlin-Mitte", "Sophienstr. 24"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);

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

@ -48,7 +48,7 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 119), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "119"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(717, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("717", 0, false);
print(result);
}
@ -88,8 +88,8 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 119, 47050760, 8310252, "Luzern", "Luzern, Bahnhof"), null,
new Location(LocationType.STATION, 118, 47048844, 8306433, "Luzern", "Kantonalbank"), new Date(), true, Product.ALL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "119", 47050760, 8310252, "Luzern", "Luzern, Bahnhof"), null,
new Location(LocationType.STATION, "118", 47048844, 8306433, "Luzern", "Kantonalbank"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -47,7 +47,7 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 8000110), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8000110"), 0, 0);
print(result);
}
@ -63,7 +63,7 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(8000110, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("8000110", 0, false);
print(result);
}
@ -89,8 +89,8 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8096109, null, "Oldenburg"), null, new Location(
LocationType.STATION, 625398, null, "Bremerhaven"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8096109", null, "Oldenburg"), null, new Location(
LocationType.STATION, "625398", null, "Bremerhaven"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
assertEquals(QueryTripsResult.Status.OK, result.status);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
@ -100,8 +100,8 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripDateOutsideTimetablePeriod() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8096109, null, "Oldenburg"), null, new Location(
LocationType.STATION, 625398, null, "Bremerhaven"), new Date(1155822689759l), true, Product.ALL, WalkSpeed.NORMAL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8096109", null, "Oldenburg"), null, new Location(
LocationType.STATION, "625398", null, "Bremerhaven"), new Date(1155822689759l), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
assertEquals(QueryTripsResult.Status.INVALID_DATE, result.status);
}

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

@ -45,7 +45,7 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 3000510), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "3000510"), 0, 0);
print(result);
}
@ -61,7 +61,7 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(3000510, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("3000510", 0, false);
print(result);
}
@ -85,8 +85,8 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 451, "Nürnberg", "Ostring"), null, new Location(
LocationType.STATION, 510, "Nürnberg", "Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "451", "Nürnberg", "Ostring"), null, new Location(
LocationType.STATION, "510", "Nürnberg", "Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -45,7 +45,7 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 8000244), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8000244"), 0, 0);
print(result);
}
@ -69,7 +69,7 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(8000244, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("8000244", 0, false);
print(result);
}
@ -77,8 +77,8 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 10640, "Saarbrücken", "Hauptbahnhof"), null, new Location(
LocationType.STATION, 10700, "Saarbrücken", "Ostbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "10640", "Saarbrücken", "Hauptbahnhof"), null, new Location(
LocationType.STATION, "10700", "Saarbrücken", "Ostbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -48,7 +48,7 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 60001296), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "60001296"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(60001296, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("60001296", 0, false);
print(result);
}
@ -88,8 +88,8 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 60000822, 47238428, 9596940, "Feldkirch", "Katzenturm"), null,
new Location(LocationType.STATION, 60000305, 47240744, 9589368, "Tosters", "Vorarlberghalle"), new Date(), true, Product.ALL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60000822", 47238428, 9596940, "Feldkirch", "Katzenturm"),
null, new Location(LocationType.STATION, "60000305", 47240744, 9589368, "Tosters", "Vorarlberghalle"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -48,7 +48,7 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 36030062), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "36030062"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(36030062, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("36030062", 0, false);
print(result);
}
@ -80,10 +80,9 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(
new Location(LocationType.STATION, 36030131, 50831380, 12922278, "Chemnitz", "Zentralhaltestelle"), null, new Location(
LocationType.STATION, 36030522, 50836056, 12922042, "Chemnitz", "Stadthalle"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "36030131", 50831380, 12922278, "Chemnitz",
"Zentralhaltestelle"), null, new Location(LocationType.STATION, "36030522", 50836056, 12922042, "Chemnitz", "Stadthalle"),
new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -48,7 +48,7 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 44402031), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "44402031"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(80001834, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("80001834", 0, false);
print(result);
}
@ -80,8 +80,8 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 44402006, null, "Schwerin Marienplatz"), null, new Location(
LocationType.STATION, 44402007, 53625272, 11409350, null, "Schlossblick"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "44402006", null, "Schwerin Marienplatz"), null, new Location(
LocationType.STATION, "44402007", 53625272, 11409350, null, "Schlossblick"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -50,7 +50,7 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 60203090), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "60203090"), 0, 0);
print(result);
}
@ -66,7 +66,7 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(60203090, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("60203090", 0, false);
print(result);
}
@ -92,18 +92,18 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest
{
final List<Location> huetteldorfAutocompletes = provider.autocompleteStations("Hütteldorf");
print(huetteldorfAutocompletes);
assertThat(huetteldorfAutocompletes, hasItem(new Location(LocationType.STATION, 60200560)));
assertThat(huetteldorfAutocompletes, hasItem(new Location(LocationType.STATION, "60200560")));
final List<Location> wienerNeustadtAutocompletes = provider.autocompleteStations("Wiener Neustadt Nord");
print(wienerNeustadtAutocompletes);
assertThat(wienerNeustadtAutocompletes, hasItem(new Location(LocationType.STATION, 60205223)));
assertThat(wienerNeustadtAutocompletes, hasItem(new Location(LocationType.STATION, "60205223")));
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 60200657, 48200756, 16369001, "Wien", "Karlsplatz"), null,
new Location(LocationType.STATION, 60201094, 48198612, 16367719, "Wien", "Resselgasse"), new Date(), true, Product.ALL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60200657", 48200756, 16369001, "Wien", "Karlsplatz"), null,
new Location(LocationType.STATION, "60201094", 48198612, 16367719, "Wien", "Resselgasse"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
@ -131,8 +131,8 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenCoordinates() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 48180281, 16333551), null, new Location(
LocationType.ADDRESS, 0, 48240452, 16444788), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48180281, 16333551), null, new Location(
LocationType.ADDRESS, null, 48240452, 16444788), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -48,7 +48,7 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 6032236), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "6032236"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(6032236, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("6032236", 0, false);
print(result);
}
@ -112,8 +112,8 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 6002417, 49479748, 8469938, "Mannheim",
"Mannheim, Hauptbahnhof"), null, new Location(LocationType.STATION, 6005542, 49482892, 8473050, "Mannheim", "Kunsthalle"),
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "6002417", 49479748, 8469938, "Mannheim",
"Mannheim, Hauptbahnhof"), null, new Location(LocationType.STATION, "6005542", 49482892, 8473050, "Mannheim", "Kunsthalle"),
new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -50,7 +50,7 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 20019904), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "20019904"), 0, 0);
print(result);
}
@ -70,17 +70,17 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(1007258, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("1007258", 0, false);
print(result);
final QueryDeparturesResult result2 = provider.queryDepartures(20019904, 0, false);
final QueryDeparturesResult result2 = provider.queryDepartures("20019904", 0, false);
print(result2);
// Bonn
provider.queryDepartures(22000687, 0, false); // Hauptbahnhof
provider.queryDepartures(22001374, 0, false); // Suedwache
provider.queryDepartures("22000687", 0, false); // Hauptbahnhof
provider.queryDepartures("22001374", 0, false); // Suedwache
}
@Test
@ -116,23 +116,23 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest
{
final List<Location> cologneAutocompletes = provider.autocompleteStations("Köln Ebertplatz");
print(cologneAutocompletes);
assertThat(cologneAutocompletes, hasItem(new Location(LocationType.STATION, 22000035)));
assertThat(cologneAutocompletes, hasItem(new Location(LocationType.STATION, "22000035")));
final List<Location> dortmundAutocompletes = provider.autocompleteStations("Dortmund Zugstraße");
print(dortmundAutocompletes);
assertThat(dortmundAutocompletes, hasItem(new Location(LocationType.STATION, 20000524)));
assertThat(dortmundAutocompletes, hasItem(new Location(LocationType.STATION, "20000524")));
final List<Location> duesseldorfAutocompletes = provider.autocompleteStations("Düsseldorf Sternstraße");
print(duesseldorfAutocompletes);
assertThat(duesseldorfAutocompletes, hasItem(new Location(LocationType.STATION, 20018017)));
assertThat(duesseldorfAutocompletes, hasItem(new Location(LocationType.STATION, "20018017")));
final List<Location> muensterAutocompletes = provider.autocompleteStations("Münster Vennheideweg");
print(muensterAutocompletes);
assertThat(muensterAutocompletes, hasItem(new Location(LocationType.STATION, 24047291)));
assertThat(muensterAutocompletes, hasItem(new Location(LocationType.STATION, "24047291")));
final List<Location> aachenAutocompletes = provider.autocompleteStations("Aachen Elisenbrunnen");
print(aachenAutocompletes);
assertThat(aachenAutocompletes, hasItem(new Location(LocationType.STATION, 21001029)));
assertThat(aachenAutocompletes, hasItem(new Location(LocationType.STATION, "21001029")));
}
@Test
@ -146,8 +146,8 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 20009289, "Essen", "Hauptbahnhof"), null, new Location(
LocationType.STATION, 20009161, "Essen", "Bismarckplatz"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "20009289", "Essen", "Hauptbahnhof"), null, new Location(
LocationType.STATION, "20009161", "Essen", "Bismarckplatz"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);
@ -174,8 +174,8 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTripPaderborn() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 23007000, "Paderborn", "Paderborn Hbf"), null, new Location(
LocationType.STATION, 23007700, "Höxter", "Bahnhof / Rathaus"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "23007000", "Paderborn", "Paderborn Hbf"), null, new Location(
LocationType.STATION, "23007700", "Höxter", "Bahnhof / Rathaus"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -48,7 +48,7 @@ public class VrtProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 17001301), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "17001301"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class VrtProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(17001301, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("17001301", 0, false);
print(result);
}
@ -80,8 +80,8 @@ public class VrtProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 17002402, null, "Bahnhof"), null, new Location(
LocationType.STATION, 17009001, null, "Bahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "17002402", null, "Bahnhof"), null, new Location(
LocationType.STATION, "17009001", null, "Bahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -48,7 +48,7 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 3000510), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "3000510"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(3000510, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("3000510", 0, false);
print(result);
}
@ -88,8 +88,8 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 3700075, 49801076, 9934302, "Würzburg", "Busbahnhof"), null,
new Location(LocationType.STATION, 3700403, 49797772, 9934986, "Würzburg", "Stift Haug"), new Date(), true, Product.ALL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3700075", 49801076, 9934302, "Würzburg", "Busbahnhof"), null,
new Location(LocationType.STATION, "3700403", 49797772, 9934986, "Würzburg", "Stift Haug"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -50,7 +50,7 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 33000013), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "33000013"), 0, 0);
System.out.println(result.status + " " + result.stations.size() + " " + result.stations);
}
@ -66,7 +66,7 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(100, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("100", 0, false);
print(result);
}
@ -92,14 +92,15 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest
{
final List<Location> dresdenAutocompletes = provider.autocompleteStations("Dresden Postplatz");
print(dresdenAutocompletes);
assertThat(dresdenAutocompletes, hasItem(new Location(LocationType.STATION, 33000037)));
assertThat(dresdenAutocompletes, hasItem(new Location(LocationType.STATION, "33000037")));
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 33000013, null, "Dresden Albertplatz"), null, new Location(
LocationType.STATION, 33000262, null, "Dresden Bischofsweg"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "33000013", null, "Dresden Albertplatz"), null, new Location(
LocationType.STATION, "33000262", null, "Dresden Bischofsweg"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -48,7 +48,7 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 6118), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "6118"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(6118, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("6118", 0, false);
print(result);
}
@ -88,8 +88,8 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 5006118, 48782984, 9179846, "Stuttgart",
"Stuttgart, Hauptbahnhof"), null, new Location(LocationType.STATION, 5006024, 48782584, 9187098, "Stuttgart", "Staatsgalerie"),
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "5006118", 48782984, 9179846, "Stuttgart",
"Stuttgart, Hauptbahnhof"), null, new Location(LocationType.STATION, "5006024", 48782584, 9187098, "Stuttgart", "Staatsgalerie"),
new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -48,7 +48,7 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 60101187), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "60101187"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(60101187, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("60101187", 0, false);
print(result);
}
@ -88,8 +88,8 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 60161512, 47268336, 11355532, "Innsbruck", "Allerheiligen"),
null, new Location(LocationType.STATION, 60161510, 47267272, 11350938, "Innsbruck", "Tschiggfreystraße"), new Date(), true,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60161512", 47268336, 11355532, "Innsbruck", "Allerheiligen"),
null, new Location(LocationType.STATION, "60161510", 47267272, 11350938, "Innsbruck", "Tschiggfreystraße"), new Date(), true,
Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);

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

@ -48,7 +48,7 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 80007271), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "80007271"), 0, 0);
print(result);
}
@ -64,7 +64,7 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(80007271, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("80007271", 0, false);
print(result);
}
@ -88,10 +88,9 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(
new Location(LocationType.STATION, 30202006, 50484564, 12140028, "Plauen (Vogtl)", "Bickelstraße"), null, new Location(
LocationType.STATION, 30202012, 50487332, 12139050, "Plauen (Vogtl)", "Hofer Straße"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "30202006", 50484564, 12140028, "Plauen (Vogtl)",
"Bickelstraße"), null, new Location(LocationType.STATION, "30202012", 50487332, 12139050, "Plauen (Vogtl)", "Hofer Straße"),
new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);

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

@ -50,7 +50,7 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 60203090), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "60203090"), 0, 0);
print(result);
}
@ -66,7 +66,7 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(60203090, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("60203090", 0, false);
print(result);
}
@ -92,18 +92,18 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest
{
final List<Location> huetteldorfAutocompletes = provider.autocompleteStations("Wien Hütteldorf");
print(huetteldorfAutocompletes);
assertThat(huetteldorfAutocompletes, hasItem(new Location(LocationType.STATION, 60200560)));
assertThat(huetteldorfAutocompletes, hasItem(new Location(LocationType.STATION, "60200560")));
final List<Location> wienerNeustadtAutocompletes = provider.autocompleteStations("Wiener Neustadt Nord");
print(wienerNeustadtAutocompletes);
assertThat(wienerNeustadtAutocompletes, hasItem(new Location(LocationType.STATION, 60205223)));
assertThat(wienerNeustadtAutocompletes, hasItem(new Location(LocationType.STATION, "60205223")));
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 60200657, 48200756, 16369001, "Wien", "Karlsplatz"), null,
new Location(LocationType.STATION, 60201094, 48198612, 16367719, "Wien", "Resselgasse"), new Date(), true, Product.ALL,
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60200657", 48200756, 16369001, "Wien", "Karlsplatz"), null,
new Location(LocationType.STATION, "60201094", 48198612, 16367719, "Wien", "Resselgasse"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
@ -131,8 +131,8 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest
@Test
public void tripBetweenCoordinates() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, 0, 48180281, 16333551), null, new Location(
LocationType.ADDRESS, 0, 48240452, 16444788), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48180281, 16333551), null, new Location(
LocationType.ADDRESS, null, 48240452, 16444788), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);

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

@ -45,7 +45,7 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStationsByStation() throws Exception
{
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 8503000), 0, 0);
final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8503000"), 0, 0);
print(result);
}
@ -61,7 +61,7 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = provider.queryDepartures(8503000, 0, false);
final QueryDeparturesResult result = provider.queryDepartures("8503000", 0, false);
print(result);
}
@ -77,8 +77,8 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 8503000, null, "Zürich HB"), null, new Location(
LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8503000", null, "Zürich HB"), null, new Location(
LocationType.STATION, "8507785", null, "Bern, Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);