mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-19 08:49:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

AbstractProviderLiveTest: Use TripOptions in queryTrips() and simplify live tests by passing null to use defaults where appropriate.

Browse source
This commit is contained in:
Andreas Schildbach 2018-11-05 16:49:30 +01:00
parent 79ff93b80f
commit 0831d0f8e6
63 changed files with 291 additions and 579 deletions
Download patch file Download diff file Expand all files Collapse all files

10
enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
View file

@ -24,17 +24,13 @@ import java.io.InputStream;
import java.util.Date;
import java.util.EnumSet;
import java.util.Properties;
import java.util.Set;
import javax.annotation.Nullable;
import de.schildbach.pte.NetworkProvider;
import de.schildbach.pte.NetworkProvider.Accessibility;
import de.schildbach.pte.NetworkProvider.WalkSpeed;
import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.NearbyLocationsResult;
import de.schildbach.pte.dto.Product;
import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.QueryTripsContext;
import de.schildbach.pte.dto.QueryTripsResult;
@ -122,10 +118,8 @@ public abstract class AbstractProviderLiveTest {
}
protected final QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to,
final Date date, final boolean dep, final @Nullable Set<Product> products,
final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility) throws IOException {
return provider.queryTrips(from, via, to, date, dep,
new TripOptions(products, null, walkSpeed, accessibility, null));
final Date date, final boolean dep, final @Nullable TripOptions options) throws IOException {
return provider.queryTrips(from, via, to, date, dep, options);
}
protected final QueryTripsResult queryMoreTrips(final QueryTripsContext context, final boolean later)