diff --git a/enabler/src/de/schildbach/pte/dto/NearbyStationsResult.java b/enabler/src/de/schildbach/pte/dto/NearbyStationsResult.java index 7eaab165..89ddad7b 100644 --- a/enabler/src/de/schildbach/pte/dto/NearbyStationsResult.java +++ b/enabler/src/de/schildbach/pte/dto/NearbyStationsResult.java @@ -47,4 +47,14 @@ public final class NearbyStationsResult implements Serializable this.status = status; this.stations = null; } + + @Override + public String toString() + { + final StringBuilder builder = new StringBuilder(getClass().getSimpleName()); + builder.append("[").append(this.status); + builder.append(" ").append(stations.size()).append(stations); + builder.append("]"); + return builder.toString(); + } } diff --git a/enabler/src/de/schildbach/pte/dto/QueryDeparturesResult.java b/enabler/src/de/schildbach/pte/dto/QueryDeparturesResult.java index 8550cf30..ab57215e 100644 --- a/enabler/src/de/schildbach/pte/dto/QueryDeparturesResult.java +++ b/enabler/src/de/schildbach/pte/dto/QueryDeparturesResult.java @@ -50,9 +50,9 @@ public final class QueryDeparturesResult implements Serializable @Override public String toString() { - final StringBuilder builder = new StringBuilder(getClass().getName()); + final StringBuilder builder = new StringBuilder(getClass().getSimpleName()); builder.append("[").append(this.status); - builder.append(" ").append(stationDepartures); + builder.append(" ").append(stationDepartures.size()).append(stationDepartures); builder.append("]"); return builder.toString(); } diff --git a/enabler/src/de/schildbach/pte/dto/QueryTripsResult.java b/enabler/src/de/schildbach/pte/dto/QueryTripsResult.java index 4889fa5a..bc80eff2 100644 --- a/enabler/src/de/schildbach/pte/dto/QueryTripsResult.java +++ b/enabler/src/de/schildbach/pte/dto/QueryTripsResult.java @@ -97,13 +97,13 @@ public final class QueryTripsResult implements Serializable @Override public String toString() { - final StringBuilder builder = new StringBuilder(getClass().getName()); - builder.append("["); + final StringBuilder builder = new StringBuilder(getClass().getSimpleName()); + builder.append("[").append(this.status).append(" "); if (status == Status.OK) { if (trips != null) - builder.append(trips.size()).append(" trips " + trips + ", "); + builder.append(trips.size()).append(trips); } else if (status == Status.AMBIGUOUS) { diff --git a/enabler/src/de/schildbach/pte/dto/StationDepartures.java b/enabler/src/de/schildbach/pte/dto/StationDepartures.java index 52f79854..20067c0c 100644 --- a/enabler/src/de/schildbach/pte/dto/StationDepartures.java +++ b/enabler/src/de/schildbach/pte/dto/StationDepartures.java @@ -39,7 +39,7 @@ public final class StationDepartures implements Serializable @Override public String toString() { - final StringBuilder builder = new StringBuilder(getClass().getName()); + final StringBuilder builder = new StringBuilder(getClass().getSimpleName()); builder.append("["); if (location != null) builder.append(location); diff --git a/enabler/src/de/schildbach/pte/dto/SuggestLocationsResult.java b/enabler/src/de/schildbach/pte/dto/SuggestLocationsResult.java index ce160f51..ae3106f7 100644 --- a/enabler/src/de/schildbach/pte/dto/SuggestLocationsResult.java +++ b/enabler/src/de/schildbach/pte/dto/SuggestLocationsResult.java @@ -53,9 +53,9 @@ public final class SuggestLocationsResult implements Serializable @Override public String toString() { - final StringBuilder builder = new StringBuilder(getClass().getName()); + final StringBuilder builder = new StringBuilder(getClass().getSimpleName()); builder.append("[").append(this.status); - builder.append(" ").append(suggestedLocations); + builder.append(" ").append(suggestedLocations.size()).append(suggestedLocations); builder.append("]"); return builder.toString(); } diff --git a/enabler/src/de/schildbach/pte/dto/Trip.java b/enabler/src/de/schildbach/pte/dto/Trip.java index fc263454..20f31a8a 100644 --- a/enabler/src/de/schildbach/pte/dto/Trip.java +++ b/enabler/src/de/schildbach/pte/dto/Trip.java @@ -317,7 +317,7 @@ public final class Trip implements Serializable @Override public String toString() { - final StringBuilder builder = new StringBuilder(getClass().getName() + "["); + final StringBuilder builder = new StringBuilder(getClass().getSimpleName() + "["); builder.append("line=").append(line); if (destination != null) { @@ -357,7 +357,7 @@ public final class Trip implements Serializable @Override public String toString() { - final StringBuilder builder = new StringBuilder(getClass().getName() + "["); + final StringBuilder builder = new StringBuilder(getClass().getSimpleName() + "["); builder.append("type=").append(type); builder.append(","); builder.append("departure=").append(departure); diff --git a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java index 83c28e1c..21426e8b 100644 --- a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java @@ -20,7 +20,6 @@ package de.schildbach.pte.live; import java.io.IOException; import java.util.Collection; import java.util.Date; -import java.util.List; import de.schildbach.pte.NetworkProvider; import de.schildbach.pte.NetworkProvider.Accessibility; @@ -47,13 +46,12 @@ public abstract class AbstractProviderLiveTest protected final void print(final NearbyStationsResult result) { - System.out.println(result.status - + (result.status == NearbyStationsResult.Status.OK ? " " + result.stations.size() + " " + result.stations : "")); + System.out.println(result); } protected final void print(final QueryDeparturesResult result) { - System.out.println(result.status + (result.status == QueryDeparturesResult.Status.OK ? " " + result.stationDepartures : "")); + System.out.println(result); // for (final StationDepartures stationDepartures : result.stationDepartures) // for (final Departure departure : stationDepartures.departures) @@ -62,11 +60,12 @@ public abstract class AbstractProviderLiveTest protected final void print(final SuggestLocationsResult result) { - final List locations = result.getLocations(); - System.out.print(locations.size() + " "); - for (final Location location : locations) - System.out.print(location + " "); - System.out.println(); + System.out.println(result); + } + + protected final void print(final QueryTripsResult result) + { + System.out.println(result); } protected final QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep, diff --git a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java index 36c7251f..288653f1 100644 --- a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java @@ -88,8 +88,8 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Hauptwache"), null, new Location( LocationType.STATION, null, null, "Südbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java index 5400efd7..ca33e9d0 100644 --- a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java @@ -90,7 +90,7 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "101", null, "Königsplatz"), null, new Location( LocationType.STATION, "100", null, "Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -98,18 +98,18 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java index 17e66d99..fd36db83 100644 --- a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java @@ -101,15 +101,15 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8011160", null, "Berlin Hbf"), null, new Location( LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); final QueryTripsResult later3Result = queryMoreTrips(earlierResult.context, true); - System.out.println(later3Result); + print(later3Result); } @Test @@ -119,13 +119,13 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, "732655", 52535576, 13422171, null, "Marienburger Str., Berlin"), null, new Location( LocationType.STATION, "623234", 48000221, 11342490, null, "Tutzinger-Hof-Platz, Starnberg"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); if (!result.context.canQueryLater()) return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -134,7 +134,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "513729", null, "Schillerplatz, Kaiserslautern"), null, new Location(LocationType.STATION, "403631", null, "Trippstadt Grundschule"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); } @Test @@ -143,13 +143,13 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52517139, 13388749, null, "Berlin - Mitte, Unter den Linden 24"), null, new Location(LocationType.ADDRESS, null, 47994243, 11338543, null, "Starnberg, Possenhofener Straße 13"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); if (!result.context.canQueryLater()) return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -157,7 +157,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8010205", null, "Leipzig Hbf"), null, new Location( LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.TOO_CLOSE, result.status); } @@ -167,7 +167,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8011160", null, "Berlin Hbf"), null, new Location( LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(0), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.INVALID_DATE, result.status); } diff --git a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java index b8a69e15..c81575a4 100644 --- a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java @@ -115,9 +115,9 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "80000793", "München", "Ostbahnhof"), null, new Location( LocationType.STATION, "80000799", "München", "Pasing"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -126,7 +126,7 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1005530", "Starnberg", "Arbeitsamt"), null, new Location( LocationType.STATION, "3001459", "Nürnberg", "Fallrohrstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); // seems like there are no more trips all the time } @@ -135,9 +135,9 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48165238, 11577473), null, new Location( LocationType.ADDRESS, null, 47987199, 11326532), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -145,9 +145,9 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48238341, 11478230), null, new Location( LocationType.STATION, "80000793", "München", "Ostbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -155,9 +155,9 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, null, "München, Maximilianstr. 1"), null, new Location( LocationType.ADDRESS, null, null, "Starnberg, Jahnstraße 50"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -166,9 +166,9 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1001220", null, "Josephsburg"), null, new Location( LocationType.ADDRESS, null, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -177,8 +177,8 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.POI, null, 47710568, 12621970, null, "Ruhpolding, Seehaus"), null, new Location(LocationType.POI, null, 47738372, 12630996, null, "Ruhpolding, Unternberg-Bahn"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java index 00358cdb..f49ecff2 100644 --- a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java @@ -100,7 +100,7 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "26000178", null, "Hauptbahnhof"), null, new Location( LocationType.STATION, "26000322", null, "Packhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -108,18 +108,18 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java index d37dac8e..15066b77 100644 --- a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java @@ -90,7 +90,7 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "10000", null, "Bahnhof"), null, new Location( LocationType.STATION, "86", null, "Markthalle"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -98,18 +98,18 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java index af5c3048..8cb855a5 100644 --- a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java @@ -73,11 +73,11 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest { final QueryDeparturesResult resultLive = provider.queryDepartures("309557", 0, false); assertEquals(QueryDeparturesResult.Status.OK, resultLive.status); - System.out.println(resultLive.stationDepartures); + print(resultLive); final QueryDeparturesResult resultPlan = provider.queryDepartures("9100003", 0, false); assertEquals(QueryDeparturesResult.Status.OK, resultPlan.status); - System.out.println(resultPlan.stationDepartures); + print(resultPlan); } @Test @@ -123,15 +123,15 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "9056102", "Berlin", "Nollendorfplatz"), null, new Location( LocationType.STATION, "9013103", "Berlin", "Prinzenstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); final QueryTripsResult later3Result = queryMoreTrips(earlierResult.context, true); - System.out.println(later3Result); + print(later3Result); } @Test @@ -140,9 +140,9 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "9056102", "Berlin", "Nollendorfplatz"), new Location( LocationType.STATION, "9044202", "Berlin", "Bundesplatz"), new Location(LocationType.STATION, "9013103", "Berlin", "Prinzenstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -150,9 +150,9 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52501507, 13357026, null, null), null, new Location( LocationType.ADDRESS, null, 52513639, 13568648, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -161,9 +161,9 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52536099, 13426309, null, "Christburger Straße 1, 10405 Berlin, Deutschland"), null, new Location(LocationType.ADDRESS, null, 52486400, 13350744, null, "Eisenacher Straße 70, 10823 Berlin, Deutschland"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -173,9 +173,9 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest LocationType.ADDRESS, null, 52479868, 13324247, null, null), new Location(LocationType.ADDRESS, null, 52513639, 13568648, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -184,9 +184,9 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52479663, 13324278, "10715 Berlin-Wilmersdorf", "Weimarische Str. 7"), null, new Location(LocationType.ADDRESS, null, 52541536, 13421290, "10437 Berlin-Prenzlauer Berg", "Göhrener Str. 5"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -196,9 +196,9 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest "Weimarische Str. 7"), new Location(LocationType.ADDRESS, null, 52527872, 13381657, "10115 Berlin-Mitte", "Hannoversche Str. 20"), new Location(LocationType.ADDRESS, null, 52526029, 13399878, "10178 Berlin-Mitte", "Sophienstr. 24"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test diff --git a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java index d84e9635..c7902934 100644 --- a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java @@ -90,7 +90,7 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "9001011", null, "Justizgebäude"), null, new Location( LocationType.STATION, "2504524", null, "Theater"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -98,18 +98,18 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java index 259ee6bd..e5adae10 100644 --- a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java @@ -89,8 +89,8 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "900000011", null, "Copenhagen Airport"), null, new Location( LocationType.STATION, "551922500", null, "Billund Airport"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java index 4984a499..5aa076bf 100644 --- a/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java @@ -74,7 +74,7 @@ public class DubProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3505565", null, "Airport Terminal 1, Arrival"), null, new Location(LocationType.STATION, "3505445", null, "Airport Terminal 3"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -82,18 +82,18 @@ public class DubProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java index 9219b883..648c5e17 100644 --- a/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java @@ -49,7 +49,7 @@ public class EireannProviderLiveTest extends AbstractProviderLiveTest { final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8013500"), 0, 0); - System.out.println(result.status + " " + result.stations.size() + " " + result.stations); + print(result); } @Test @@ -106,8 +106,8 @@ public class EireannProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8052281", null, "Dublin Rd (GMIT)"), null, new Location( LocationType.STATION, "8013100", null, "Dublin Airport (Atrium Road)"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java index 440e3160..e15dad1c 100644 --- a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java @@ -114,7 +114,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "hann"), null, new Location(LocationType.ANY, null, null, "laat"), new Date(), true, Product.ALL, WalkSpeed.FAST, Accessibility.NEUTRAL); - System.out.println(result); + print(result); } @Test @@ -123,7 +123,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "25000031", null, "Hannover Hauptbahnhof"), null, new Location( LocationType.STATION, "25001141", null, "Hannover Bismarckstraße"), new Date(), true, Product.ALL, WalkSpeed.FAST, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -131,19 +131,19 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } @Test @@ -152,9 +152,9 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, 53069619, 8799202, null, "bremen, neustadtswall 12"), null, new Location(LocationType.ADDRESS, null, 53104124, 8788575, null, "Bremen Glücksburger Straße 37"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -163,8 +163,8 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 53622859, 10133545, null, "Zamenhofweg 14, 22159 Hamburg, Deutschland"), null, new Location(LocationType.ADDRESS, null, 53734260, 9674990, null, "Lehmkuhlen 5, 25337 Elmshorn, Deutschland"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java index c8dee152..f9f7d133 100644 --- a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java @@ -90,8 +90,8 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "80302", null, "Ingolstadt, Hauptbahnhof Stadteinwärts"), null, new Location(LocationType.STATION, "181102", null, "Elisabethstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java index 6fdf0454..0d8fb1ba 100644 --- a/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java @@ -90,7 +90,7 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60466402", null, "Kochstraße"), null, new Location( LocationType.STATION, "60461679", null, "Messe/Zeughaus"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -98,18 +98,18 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java index 6b5530e9..e0655650 100644 --- a/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java @@ -49,7 +49,7 @@ public class JetProviderLiveTest extends AbstractProviderLiveTest { final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "1055"), 0, 0); - System.out.println(result.status + " " + result.stations.size() + " " + result.stations); + print(result); } @Test @@ -94,8 +94,8 @@ public class JetProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1055", null, null), null, new Location(LocationType.STATION, "90010", null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java index 1313f2a5..475cfece 100644 --- a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java @@ -91,7 +91,7 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest 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); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -99,19 +99,19 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } @Test @@ -120,8 +120,8 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48985089, 8402709, null, "Konstanzer Straße 17, 76199 Karlsruhe, Deutschland"), null, new Location(LocationType.ADDRESS, null, 49007706, 8356358, null, "Durmersheimer Straße 6, 76185 Karlsruhe, Deutschland"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java index 63e6274f..0e0552ca 100644 --- a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java @@ -65,7 +65,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest public void queryDepartures() throws Exception { final QueryDeparturesResult result = provider.queryDepartures("60501720", 0, false); - System.out.println(result); + print(result); } @Test @@ -105,7 +105,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "linz"), null, new Location(LocationType.ANY, null, null, "gel"), new Date(), true, Product.ALL, WalkSpeed.FAST, Accessibility.NEUTRAL); - System.out.println(result); + print(result); } @Test @@ -113,7 +113,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Linz Hauptbahnhof"), null, new Location( LocationType.STATION, null, null, "Linz Auwiesen"), new Date(), true, Product.ALL, WalkSpeed.FAST, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -121,19 +121,19 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } @Test @@ -141,8 +141,8 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Linz Auwiesen"), null, new Location( LocationType.STATION, null, null, "Linz Hafen"), new Date(), true, Product.ALL, WalkSpeed.SLOW, Accessibility.NEUTRAL); - System.out.println(result); + print(result); // final QueryTripsResult laterResult = queryMoreTrips(provider, result.context, true); - // System.out.println(laterResult); + // print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java index f8dc9653..249fde40 100644 --- a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java @@ -90,9 +90,9 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "200416001", null, "Cité Aéroport"), null, new Location( LocationType.STATION, "200405035", "Luxembourg", "Gare Centrale"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -101,8 +101,8 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 49611610, 6130265, null, "Luxembourg, Rue Génistre 2"), null, new Location(LocationType.STATION, "200405035", "Luxembourg", "Gare Centrale"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java index e1fd5f6e..43f83b22 100644 --- a/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java @@ -83,7 +83,7 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "10002717", "Melbourne City", "6-Franklin St/Elizabeth St"), null, new Location(LocationType.STATION, "10002722", "Melbourne City", "1-Flinders Street Railway Station/Elizabeth St"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -91,18 +91,18 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java index b606f18e..9107489a 100644 --- a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java @@ -113,7 +113,7 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "24200200", null, "Lüd., Christuskirche"), null, new Location( LocationType.STATION, "24200032", null, "Lüd., Friedrichstr."), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -121,18 +121,18 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java index 6aff7b9b..25bc1fc7 100644 --- a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java @@ -116,11 +116,11 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "2", "München", "Marienplatz"), null, new Location( LocationType.STATION, "10", "München", "Pasing"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); final QueryTripsResult earlierResult = queryMoreTrips(laterResult.context, false); - System.out.println(earlierResult); + print(earlierResult); } @Test @@ -128,7 +128,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Starnberg, Arbeitsamt"), null, new Location( LocationType.STATION, null, null, "Ackermannstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); // seems like there are no more trips all the time } @@ -137,9 +137,9 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48165238, 11577473), null, new Location( LocationType.ADDRESS, null, 47987199, 11326532), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -147,9 +147,9 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48238341, 11478230), null, new Location(LocationType.ANY, null, null, "Ostbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -157,9 +157,9 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, null, "München, Maximilianstr. 1"), null, new Location( LocationType.ADDRESS, null, null, "Starnberg, Jahnstraße 50"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -168,9 +168,9 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1220", null, "Josephsburg"), null, new Location( LocationType.ADDRESS, null, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test diff --git a/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java index daf541a2..297171d9 100644 --- a/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java @@ -90,7 +90,7 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3019697", null, "Amberg Kurfürstenbad"), null, new Location( LocationType.STATION, "3019500", null, "Amberg Bahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -98,18 +98,18 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java index f33aade4..ec9bb05f 100644 --- a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java @@ -100,12 +100,12 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "11063", null, "Leipzig, Johannisplatz"), null, new Location( LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); if (!result.context.canQueryLater()) return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -114,12 +114,12 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8010205", 51346546, 12383333, null, "Leipzig Hbf"), null, new Location(LocationType.STATION, "8012183", 51423340, 12223423, null, "Leipzig/Halle Flughafen"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); if (!result.context.canQueryLater()) return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -128,12 +128,12 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "13002", null, "Leipzig, Augustusplatz"), null, new Location( LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(2011, 1, 1), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); if (!result.context.canQueryLater()) return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -141,12 +141,12 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Platz"), null, new Location(LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); if (!result.context.canQueryLater()) return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -154,12 +154,12 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8010205", null, "Leipzig Hbf"), null, new Location( LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); if (!result.context.canQueryLater()) return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -168,11 +168,11 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 51334078, 12478331, "04319 Leipzig-Engelsdorf", "August-Bebel-Platz"), null, new Location(LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); if (!result.context.canQueryLater()) return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java index dbbddfda..9fab8ad7 100644 --- a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java @@ -97,8 +97,8 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8059", null, "Oslo"), null, new Location(LocationType.STATION, "6642", null, "Bergen BGO"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java index 409b310d..1f3c9b75 100644 --- a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java @@ -97,7 +97,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8400058", null, "Amsterdam Centraal"), null, new Location( LocationType.STATION, "8400061", null, "Amsterdam Zuid"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); - System.out.println(result.status + " " + result.trips); + print(result); } @Test @@ -106,6 +106,6 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "100024"), null, new Location(LocationType.STATION, "103624"), new Date(), true, null, WalkSpeed.FAST, Accessibility.NEUTRAL); - System.out.println(result.status + " " + result.trips); + print(result); } } diff --git a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java index e50b4967..d1d0b0aa 100644 --- a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java @@ -108,7 +108,7 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "17002402", null, "Bahnhof"), null, new Location( LocationType.STATION, "17009001", null, "Bahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -116,18 +116,18 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java index 9671e1c5..81a3339a 100644 --- a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java @@ -123,7 +123,7 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3000001", null, "Hauptwache"), null, new Location( LocationType.STATION, "3000912", null, "Südbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -131,61 +131,61 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryLater()) return; final QueryTripsResult later3Result = queryMoreTrips(later2Result.context, true); - System.out.println(later3Result); + print(later3Result); if (!later3Result.context.canQueryLater()) return; final QueryTripsResult later4Result = queryMoreTrips(later3Result.context, true); - System.out.println(later4Result); + print(later4Result); if (!later4Result.context.canQueryLater()) return; final QueryTripsResult later5Result = queryMoreTrips(later4Result.context, true); - System.out.println(later5Result); + print(later5Result); if (!later5Result.context.canQueryLater()) return; final QueryTripsResult later6Result = queryMoreTrips(later5Result.context, true); - System.out.println(later6Result); + print(later6Result); if (!result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(result.context, false); - System.out.println(earlierResult); + print(earlierResult); if (!earlierResult.context.canQueryEarlier()) return; final QueryTripsResult earlier2Result = queryMoreTrips(earlierResult.context, false); - System.out.println(earlier2Result); + print(earlier2Result); if (!earlier2Result.context.canQueryEarlier()) return; final QueryTripsResult earlier3Result = queryMoreTrips(earlier2Result.context, false); - System.out.println(earlier3Result); + print(earlier3Result); if (!earlier3Result.context.canQueryEarlier()) return; final QueryTripsResult earlier4Result = queryMoreTrips(earlier3Result.context, false); - System.out.println(earlier4Result); + print(earlier4Result); } @Test @@ -194,9 +194,9 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "2200007", null, "Kassel Wilhelmshöhe"), null, new Location( LocationType.STATION, "2200278", null, "Kassel Wilhelmshöher Weg"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -205,7 +205,7 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3029079", 50017679, 8229480, "Mainz", "An den Dünen"), null, new Location(LocationType.STATION, "3013508", 50142890, 8895203, "Hanau", "Beethovenplatz"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.BARRIER_FREE); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -213,7 +213,7 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -221,7 +221,7 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Frankfurt Bockenheimer Warte!"), null, new Location( LocationType.ANY, null, null, "Frankfurt Hauptbahnhof!"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); } @Test @@ -230,13 +230,13 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 50119563, 8697044, null, "Hegelstrasse, 60316 Frankfurt am Main"), null, new Location(LocationType.ADDRESS, null, 50100364, 8615193, null, "Mainzer Landstrasse, Frankfurt"), new Date(1378368840000l), true, Product.ALL, null, null); - System.out.println(result); + print(result); if (!result.context.canQueryLater()) return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -245,12 +245,12 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3000909", 50094052, 8690923, null, "F Brauerei"), null, new Location(LocationType.STATION, "3001201", 50119950, 8653924, null, "F Bockenheimer Warte"), new Date(1378368840000l), true, Product.ALL, null, null); - System.out.println(result); + print(result); if (!result.context.canQueryLater()) return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java index 7c3d0315..fd5c11e4 100644 --- a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java @@ -103,11 +103,11 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1140101", null, "Linz"), null, new Location( LocationType.STATION, "1190100", null, "Wien"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -115,11 +115,11 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Ramsen Zoll!"), null, new Location(LocationType.ANY, null, null, "Azuga!"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -127,11 +127,11 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest { 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, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -140,10 +140,10 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest 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, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/PacaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/PacaProviderLiveTest.java index 66d60841..c8542926 100644 --- a/enabler/test/de/schildbach/pte/live/PacaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/PacaProviderLiveTest.java @@ -72,7 +72,7 @@ public class PacaProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "61088", null, "Eganaude"), null, new Location( LocationType.STATION, "58617", null, "Place de Gaulle"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -80,61 +80,61 @@ public class PacaProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryLater()) return; final QueryTripsResult later3Result = queryMoreTrips(later2Result.context, true); - System.out.println(later3Result); + print(later3Result); if (!later3Result.context.canQueryLater()) return; final QueryTripsResult later4Result = queryMoreTrips(later3Result.context, true); - System.out.println(later4Result); + print(later4Result); if (!later4Result.context.canQueryLater()) return; final QueryTripsResult later5Result = queryMoreTrips(later4Result.context, true); - System.out.println(later5Result); + print(later5Result); if (!later5Result.context.canQueryLater()) return; final QueryTripsResult later6Result = queryMoreTrips(later5Result.context, true); - System.out.println(later6Result); + print(later6Result); if (!result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(result.context, false); - System.out.println(earlierResult); + print(earlierResult); if (!earlierResult.context.canQueryEarlier()) return; final QueryTripsResult earlier2Result = queryMoreTrips(earlierResult.context, false); - System.out.println(earlier2Result); + print(earlier2Result); if (!earlier2Result.context.canQueryEarlier()) return; final QueryTripsResult earlier3Result = queryMoreTrips(earlier2Result.context, false); - System.out.println(earlier3Result); + print(earlier3Result); if (!earlier3Result.context.canQueryEarlier()) return; final QueryTripsResult earlier4Result = queryMoreTrips(earlier3Result.context, false); - System.out.println(earlier4Result); + print(earlier4Result); } @Test @@ -143,7 +143,7 @@ public class PacaProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "68629", 43441167, 5223055, "MARSEILLE", "Aeroport Hall 3 4"), null, new Location(LocationType.STATION, "61088", 43623140, 7057545, "BIOT", "Eganaude"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.BARRIER_FREE); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -151,7 +151,7 @@ public class PacaProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -159,7 +159,7 @@ public class PacaProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Biot, Templiers!"), null, new Location( LocationType.ANY, null, null, "Eganaude!"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); } @Test @@ -167,7 +167,7 @@ public class PacaProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.POI, "30455", 0, 0, "CANNES", "Cannes"), null, new Location( LocationType.POI, "30514", 0, 0, "NICE", "Nice"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -175,6 +175,6 @@ public class PacaProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java index 449d765e..05e9cbe2 100644 --- a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java @@ -97,8 +97,8 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "5196001", null, "KRAKÓW"), null, new Location( LocationType.STATION, "5196003", null, "WARSZAWA"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java index 97d601c6..4c723d42 100644 --- a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java @@ -49,7 +49,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest { final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8500010"), 0, 0); - System.out.println(result.status + " " + result.stations.size() + " " + result.stations); + print(result); } @Test @@ -105,9 +105,9 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8503000", null, "Zürich HB"), null, new Location( LocationType.STATION, "8507785", null, "Bern, Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -115,9 +115,9 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Schocherswil, Alte Post!"), null, new Location( LocationType.ANY, null, null, "Laconnex, Mollach"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -126,9 +126,9 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, null, "Spiez, Seestraße 62"), null, new Location( LocationType.ADDRESS, null, null, "Einsiedeln, Erlenmoosweg 24"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -137,9 +137,9 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 51521886, -51447, null, "26 Coopers Close, Poplar, Greater London E1 4, Vereinigtes Königreich"), null, new Location(LocationType.STATION, "8096022", 50941312, 6967206, null, "COLOGNE"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -148,9 +148,9 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8400056", null, "Amsterdam RAI"), new Location( LocationType.STATION, "8400058", null, "Amsterdam Centraal"), new Location(LocationType.STATION, "8000085", null, "Düsseldorf Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -158,8 +158,8 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8000207", null, "Köln Hbf"), null, new Location( LocationType.STATION, "6096001", null, "DUBLIN"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java index 58853f44..25fe4ca3 100644 --- a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java @@ -49,7 +49,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest { final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "8500010"), 0, 0); - System.out.println(result.status + " " + result.stations.size() + " " + result.stations); + print(result); } @Test @@ -105,9 +105,9 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8503000", null, "Zürich HB"), null, new Location( LocationType.STATION, "8507785", null, "Bern, Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -116,9 +116,9 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8587210", null, "Schocherswil, Alte Post"), null, new Location(LocationType.STATION, "8592972", null, "Laconnex, Mollach"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -127,9 +127,9 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 46689354, 7683444, null, "Spiez, Seestraße 62"), null, new Location(LocationType.ADDRESS, null, 47133169, 8767425, null, "Einsiedeln, Erlenmoosweg 24"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -138,8 +138,8 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 47438595, 8437369, null, "Dorfstrasse 10, Dällikon, Schweiz"), null, new Location(LocationType.STATION, "8500010", null, "Basel"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java index 8a1486bf..7121a7c0 100644 --- a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java @@ -97,8 +97,8 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "7414867", null, "Luleå Airport"), null, new Location( LocationType.STATION, "7498000", null, "STOCKHOLM"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java index e035c54c..6f5cd08b 100644 --- a/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java @@ -89,9 +89,9 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1021532", null, "30th St Station"), null, new Location( LocationType.STATION, "1001392", null, "15th St Station"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -100,8 +100,8 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips( new Location(LocationType.ADDRESS, null, 40015670, -75209400, "Philadelphia 19127", "3601 Main St"), null, new Location( LocationType.STATION, "2090227", null, "Main Street"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java index 28f8c0a0..8536fbb7 100644 --- a/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java @@ -83,7 +83,7 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "10001032", 37784976, -122406784, "San Francisco", "BART Powell"), null, new Location(LocationType.STATION, "10001026", 37789376, -122401320, "San Francisco", "BART Montgomery"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -91,18 +91,18 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java index 927e9a4b..ce4ea244 100644 --- a/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java @@ -97,8 +97,8 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest { 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); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java index 647066c6..ba322485 100644 --- a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java @@ -105,12 +105,12 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest { 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); + print(result); if (result.context != null) { final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult.status + " " + laterResult.trips); + print(laterResult); } } @@ -119,12 +119,12 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest { 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); + print(result); if (result.context != null) { final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult.status + " " + laterResult.trips); + print(laterResult); } } @@ -133,12 +133,12 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 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); + print(result); if (result.context != null) { final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult.status + " " + laterResult.trips); + print(laterResult); } } } diff --git a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java index 6660e54e..c2287c6e 100644 --- a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java @@ -98,9 +98,9 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "200101051", "Stockholm", "T-Centralen"), null, new Location( LocationType.STATION, "200101221", "Stockholm", "Abrahamsberg"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -109,8 +109,8 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 59360519, 17989266, null, "Sommarvägen 1, Solna"), null, new Location(LocationType.STATION, "300109205", 59340518, 18081532, "Stockholm", "Stadion"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java index 7f52be5a..55c9d267 100644 --- a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java @@ -117,7 +117,7 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "63203040", null, "Graz Hauptbahnhof"), null, new Location( LocationType.STATION, "63203149", null, "Graz Babenbergerstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -125,18 +125,18 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java index f7548036..2ef6294f 100644 --- a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java @@ -105,7 +105,7 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60650021", 47797036, 13053608, "Salzburg", "Justizgebäude"), null, new Location(LocationType.STATION, "60650022", 47793760, 13059338, "Salzburg", "Akademiestraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -113,18 +113,18 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java index 3a0c6ae1..5bd5b676 100644 --- a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java @@ -90,7 +90,7 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "10101100", "Sydney", "Central Station"), null, new Location( LocationType.STATION, null, "Sydney", "Capitol Square"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -98,18 +98,18 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java index 6b363c4c..3e1bb24a 100644 --- a/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java @@ -83,7 +83,7 @@ public class TfiProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "51013670", "Dublin City South", "O'Connell Bridge (on Lower O'Connell Street)"), null, new Location(LocationType.STATION, "52003679", "Dublin City South", "Dublin (Baggot Street)"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -91,18 +91,18 @@ public class TfiProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java index 1a87b51c..b7df3ae9 100644 --- a/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java @@ -82,7 +82,7 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1008730", null, "King & Queen Wharf"), null, new Location( LocationType.STATION, "1006433", null, "Edinburgh Court"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -90,19 +90,19 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } @Test @@ -111,7 +111,7 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "sw19 8ta"), null, new Location(LocationType.STATION, "1016019", 51655903, -397249, null, "Watford (Herts), Watford Town Centre"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); } @Test @@ -121,24 +121,24 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest "Timsbury Walk, Wandsworth"), null, new Location(LocationType.STATION, "90046985", 53225140, -1472433, "Chesterfield (Derbys)", "Walton (Chesterfield), Netherfield Road (on Somersall Lane)"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); if (!result.context.canQueryLater()) return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java index b8b12f8c..7e41a4d3 100644 --- a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java @@ -82,7 +82,7 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1008730", null, "King & Queen Wharf"), null, new Location( LocationType.STATION, "1006433", null, "Edinburgh Court"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -90,18 +90,18 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java index 64fcbb46..712bd37f 100644 --- a/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java @@ -83,7 +83,7 @@ public class TlswProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60011202", 51850168, -1094302, "Upper Arncott", "Bullingdon Prison"), null, new Location(LocationType.STATION, "60006576", 51856352, -1113127, "Lower Arncott", "The Plough"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -91,18 +91,18 @@ public class TlswProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java index 15e5a8e7..f98ba729 100644 --- a/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java @@ -83,7 +83,7 @@ public class TlwmProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "2099014", 52478184, -1898364, "Birmingham", "Birmingham New Street Rail Station"), null, new Location(LocationType.STATION, "2099150", 52585468, -2122962, "Wolverhampton", "Wolverhampton Rail Station"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -91,18 +91,18 @@ public class TlwmProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java index 028f63ed..2c0f95c0 100644 --- a/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java @@ -93,7 +93,7 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "6930100", null, "Freiburg Bertoldsbrunnen"), null, new Location(LocationType.STATION, "6930101", null, "Freiburg Siegesdenkmal"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -101,18 +101,18 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java index 8037c3a7..24956488 100644 --- a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java @@ -119,11 +119,11 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "9056102", "Berlin", "Nollendorfplatz"), null, new Location( LocationType.STATION, "9013103", "Berlin", "Prinzenstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); final QueryTripsResult earlierResult = queryMoreTrips(laterResult.context, false); - System.out.println(earlierResult); + print(earlierResult); } @Test @@ -132,9 +132,9 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "9056102", "Berlin", "Nollendorfplatz"), new Location( LocationType.STATION, "9044202", "Berlin", "Bundesplatz"), new Location(LocationType.STATION, "9013103", "Berlin", "Prinzenstraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -142,9 +142,9 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52501507, 13357026, null, null), null, new Location( LocationType.ADDRESS, null, 52513639, 13568648, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -154,9 +154,9 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest LocationType.ADDRESS, null, 52479868, 13324247, null, null), new Location(LocationType.ADDRESS, null, 52513639, 13568648, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -165,9 +165,9 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52479663, 13324278, "10715 Berlin-Wilmersdorf", "Weimarische Str. 7"), null, new Location(LocationType.ADDRESS, null, 52541536, 13421290, "10437 Berlin-Prenzlauer Berg", "Göhrener Str. 5"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -177,8 +177,8 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest "Weimarische Str. 7"), new Location(LocationType.ADDRESS, null, 52527872, 13381657, "10115 Berlin-Mitte", "Hannoversche Str. 20"), new Location(LocationType.ADDRESS, null, 52526029, 13399878, "10178 Berlin-Mitte", "Sophienstr. 24"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java index f1fec8e5..65aa2262 100644 --- a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java @@ -91,7 +91,7 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "119", 47050760, 8310252, "Luzern", "Luzern, Bahnhof"), null, new Location(LocationType.STATION, "118", 47048844, 8306433, "Luzern", "Kantonalbank"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -99,18 +99,18 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java index 8128c5e7..18d6eb63 100644 --- a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java @@ -100,9 +100,9 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8096109", null, "Oldenburg"), null, new Location( LocationType.STATION, "625398", null, "Bremerhaven"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); assertEquals(QueryTripsResult.Status.OK, result.status); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test diff --git a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java index a864226e..6455edf8 100644 --- a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java @@ -87,9 +87,9 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "451", "Nürnberg", "Ostring"), null, new Location( LocationType.STATION, "510", "Nürnberg", "Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } @Test @@ -98,8 +98,8 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1756", "Nürnberg", "Saarbrückener Str."), null, new Location( LocationType.ADDRESS, null, 49437392, 11094524, "Nürnberg", "Wodanstraße 25"), new Date(), false, Product.ALL, WalkSpeed.FAST, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java index 4cbde50c..88000a76 100644 --- a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java @@ -89,8 +89,8 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "10640", "Saarbrücken", "Hauptbahnhof"), null, new Location( LocationType.STATION, "10700", "Saarbrücken", "Ostbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java index ac5b8e47..e4e1e9cd 100644 --- a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java @@ -91,7 +91,7 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60000822", 47238428, 9596940, "Feldkirch", "Katzenturm"), null, new Location(LocationType.STATION, "60000305", 47240744, 9589368, "Tosters", "Vorarlberghalle"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -99,18 +99,18 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java index b48819aa..5809de1d 100644 --- a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java @@ -83,7 +83,7 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "36030131", 50831380, 12922278, "Chemnitz", "Zentralhaltestelle"), null, new Location(LocationType.STATION, "36030522", 50836056, 12922042, "Chemnitz", "Stadthalle"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -91,18 +91,18 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java index cbe84201..d138fa2e 100644 --- a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java @@ -83,7 +83,7 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "44402006", null, "Schwerin Marienplatz"), null, new Location( LocationType.STATION, "44402007", 53625272, 11409350, null, "Schlossblick"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -91,18 +91,18 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java index bdb3a1b1..1fd62727 100644 --- a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java @@ -105,7 +105,7 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60200657", 48200756, 16369001, "Wien", "Karlsplatz"), null, new Location(LocationType.STATION, "60201094", 48198612, 16367719, "Wien", "Resselgasse"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -113,19 +113,19 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } @Test @@ -133,8 +133,8 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48180281, 16333551), null, new Location( LocationType.ADDRESS, null, 48240452, 16444788), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java index 44fedaf4..bbf6e536 100644 --- a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java @@ -115,7 +115,7 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "6002417", 49479748, 8469938, "Mannheim", "Mannheim, Hauptbahnhof"), null, new Location(LocationType.STATION, "6005542", 49482892, 8473050, "Mannheim", "Kunsthalle"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -123,18 +123,18 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java index 99cc7869..5b0a23b3 100644 --- a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java @@ -148,7 +148,7 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "20009289", "Essen", "Hauptbahnhof"), null, new Location( LocationType.STATION, "20009161", "Essen", "Bismarckplatz"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -156,19 +156,19 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } @Test @@ -177,7 +177,7 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "23007000", "Paderborn", "Paderborn Hbf"), null, new Location( LocationType.STATION, "23007700", "Höxter", "Bahnhof / Rathaus"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -185,18 +185,18 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java index fdba98a9..811cffc1 100644 --- a/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java @@ -82,7 +82,7 @@ public class VrtProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "17002402", null, "Bahnhof"), null, new Location( LocationType.STATION, "17009001", null, "Bahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -90,18 +90,18 @@ public class VrtProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java index f0d1a87c..42ab0665 100644 --- a/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java @@ -106,8 +106,8 @@ public class VsnProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8000128", null, "Göttingen"), null, new Location( LocationType.STATION, "1140061", null, "Göttingen Nikolausberger Weg"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java index 0dc24b40..0f3ff1fb 100644 --- a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java @@ -91,7 +91,7 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3700075", 49801076, 9934302, "Würzburg", "Busbahnhof"), null, new Location(LocationType.STATION, "3700403", 49797772, 9934986, "Würzburg", "Stift Haug"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -99,18 +99,18 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java index ad7afc7a..d2448711 100644 --- a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java @@ -52,7 +52,7 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest { final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "33000013"), 0, 0); - System.out.println(result.status + " " + result.stations.size() + " " + result.stations); + print(result); } @Test @@ -101,7 +101,7 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "33000013", null, "Dresden Albertplatz"), null, new Location( LocationType.STATION, "33000262", null, "Dresden Bischofsweg"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -109,18 +109,18 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java index 1cbffa86..2c85ba45 100644 --- a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java @@ -91,7 +91,7 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "5006118", 48782984, 9179846, "Stuttgart", "Stuttgart, Hauptbahnhof"), null, new Location(LocationType.STATION, "5006024", 48782584, 9187098, "Stuttgart", "Staatsgalerie"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -99,18 +99,18 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java index 23d9452a..ea50e1a3 100644 --- a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java @@ -91,7 +91,7 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60161512", 47268336, 11355532, "Innsbruck", "Allerheiligen"), null, new Location(LocationType.STATION, "60161510", 47267272, 11350938, "Innsbruck", "Tschiggfreystraße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -99,18 +99,18 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java index ae68433f..077eddfd 100644 --- a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java @@ -91,7 +91,7 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "30202006", 50484564, 12140028, "Plauen (Vogtl)", "Bickelstraße"), null, new Location(LocationType.STATION, "30202012", 50487332, 12139050, "Plauen (Vogtl)", "Hofer Straße"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -99,18 +99,18 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } } diff --git a/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java index c090b58a..dc346772 100644 --- a/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java @@ -105,7 +105,7 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60200657", 48200756, 16369001, "Wien", "Karlsplatz"), null, new Location(LocationType.STATION, "60201094", 48198612, 16367719, "Wien", "Resselgasse"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -113,19 +113,19 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest return; final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); if (!laterResult.context.canQueryLater()) return; final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); + print(later2Result); if (!later2Result.context.canQueryEarlier()) return; final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); + print(earlierResult); } @Test @@ -133,8 +133,8 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48180281, 16333551), null, new Location( LocationType.ADDRESS, null, 48240452, 16444788), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } } diff --git a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java index 3e153534..42952ed4 100644 --- a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java @@ -89,8 +89,8 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8503000", null, "Zürich HB"), null, new Location( LocationType.STATION, "8507785", null, "Bern, Hauptbahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); + print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); + print(laterResult); } }