rename Connection to Trip

This commit is contained in:
Andreas Schildbach 2013-06-13 15:11:56 +02:00
parent fde90f7b87
commit 2852aedbd5
139 changed files with 1195 additions and 1236 deletions

View file

@ -29,8 +29,8 @@ import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.NearbyStationsResult;
import de.schildbach.pte.dto.Product;
import de.schildbach.pte.dto.QueryConnectionsResult;
import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.QueryTripsResult;
/**
* @author Andreas Schildbach
@ -83,45 +83,44 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest
}
@Test
public void shortConnection() throws Exception
public void shortTrip() throws Exception
{
final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 8821006, "Antwerpen", "Centraal"), null,
new Location(LocationType.STATION, 8813003, "Brussel", "Centraal"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL);
System.out.println(result.status + " " + result.connections);
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)
{
final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true);
System.out.println(laterResult.status + " " + laterResult.connections);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult.status + " " + laterResult.trips);
}
}
@Test
public void longConnection() throws Exception
public void longTrip() throws Exception
{
final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 207280, "Brussel", "Wannecouter"), null,
new Location(LocationType.STATION, 207272, "Brussel", "Stadion"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL);
System.out.println(result.status + " " + result.connections);
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)
{
final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true);
System.out.println(laterResult.status + " " + laterResult.connections);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult.status + " " + laterResult.trips);
}
}
@Test
public void connectionFromAddress() throws Exception
public void tripFromAddress() throws Exception
{
final QueryConnectionsResult result = queryConnections(new Location(LocationType.ADDRESS, 0, null, "Bruxelles - Haren, Rue Paul Janson 9"),
null, new Location(LocationType.STATION, 8500010, null, "Basel"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
System.out.println(result.status + " " + result.connections);
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);
System.out.println(result.status + " " + result.trips);
if (result.context != null)
{
final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true);
System.out.println(laterResult.status + " " + laterResult.connections);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult.status + " " + laterResult.trips);
}
}
}