mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-18 08:19:51 +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

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);