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

OEBB: Migrate to Hafas client interface.

Browse source
This commit is contained in:
Andreas Schildbach 2018-11-16 18:37:16 +01:00
parent d0bcedc0e8
commit f1641c5fa3
3 changed files with 31 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import de.schildbach.pte.OebbProvider;
import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.NearbyLocationsResult;
import de.schildbach.pte.dto.Point;
import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.QueryTripsResult;
import de.schildbach.pte.dto.SuggestLocationsResult;
@ -37,20 +38,12 @@ import de.schildbach.pte.dto.SuggestLocationsResult;
*/
public class OebbProviderLiveTest extends AbstractProviderLiveTest {
public OebbProviderLiveTest() {
super(new OebbProvider());
}
@Test
public void nearbyStations() throws Exception {
final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "902006"));
print(result);
super(new OebbProvider(secretProperty("oebb.api_authorization")));
}
@Test
public void nearbyStationsByCoordinate() throws Exception {
final NearbyLocationsResult result = queryNearbyStations(Location.coord(48200239, 16370773));
print(result);
assertEquals(NearbyLocationsResult.Status.OK, result.status);
assertTrue(result.locations.size() > 0);
@ -59,7 +52,6 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest {
@Test
public void queryDepartures() throws Exception {
final QueryDeparturesResult result = queryDepartures("902006", false);
print(result);
assertEquals(QueryDeparturesResult.Status.OK, result.status);
assertTrue(result.stationDepartures.size() > 0);
@ -68,14 +60,12 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest {
@Test
public void queryDeparturesInvalidStation() throws Exception {
final QueryDeparturesResult result = queryDepartures("999999", false);
assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
}
@Test
public void suggestLocations() throws Exception {
final SuggestLocationsResult result = suggestLocations("Wien");
print(result);
assertTrue(result.getLocations().size() > 0);
}
@ -83,14 +73,14 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest {
@Test
public void suggestLocationsUmlaut() throws Exception {
final SuggestLocationsResult result = suggestLocations("Obirhöhle");
print(result);
}
@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, null);
final Location from = new Location(LocationType.STATION, "1140101", null, "Linz");
final Location to = new Location(LocationType.STATION, "1190100", null, "Wien");
final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null);
print(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);
@ -100,8 +90,9 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest {
@Test
public void slowTrip() throws Exception {
final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Ramsen Zoll!"), null,
new Location(LocationType.ANY, null, null, "Azuga!"), new Date(), true, null);
final Location from = new Location(LocationType.ANY, null, null, "Ramsen Zoll!");
final Location to = new Location(LocationType.ANY, null, null, "Azuga!");
final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null);
print(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);
@ -111,8 +102,9 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest {
@Test
public void tripWithFootway() throws Exception {
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, null);
final Location from = new Location(LocationType.ANY, null, null, "Graz, Haselweg!");
final Location to = new Location(LocationType.ANY, null, null, "Innsbruck, Gumppstraße 69!");
final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null);
print(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);
@ -122,14 +114,21 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest {
@Test
public void tripWithFootway2() throws Exception {
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,
null);
final Location from = new Location(LocationType.ANY, null, null, "Wien, Krottenbachstraße 110!");
final Location to = new Location(LocationType.ADDRESS, null, null, "Wien, Meidlinger Hauptstraße 1!");
final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null);
print(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
print(laterResult);
}
@Test
public void tripBetweenCoordinates() throws Exception {
final Location from = Location.coord(Point.fromDouble(48.1850101, 16.3778549)); // Wien Hauptbahnhof
final Location to = Location.coord(Point.fromDouble(48.2902408, 14.2918619)); // Linz Hauptbahnhof
final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null);
print(result);
}
}

1
enabler/test/de/schildbach/pte/live/secrets.properties.template
View file

@ -6,6 +6,7 @@ sh.api_authorization =
vmt.api_authorization =
invg.api_authorization =
avv_aachen.api_authorization =
oebb.api_authorization =
vor.api_authorization =
ooevv.api_authorization =
svv.api_authorization =