diff --git a/enabler/src/de/schildbach/pte/NphProvider.java b/enabler/src/de/schildbach/pte/NphProvider.java deleted file mode 100644 index 6ffcdad5..00000000 --- a/enabler/src/de/schildbach/pte/NphProvider.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2010-2013 the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package de.schildbach.pte; - -/** - * @author Andreas Schildbach - */ -public class NphProvider extends AbstractEfaProvider -{ - public static final NetworkId NETWORK_ID = NetworkId.NPH; - private static final String API_BASE = "http://efa.nph.de/nph/"; - - public NphProvider() - { - super(API_BASE, null, false); - } - - public NetworkId id() - { - return NETWORK_ID; - } - - public boolean hasCapabilities(final Capability... capabilities) - { - for (final Capability capability : capabilities) - if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.CONNECTIONS) - return true; - - return false; - } -} diff --git a/enabler/test/de/schildbach/pte/live/NphProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NphProviderLiveTest.java deleted file mode 100644 index 85d780df..00000000 --- a/enabler/test/de/schildbach/pte/live/NphProviderLiveTest.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright 2010-2013 the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package de.schildbach.pte.live; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.Date; -import java.util.List; - -import org.junit.Test; - -import de.schildbach.pte.NetworkProvider.Accessibility; -import de.schildbach.pte.NetworkProvider.WalkSpeed; -import de.schildbach.pte.NphProvider; -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; -import de.schildbach.pte.dto.NearbyStationsResult; -import de.schildbach.pte.dto.QueryConnectionsResult; -import de.schildbach.pte.dto.QueryDeparturesResult; - -/** - * @author Andreas Schildbach - */ -public class NphProviderLiveTest extends AbstractProviderLiveTest -{ - public NphProviderLiveTest() - { - super(new NphProvider()); - } - - @Test - public void nearbyStations() throws Exception - { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 20019904), 0, 0); - - print(result); - } - - @Test - public void nearbyStationsByCoordinate() throws Exception - { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 51719648, 8754330), 0, 0); - - print(result); - } - - @Test - public void queryDepartures() throws Exception - { - final QueryDeparturesResult result = provider.queryDepartures(20019904, 0, false); - - print(result); - } - - @Test - public void autocompleteIncomplete() throws Exception - { - final List autocompletes = provider.autocompleteStations("Paderborn Hbf"); - - print(autocompletes); - } - - @Test - public void autocompleteWithUmlaut() throws Exception - { - final List autocompletes = provider.autocompleteStations("grün"); - - print(autocompletes); - } - - @Test - public void shortConnection() throws Exception - { - final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 23007000, "Paderborn", "Paderborn Hbf"), null, - new Location(LocationType.STATION, 23007700, "Höxter", "Bahnhof / Rathaus"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); - System.out.println(result); - assertEquals(QueryConnectionsResult.Status.OK, result.status); - assertTrue(result.connections.size() > 0); - - if (!result.context.canQueryLater()) - return; - - final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); - System.out.println(laterResult); - - if (!laterResult.context.canQueryLater()) - return; - - final QueryConnectionsResult later2Result = queryMoreConnections(laterResult.context, true); - System.out.println(later2Result); - - if (!later2Result.context.canQueryEarlier()) - return; - - final QueryConnectionsResult earlierResult = queryMoreConnections(later2Result.context, false); - System.out.println(earlierResult); - } -} diff --git a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java index 0334611a..31707f86 100644 --- a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java @@ -58,6 +58,10 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 51218693, 6777785), 0, 0); print(result); + + final NearbyStationsResult result2 = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 51719648, 8754330), 0, 0); + + print(result2); } @Test @@ -66,6 +70,10 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest final QueryDeparturesResult result = provider.queryDepartures(1007258, 0, false); print(result); + + final QueryDeparturesResult result2 = provider.queryDepartures(20019904, 0, false); + + print(result2); } @Test @@ -74,6 +82,10 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest final List autocompletes = provider.autocompleteStations("Kur"); print(autocompletes); + + final List autocompletes2 = provider.autocompleteStations("Paderborn Hbf"); + + print(autocompletes2); } @Test @@ -128,4 +140,33 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult earlierResult = queryMoreConnections(later2Result.context, false); System.out.println(earlierResult); } + + @Test + public void shortConnectionPaderborn() throws Exception + { + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 23007000, "Paderborn", "Paderborn Hbf"), null, + new Location(LocationType.STATION, 23007700, "Höxter", "Bahnhof / Rathaus"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, + Accessibility.NEUTRAL); + System.out.println(result); + assertEquals(QueryConnectionsResult.Status.OK, result.status); + assertTrue(result.connections.size() > 0); + + if (!result.context.canQueryLater()) + return; + + final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); + System.out.println(laterResult); + + if (!laterResult.context.canQueryLater()) + return; + + final QueryConnectionsResult later2Result = queryMoreConnections(laterResult.context, true); + System.out.println(later2Result); + + if (!later2Result.context.canQueryEarlier()) + return; + + final QueryConnectionsResult earlierResult = queryMoreConnections(later2Result.context, false); + System.out.println(earlierResult); + } }