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

@ -32,8 +32,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
@ -86,42 +86,42 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest
}
@Test
public void shortConnection() throws Exception
public void shortTrip() throws Exception
{
final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 7000070, 49009208, 8404126, "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(QueryConnectionsResult.Status.OK, result.status);
assertTrue(result.connections.size() > 0);
assertEquals(QueryTripsResult.Status.OK, result.status);
assertTrue(result.trips.size() > 0);
if (!result.context.canQueryLater())
return;
final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
if (!laterResult.context.canQueryLater())
return;
final QueryConnectionsResult later2Result = queryMoreConnections(laterResult.context, true);
final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true);
System.out.println(later2Result);
if (!later2Result.context.canQueryEarlier())
return;
final QueryConnectionsResult earlierResult = queryMoreConnections(later2Result.context, false);
final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false);
System.out.println(earlierResult);
}
@Test
public void connectionBetweenAddresses() throws Exception
public void tripBetweenAddresses() throws Exception
{
final QueryConnectionsResult result = queryConnections(new Location(LocationType.ADDRESS, 0, 48985089, 8402709, null,
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,
"Durmersheimer Straße 6, 76185 Karlsruhe, Deutschland"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
}
}