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
@ -101,48 +101,48 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest
}
@Test
public void incompleteConnection() throws Exception
public void incompleteTrip() throws Exception
{
final QueryConnectionsResult result = queryConnections(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, 0, null, "linz"), null, new Location(LocationType.ANY, 0, null,
"gel"), new Date(), true, Product.ALL, WalkSpeed.FAST, Accessibility.NEUTRAL);
System.out.println(result);
}
@Test
public void shortConnection() throws Exception
public void shortTrip() throws Exception
{
final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 0, null, "Linz Hauptbahnhof"), null, new Location(
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);
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 longConnection() throws Exception
public void longTrip() throws Exception
{
final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 0, null, "Linz Auwiesen"), null, new Location(
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);
System.out.println(result);
// final QueryConnectionsResult laterResult = queryMoreConnections(provider, result.context, true);
// final QueryTripsResult laterResult = queryMoreTrips(provider, result.context, true);
// System.out.println(laterResult);
}
}