Switch to modern code format. Organize imports. No functional changes.

Java sources use Eclipse 4.5 'Java Conventions' with indentation changed to 4 spaces only per level.
This commit is contained in:
Andreas Schildbach 2016-09-08 17:52:19 +02:00
parent db59817a05
commit 931dafb628
191 changed files with 24827 additions and 27703 deletions

View file

@ -38,97 +38,88 @@ import de.schildbach.pte.dto.SuggestLocationsResult;
/**
* @author Andreas Schildbach
*/
public class ShProviderLiveTest extends AbstractProviderLiveTest
{
public ShProviderLiveTest()
{
super(new ShProvider(secretProperty("sh.json_api_authorization")));
}
public class ShProviderLiveTest extends AbstractProviderLiveTest {
public ShProviderLiveTest() {
super(new ShProvider(secretProperty("sh.json_api_authorization")));
}
@Test
public void nearbyStations() throws Exception
{
final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8002547"));
print(result);
}
@Test
public void nearbyStations() throws Exception {
final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8002547"));
print(result);
}
@Test
public void nearbyStationsInvalidStation() throws Exception
{
final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "999999"));
assertEquals(NearbyLocationsResult.Status.INVALID_ID, result.status);
}
@Test
public void nearbyStationsInvalidStation() throws Exception {
final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "999999"));
assertEquals(NearbyLocationsResult.Status.INVALID_ID, result.status);
}
@Test
public void nearbyStationsByCoordinate() throws Exception
{
final NearbyLocationsResult result = queryNearbyStations(Location.coord(54325845, 10122920));
print(result);
assertTrue(result.locations.size() > 0);
}
@Test
public void nearbyStationsByCoordinate() throws Exception {
final NearbyLocationsResult result = queryNearbyStations(Location.coord(54325845, 10122920));
print(result);
assertTrue(result.locations.size() > 0);
}
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = queryDepartures("8002547", false);
print(result);
}
@Test
public void queryDepartures() throws Exception {
final QueryDeparturesResult result = queryDepartures("8002547", false);
print(result);
}
@Test
public void queryDeparturesInvalidStation() throws Exception
{
final QueryDeparturesResult result = queryDepartures("999999", false);
assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
}
@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("Lübeck");
print(result);
}
@Test
public void suggestLocations() throws Exception {
final SuggestLocationsResult result = suggestLocations("Lübeck");
print(result);
}
@Test
public void suggestLocationsUmlaut() throws Exception
{
final SuggestLocationsResult result = suggestLocations("Achterüm");
print(result);
}
@Test
public void suggestLocationsUmlaut() throws Exception {
final SuggestLocationsResult result = suggestLocations("Achterüm");
print(result);
}
@Test
public void suggestLocationsWithoutCoordinatesInResult() throws Exception
{
final SuggestLocationsResult result = suggestLocations("aachen");
print(result);
}
@Test
public void suggestLocationsWithoutCoordinatesInResult() throws Exception {
final SuggestLocationsResult result = suggestLocations("aachen");
print(result);
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8002547", null, "Flughafen Hamburg"), null, new Location(
LocationType.STATION, "8003781", null, "Lübeck Airport"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
print(result);
@Test
public void shortTrip() throws Exception {
final QueryTripsResult result = queryTrips(
new Location(LocationType.STATION, "8002547", null, "Flughafen Hamburg"), null,
new Location(LocationType.STATION, "8003781", null, "Lübeck Airport"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
print(result);
if (!result.context.canQueryLater())
return;
if (!result.context.canQueryLater())
return;
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
print(laterResult);
}
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
print(laterResult);
}
@Test
public void tripKiel() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3490015"), null, new Location(LocationType.STATION, "706923"),
new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
print(result);
}
@Test
public void tripKiel() throws Exception {
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3490015"), null,
new Location(LocationType.STATION, "706923"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
print(result);
}
@Test
public void trip_errorTooClose() throws Exception
{
final Location station = new Location(LocationType.STATION, "003665026");
final QueryTripsResult result = queryTrips(station, null, station, new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
assertEquals(QueryTripsResult.Status.TOO_CLOSE, result.status);
}
@Test
public void trip_errorTooClose() throws Exception {
final Location station = new Location(LocationType.STATION, "003665026");
final QueryTripsResult result = queryTrips(station, null, station, new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
assertEquals(QueryTripsResult.Status.TOO_CLOSE, result.status);
}
}